patch::: 1.3.39.jcn3

1.3.39.jcn3
===========

* buildscripts/make-cygwin-cross.sh: Use rx-1.5 instead of regex (Jeffrey).

* scm/lily.scm: Fixed check for Windows: by default don't use scm regex.

---
Generated by janneke@gnu.org,
From = lilypond-1.3.39.jcn2, To = lilypond-1.3.39.jcn3

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.39.jcn3.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure

diff --git a/CHANGES b/CHANGES
index 60b70ddde263cd7a3c899e58457e7a63bb3fa1ad..6fefc94895eb99f102ae632e0bc414d92efb519d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,17 @@
---- ../lilypond-1.3.39.jcn1/CHANGES    Fri Mar 24 17:40:59 2000
+--- ../lilypond-1.3.39.jcn2/CHANGES    Mon Mar 27 16:27:33 2000
+++ b/CHANGES   Tue Mar 28 01:50:52 2000
+@@ -1,3 +1,11 @@
+1.3.39.jcn3
+===========
+
+* buildscripts/make-cygwin-cross.sh: Use rx-1.5 instead of regex (Jeffrey).
+
+* scm/lily.scm: Fixed check for Windows: by default don't use scm regex.
+
+
+ 1.3.39.jcn2
+ ===========
+ --- ../lilypond-1.3.39.jcn1/CHANGES   Fri Mar 24 17:40:59 2000
 ++ b/CHANGES   Mon Mar 27 16:27:33 2000
 @@ -1,4 +1,15 @@
 -2000-03-24    <janneke@gnu.org>

diff --git a/VERSION b/VERSION
index cc1d52dccd154f219e5f819c635972b9aaba4824..7559638f8d2707a09de9ae74b9aaafda92133419 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=39
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/buildscripts/make-cygwin-cross.sh b/buildscripts/make-cygwin-cross.sh
index 24b84743fe0120d1dc09426dff9effca124a4037..4247223ac9767474c76f2ff7d2473401ca01a82a 100644 (file)
--- a/buildscripts/make-cygwin-cross.sh
+++ b/buildscripts/make-cygwin-cross.sh
@@ -60,7 +60,7 @@ WWW=$DEVEL/WWW/lilypond/gnu-windows
 
 CYGWIN_SOURCE=$DEVEL/sourceware.cygnus.com/pub/cygwin/private/cygwin-net-485
 MINGW_SOURCE=$DEVEL/ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/runtime
-SOURCE_PATH=$DEVEL/usr/src/releases:$DEVEL/usr/src/patches:$DEVEL/usr/src/lilypond/Documentation/ntweb:$MINGW_SOURCE
+SOURCE_PATH=$DEVEL/usr/src/releases:$DEVEL/usr/src/patches:$DEVEL/usr/src/lilypond/Documentation/ntweb:$MINGW_SOURCE:/usr/src/redhat/SOURCES
 
 HOST=`uname -m`-gnu-`uname -s | tr '[A-Z]' '[a-z]'`
 
@@ -82,14 +82,17 @@ gcc-2.95.2
 flex
 bison
 "
+
 not_yet_needed="
 cygwin-2000301
+rpm-3.04
 "
 
 cross_configure='--prefix=$PREFIX --target=$TARGET_ARCH'
 gcc_make='LANGUAGES="c++"'
 cygwin_make='-k || true'
 
+rpm_patch='patchm.ring.diff'
 
 #################
 # native packages
@@ -110,6 +113,8 @@ regex_before_install='ar -ru libregex.a regex.o \; mkdir -p $PREFIX/{include,lib
 regex_install='subdirs=test'
 regex_before_zip='mkdir -p $install_prefix/{include,lib} \; cp ../$package/regex.h $install_prefix/include \; cp libregex.a $install_prefix/lib'
 
+rx_install='prefix=$PREFIX'
+
 guile_patch='guile-1.3.4-gnu-windows.patch'
 if [ $target = mingw ]; then
        guile_patch1='guile-1.3.4-mingw.patch'
@@ -129,7 +134,7 @@ if [ $target = mingw ]; then
        lilypond_cflags='-I $PREFIX/$TARGET_ARCH/include -I $PREFIX/i686-pc-cygwin/include'
 fi
 lilypond_ldflags='-L$PREFIX/lib -lguile $PREFIX/bin/$CYGWIN_DLL'
-#lilypond_configure='--enable-tex-tfmdir=miktex/usr/share/texmf/fonts/tfm/public/cm/'
+lilypond_configure='--enable-tex-tfmdir=/texmf/fonts/tfm/public/cm'
 ## URG, help2man: doesn't know about cross-compilation.
 #lilypond_make='-k || make -k || true'
 lilypond_patch=lilypond-manpages.patch
@@ -138,11 +143,16 @@ lilypond_install='--just-print'
 lilypond_before_zip='cp -pr $PREFIX/src/$package/input $install_prefix \; cp -p \`find $PREFIX/src/$package -type f -maxdepth 1\` $install_prefix'
 
 native_packages="
-regex-0.12
+rx-1.5
 guile-1.3.4
 lilypond-$lilypond_version
 "
 
+not_yet_needed="
+regex-0.12
+rpm-3.04
+"
+
 #######################
 # end of config section
 #######################

diff --git a/scm/lily.scm b/scm/lily.scm
index b345d1562dc78e8fa766584178e1e4eb33c9b904..f2645988b89a668526598bfd1ae0d5a2cb86975e 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -19,10 +19,12 @@
 
 ;; The regex module may not be available, or may be broken.
 ;; If you have trouble with regex, define #f
-(define use-regex #t)
+;;(define use-regex #t)
 ;;(define use-regex #f)
-;;(define use-regex
-;;  (not (equal? "Windows" (substring (vector-ref (uname) 0) 0 7))))
+
+(define use-regex
+  (let ((os (string-downcase (vector-ref (uname) 0))))
+    (not (equal? "cygwin" (substring os 0 (min 6 (string-length os)))))))
 
 ;; do nothing in .scm output
 (define (comment s) "")