lilypond-1.1.44

diff --git a/buildscripts/lilypond-login.sh b/buildscripts/lilypond-login.sh
index b7cfc4d16f33bf1bd4249b41bc38a29c203bd8d8..d2c7b96047a2346631ca4624ce327ac0f4af7bc1 100644 (file)
--- a/buildscripts/lilypond-login.sh
+++ b/buildscripts/lilypond-login.sh
@@ -5,7 +5,7 @@
 # set environment for LilyPond.  To be installed in /etc/profile.d/
 setenv GS_LIB "@datadir@/afm"
 setenv GS_FONTPATH "@datadir@/ps"
-setenv LILYINCLUDE "@datadir@/ly:@datadir@/afm"
+# bit silly. for ly2dvi, overrules compiled-in datadir...
 setenv LILYPONDPREFIX "@datadir@"
 
 # include an empty path component for the system wide includes.

diff --git a/buildscripts/lilypond-profile.sh b/buildscripts/lilypond-profile.sh
index b40bea1689ed0eb7af04aa65d49205c1b64c07f3..4d56f7248abfcf542d4d6dde45bce6cf87e56c3e 100644 (file)
--- a/buildscripts/lilypond-profile.sh
+++ b/buildscripts/lilypond-profile.sh
@@ -4,7 +4,6 @@
 # set environment for LilyPond.  To be installed in /etc/profile.d/
 GS_LIB="@datadir@/afm"
 GS_FONTPATH="@datadir@/ps"
-LILYINCLUDE="@datadir@/ly:@datadir@/afm"
 # bit silly. for ly2dvi, overrules compiled-in datadir...
 LILYPONDPREFIX="@datadir@"
 

diff --git a/buildscripts/set-lily.sh b/buildscripts/set-lily.sh
index 214f3218c175e464b5c977c638632dbf07f0c756..8d79a6566858b950730285cade86f3e0858fa040 100644 (file)
--- a/buildscripts/set-lily.sh
+++ b/buildscripts/set-lily.sh
@@ -1,81 +1,77 @@
 #!/bin/sh
-# zet-lily.sh --- configure LilyPond sourcetree
-# nice in first character unique name
+# set-lily.sh --- configure LilyPond sourcetree; 
 #
+# configure Lily in $HOME/usr/src/lilypond-x.x.x, 
+# and without installing
+#
+
 PACKAGE_NAME=LilyPond
 export PACKAGE_NAME
 prefix=$HOME/usr
 sources=$prefix/src
 
-#
-#
-. ./stepmake/bin/package-zet.sh
-#
-# The $sources dir looks like this:
-#
-# <SEE PATCHES.txt>
-#
-if [ "x$LILYINCLUDE" = "x" ]; then
-       # we can try...
-       echo you should add the following to your profile script
-       if [ "x$MAILADDRESS" = "x" ]; then
-               MAILADDRESS=$USER@`hostname`
-               export MAILADDRESS
-               echo "        MAILADDRESS=\$USER@`hostname`"
-               echo "        export MAILADDRESS"
+showln ()
+{
+       (set -x; ln $*)
+}
+
+testmkdir ()
+{
+       if [ ! -x $1 ]; then
+               (set -x; mkdir -p $1)
        fi
-       LILYINCLUDE=$LILYPOND_SOURCEDIR/init:$LILYPOND_SOURCEDIR/input:$LILYPOND_SOURCEDIR/mf/out
-       MFINPUTS=$MFINPUTS:$LILYPOND_SOURCEDIR/mf
-       TEXINPUTS=$TEXINPUTS:$LILYPOND_SOURCEDIR/mf/out:$LILYPOND_SOURCEDIR/ps:$LILYPOND_SOURCEDIR/tex
-       export LILYINCLUDE MFINPUTS TEXINPUTS
-       GS_LIB=$HOME/usr/src/lilypond/ps
-       GS_FONTPATH=$HOME/usr/src/lilypond/mf/out
-       GUILE_LOAD_PATH=$HOME/usr/src/lilypond/init
-       export GS_LIB GS_FONTPATH GUILE_LOAD_PATH
-       cat <<EOF
-       LILYINCLUDE=$LILYPOND_SOURCEDIR/init:$LILYPOND_SOURCEDIR/mf/out
-       MFINPUTS=\$MFINPUTS:\$LILYPOND_SOURCEDIR/mf
-       TEXINPUTS=$TEXINPUTS:$LILYPOND_SOURCEDIR/mf/out:$LILYPOND_SOURCEDIR/ps:$LILYPOND_SOURCEDIR/tex
-       export LILYINCLUDE MFINPUTS TEXINPUTS
-EOF
+}
 
-fi
+testvar ()
+{
+       var=`eval echo '\$'$1`
+       if [ "`echo "$var" | grep $2`" = "" ]; then
+#      if ! expr "$var" : ".*\($2\).*" ; then
+               eval $1=$3 
+               export $1
+               echo "        $1=$3"
+               echo "        export $1"
+       fi
+}
+
+. ./stepmake/bin/package-zet.sh
 
