lilypond-1.3.40

diff --git a/buildscripts/make-cygwin-cross.sh b/buildscripts/make-cygwin-cross.sh
index ad1b50ba0d21e82caedc4274e2bed9640e4cbaae..4e02957799bfde28a1e9fbd9f4fe8037479ec785 100644 (file)
--- a/buildscripts/make-cygwin-cross.sh
+++ b/buildscripts/make-cygwin-cross.sh
@@ -27,6 +27,8 @@
 #
 #          bin-crtdll-2000-02-03.tar.gz  (mingw only)
 #
+#  * rx-1.5.tar.gz
+#
 #  * guile-1.3.4.tar.gz
 #
 #  * lilypond-1.3.38.jcn1.tar.gz
@@ -58,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]'`
 
@@ -80,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
@@ -100,6 +105,9 @@ cygwin_make='-k || true'
 # so that's how we configure them.
 #
 native_configure='--target=$TARGET_ARCH --build=$TARGET_ARCH --host=$HOST --oldincludedir=$PREFIX/include --prefix=$NATIVE_PREFIX/$package --program-suffix='
+native_config_site='$PREFIX/share/native-config.site'
+
+rx_install='prefix=$PREFIX'
 
 guile_patch='guile-1.3.4-gnu-windows.patch'
 if [ $target = mingw ]; then
@@ -107,7 +115,6 @@ if [ $target = mingw ]; then
        guile_cflags='-I $PREFIX/$TARGET_ARCH/include -I $PREFIX/i686-pc-cygwin/include'
 fi
 guile_ldflags='-L$PREFIX/lib $PREFIX/bin/$CYGWIN_DLL'
-guile_configure='--enable-sizeof-int=4 --enable-sizeof-long=4 --enable-restartable-syscalls=yes'
 guile_make='oldincludedir=$PREFIX/include'
 
 # We need to get guile properly installed for cross-development, ie
@@ -121,18 +128,24 @@ 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='--prefix=$lilypond_prefix'
+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
 # Don't install lilypond
 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="
+rx-1.5
 guile-1.3.4
 lilypond-$lilypond_version
 "
 
+not_yet_needed="
+rpm-3.04
+"
+
 #######################
 # end of config section
 #######################
@@ -172,7 +185,7 @@ expand ()
 {(
 
        set -
-       string=`eval echo $\`eval echo ${1}${2}\``
+       string=`eval echo $\`eval echo "${1}${2}"\``
        eval echo $string
 )
 }
@@ -220,8 +233,10 @@ build ()
         name_cflags=`expand $name _cflags`
         name_ldflags=`expand $name _ldflags`
         name_configure=`expand $name _configure`
+        type_config_site=`expand $type _config_site`
         type_configure=`expand $type _configure`
         name_make=`expand $name _make`
+        name_before_install="`expand $name _before_install`"
         name_install=`expand $name _install`
 
        found=`find_path $package*src.tar.gz`
@@ -242,6 +257,7 @@ build ()
        while [ "x$patch" != "x" ]; do
                (
                cd $package
+               set -x
                found=`find_path $patch`
                if [ "$found" = "" ]; then
                        echo "$patch: no such file"
@@ -252,13 +268,13 @@ build ()
                count=`expr $count + 1`
                patch=`expand $name _patch$count`
        done
-       set -x
        mkdir $type-$package
        cd $type-$package
 
        rm -f config.cache
-       CFLAGS="$name_cflags" LDFLAGS="$name_ldflags" ../$package/configure $type_configure $name_configure || exit 1
+       CONFIG_SITE="$type_config_site" CFLAGS="$name_cflags" LDFLAGS="$name_ldflags" ../$package/configure $type_configure $name_configure || exit 1
        make $name_make || exit 1
+       `eval $name_before_install` || exit 1
        make install $name_install || exit 1
 )
 }
@@ -280,6 +296,7 @@ pack ()
         name_pack_install=`expand $name _pack_install`
        install_root=/tmp/$package-install
        install_prefix=$install_root/$NATIVE_PREFIX/$package
+       name_before_zip=`expand $name _before_zip`
 
        set -x
        rm -rf $install_root
@@ -297,7 +314,8 @@ pack ()
        done
 
         rm -f $zip
-        cd $install_root && zip -r $zip .$NATIVE_PREFIX
+       `eval $name_before_zip` || exit 1
+        cd $install_root && zip -ry $zip .$NATIVE_PREFIX
 )
 }
 ##################
@@ -378,6 +396,15 @@ PATH=$PREFIX/$TARGET_ARCH/bin:$PREFIX/bin:$PATH
 mkdir -p $PREFIX/src
 cd $PREFIX/src
 
+ncs=`eval echo $native_config_site`
+rm -f $ncs
+mkdir -p `dirname $ncs`
+cat > $ncs <<EOF
+ac_cv_sizeof_int=4
+ac_cv_sizeof_long=4
+ac_cv_sys_restartable_syscalls=yes
+EOF
+
 set -x
 type=native
 for i in $native_packages; do

diff --git a/scm/lily.scm b/scm/lily.scm
index ecca25e01ee9a64d9e995059fb2b9d814232ed98..f2645988b89a668526598bfd1ae0d5a2cb86975e 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -17,8 +17,14 @@
 
 (use-modules (ice-9 regex))
 
+;; 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 #f)
+
 (define use-regex
-  (not (string-match ".*windows.*" (string-downcase (vector-ref (uname) 0)))))
+  (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) "")