---- ../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>
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]'`
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
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'
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
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
#######################
;; 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) "")