-ln -sf $LILYPOND_SOURCEDIR/lily/out/lilypond $prefix/bin/lilypond
-ln -sf $LILYPOND_SOURCEDIR/mi2mu/out/mi2mu $prefix/bin/mi2mu
-ln -sf $LILYPOND_SOURCEDIR/scripts/out/ly2dvi $prefix/bin/ly2dvi
-ln -sf $LILYPOND_SOURCEDIR/scripts/out/mudela-book $prefix/bin/mudela-book
+echo You should add the following to your profile script
+echo
+testvar LILYPONDPREFIX lily $LILYPOND_SOURCEDIR
+testvar MFINPUTS lily .:$MFINPUTS:$LILYPOND_SOURCEDIR/mf
+testvar TEXINPUTS lily .:$TEXINPUTS:$LILYPOND_SOURCEDIR/ps:$LILYPOND_SOURCEDIR/tex
+testvar GS_LIB lily $HOME/usr/src/lilypond/ps
+testvar GS_FONTPATH lily $HOME/usr/src/lilypond/mf/out
+testvar GUILE_LOAD_PATH lily $HOME/usr/src/lilypond/init
+testvar MAILADDRESS "@" $USER@`hostname`
+echo
+
+echo Setting up links
+echo
+showln -sf $LILYPOND_SOURCEDIR/lily/out/lilypond $prefix/bin/lilypond
+showln -sf $LILYPOND_SOURCEDIR/mi2mu/out/mi2mu $prefix/bin/mi2mu
+showln -sf $LILYPOND_SOURCEDIR/scripts/out/ly2dvi $prefix/bin/ly2dvi
+showln -sf $LILYPOND_SOURCEDIR/scripts/out/mudela-book $prefix/bin/mudela-book
 chmod 755 $LILYPOND_SOURCEDIR/buildscripts/ps-to-gifs.sh
-ln -sf $LILYPOND_SOURCEDIR/buildscripts/ps-to-gifs.sh $prefix/bin/ps-to-gifs
-ln -sf $LILYPOND_SOURCEDIR/mf/out/ afm
-TFMDIR=`kpsewhich tfm cmr10.tfm`
-ln -sf `dirname $TFMDIR` cmtfm
-rm -f tfm;
-ln -s mf/out tfm
+showln -sf $LILYPOND_SOURCEDIR/buildscripts/ps-to-gifs.sh $prefix/bin/ps-to-gifs
+
+testmkdir $prefix/share
+rm -rf $prefix/share/lilypond
+showln -sf $sources/lilypond $prefix/share/lilypond
 
-mkdir -p $prefix/share/
-if [ ! -x $prefix/share/lilypond ]; then
-    echo ln -sf  $sources/lilypond $prefix/share
-    ln -sf  $sources/lilypond $prefix/
-fi
-# real weird locale dir if $LILYPONDPREFIX is set...
-if [ $LILYPONDPREFIX != "" ]; then
-       LOCALES="it nl"
-       for i in $LOCALES; do
-               dir=$LILYPONDPREFIX/share/locale/$i/LC_MESSAGES
-               mkdir -p $dir
-               ln -sf $LILYPOND_SOURCEDIR/po/out/$i.mo $dir/lilypond.mo
-       done
-fi
 if [ -f ../.gdbinit ];
 then
-    ln ../.gdbinit .
+    showln -f ../.gdbinit .
 fi
 
 if [ -f ../.dstreamrc ]
 then
-    ln ../.dstreamrc .
+    showln -f ../.dstreamrc .
 fi
+echo
 
-./configure --prefix=$prefix --enable-debugging --enable-printing --enable-checking --disable-optimise --enable-guile
+echo Starting configuration
+echo
+(set -x; TEX_TFMDIR=$TEX_TFMDIR ./configure --prefix=$prefix --enable-debugging --enable-printing --enable-checking --disable-optimise --enable-guile)
 

diff --git a/stepmake/bin/release.py b/stepmake/bin/release.py
index 18be2822b20bb73609f48afed53400302e79e0bd..780a1722849ebc3d4a12f6ab4db3c8c9f949e6bb 100755 (executable)
--- a/stepmake/bin/release.py
+++ b/stepmake/bin/release.py
@@ -48,7 +48,10 @@ print barbaal
 os.remove(package.release_dir + barbaal)
 os.link('out/' + barbaal, package.release_dir + barbaal)
 os.chdir(package.test_dir)
-os.system('set -x; rm ' + package.test_dir + package.name + '*gz')
+try:
+       os.system('set -x; rm ' + package.test_dir + package.name + '*gz')
+except:
+       pass
 # os.link(released_tarball(cur_ver), tarball(cur_ver))
 os.link(package.release_dir + barbaal, barbaal)
 
@@ -70,5 +73,7 @@ rel_pn = package.patch_dir + pn
 os.rename(pn, rel_pn)
 os.link(rel_pn, pn)
 
-os.system('tar cf ' + package.nickname + ' *gz')
+# urg; this includes lilypond*.gz into yodl ball
+# os.system('tar cf ' + package.nickname + ' *gz')
+os.system('set -x; tar cf ' + package.nickname + ' ' + package.name + '*gz')