]> git.donarmstrong.com Git - lilypond.git/commitdiff
patch::: 1.1.43.jcn1
authorJan Nieuwenhuizen <janneke@gnu.org>
Tue, 18 May 1999 13:09:12 +0000 (15:09 +0200)
committerJan Nieuwenhuizen <janneke@gnu.org>
Tue, 18 May 1999 13:09:12 +0000 (15:09 +0200)
pl 43.jcn1
- configure, set-lily.sh, release stuff

12 files changed:
Documentation/topdocs/INSTALL.yo
NEWS
VERSION
aclocal.m4
buildscripts/lilypond-login.sh
buildscripts/lilypond-profile.sh
buildscripts/set-lily.sh
configure.in
stepmake/NEWS
stepmake/VERSION
stepmake/aclocal.m4
stepmake/bin/release.py

index 2faf016ea83c71182c1da70932f25f3b05606919..d76531c97d83c9a952fa952b573c0787ef13a6ba 100644 (file)
@@ -51,7 +51,7 @@ find various files.  The recommended way of doing so is adjusting the
 environment variables in the start-up scripts of your shell.  An
 example is given here for the Bourne shell:
 verb(export MFINPUTS="/usr/local/share/lilypond/mf:"
-export TEXINPUTS="/usr/local/share/lilypond/tex:"
+export TEXINPUTS="/usr/local/share/lilypond/tex:/usr/local/share/lilypond/ps:"
 )
 The empty path component
 represents TeX() and MetaFont's default search paths.  Scripts with
@@ -134,7 +134,7 @@ to install GNU LilyPond, simply type:
 verb(
        gunzip -c lilypond-x.y.z | tar xf -
        cd lilypond-x.y.z
-       configure               # fill in your standard prefix with --prefix
+       ./configure             # fill in your standard prefix with --prefix
        make
        make install
 )
@@ -158,7 +158,7 @@ adjust your environment variables to your taste:
 
 verb(
        export CPPFLAGS="-I /home/me/my_include -DWEIRD_FOOBAR" 
-       configure
+       ./configure
 )
 
 code(CPPFLAGS) are the preprocessor flags. 
@@ -168,7 +168,7 @@ bf(--help). If you are not root, you will probably have to make it
 with a different bf(--prefix) option.  Our favourite location is
 
 verb(
-       configure --prefix=$HOME/usr
+       ./configure --prefix=$HOME/usr
 )
 
 In this case, you will have to set up MFINPUTS, and TEXINPUTS accordingly.
@@ -216,7 +216,7 @@ want to build with and   without profiling.  Then I'd use the
 following for the normal build, 
 
 verb(
-      configure --prefix=~ --disable-optimise --enable-checking
+      ./configure --prefix=~ --disable-optimise --enable-checking
       make
       make install
      )
@@ -224,7 +224,7 @@ verb(
 and for the profiling version, I specify a different configuration.
 
 verb(
-      configure --prefix=~ --enable-profiling --enable-config=optprof --enable-optimise --disable-checking
+      ./configure --prefix=~ --enable-profiling --enable-config=optprof --enable-optimise --disable-checking
       make config=optprof
       make config=optprof install
 )
diff --git a/NEWS b/NEWS
index 7d1133c0fddafad08e4b3293be8d4f4d96597fc2..9b3d25ffa872aea8069a2271b78d9d1ea33e7bcf 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
-
+pl 43.jcn1
+       - configure, set-lily.sh, release stuff
 
 pl 41.hwn3
        - reinstated \property inheritance
diff --git a/VERSION b/VERSION
index 4a5ed98df2bb3e5607c373b9f0a8efadfdd63eb8..56e51fb6bb9ef5a10a241bbbc7893f0a7be6bd77 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=43
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
index e1ea2a59d89e3b5acbba4a5bbd6ed9bf2ae10549..1ae2d849de1b2d028950894e8284bc0894565797 100644 (file)
@@ -196,20 +196,22 @@ AC_DEFUN(AC_STEPMAKE_INIT, [
     fi
     stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"`
 
+    AC_MSG_CHECKING(Package)
     if test "x$PACKAGE" = "xSTEPMAKE"; then
-        echo Stepmake package!
+       AC_MSG_RESULT(Stepmake package!)
        (cd stepmake; rm -f stepmake; ln -s ../stepmake .)
        (cd stepmake; rm -f bin; ln -s ../bin .)
        AC_CONFIG_AUX_DIR(bin)
        stepmake=stepmake
     else
-        echo Package: $PACKAGE
+        AC_MSG_RESULT($PACKAGE)
+       AC_MSG_CHECKING(for stepmake)
        # Check for installed stepmake
        if test -d $stepmake; then
-           echo Using installed stepmake: $stepmake
+           AC_MSG_RESULT($stepmake)
        else
            stepmake='$(depth)'/stepmake
-           echo Using local stepmake: $datadir/stepmake not found
+           AC_MSG_RESULT(./stepmake  ($datadir/stepmake not found))
        fi
        AC_CONFIG_AUX_DIR(\
          $HOME/usr/local/share/stepmake/bin\
@@ -474,7 +476,8 @@ AC_DEFUN(AC_STEPMAKE_MSGFMT, [
     fi
 ])
 
-AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [
+#why has this been dropped?
+AC_DEFUN(XXAC_STEPMAKE_TEXMF_DIRS, [
     AC_ARG_ENABLE(tex-prefix,
     [  enable-tex-prefix=DIR   set the tex-directory to find TeX subdirectories. (default: PREFIX)],
     [TEXPREFIX=$enableval],
@@ -508,6 +511,29 @@ AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [
     AC_SUBST(MFDIR)
 ])
 
+AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [
+    AC_ARG_ENABLE(tex-tfmdir,
+    [  enable-tex-tfmdir=DIR   set the tex-directory where cmr10.tfm lives (default: use kpsewhich)],
+    [TFMDIR=$enableval],
+    [TFMDIR=auto] )
+
+    AC_MSG_CHECKING(TeX TFM directory)
+    if test "x$TFMDIR" = xauto ; then
+       if test "x$TEX_TFMDIR" = "x" ; then
+           if kpsewhich --version > /dev/null 2>&1 ; then
+               TEX_TFMDIR=`kpsewhich tfm cmr10.tfm`
+               CMR10=`kpsewhich tfm cmr10.tfm`
+               TEX_TFMDIR=`dirname $CMR10`
+           else
+               AC_STEPMAKE_WARN(Please set TEX_TFMDIR (to where cmr10.tfm lives):
+       TEX_TFMDIR=/usr/local/TeX/lib/tex/fonts ./configure)
+           fi
+       fi
+    fi
+    AC_MSG_RESULT($TEX_TFMDIR)
+    AC_SUBST(TEX_TFMDIR)
+])
+
 AC_DEFUN(AC_STEPMAKE_TEXMF, [
     # urg, never know what names these teTeX guys will think up
 
index b7cfc4d16f33bf1bd4249b41bc38a29c203bd8d8..d2c7b96047a2346631ca4624ce327ac0f4af7bc1 100644 (file)
@@ -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.
index b40bea1689ed0eb7af04aa65d49205c1b64c07f3..4d56f7248abfcf542d4d6dde45bce6cf87e56c3e 100644 (file)
@@ -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@"
 
index 214f3218c175e464b5c977c638632dbf07f0c756..8d79a6566858b950730285cade86f3e0858fa040 100755 (executable)
@@ -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)
 
index 43abc3439be33918f9f4e4c23e114e1acc9c0461..eb276f305ae041a662727429532557e9b23672ce 100644 (file)
@@ -35,7 +35,7 @@ AC_STEPMAKE_LOCALE
 AC_STEPMAKE_GETTEXT
 AC_STEPMAKE_MSGFMT
 AC_STEPMAKE_TEXMF
-AC_STEPMAKE_TEXMF_DIRS
+AC_STEPMAKE_TEXMF_DIRS
 AC_STEPMAKE_YODL
 AC_STEPMAKE_GUILE
 
@@ -54,13 +54,21 @@ AC_CHECK_PROGS(MAKEINFO, makeinfo, error)
 AC_CHECK_SEARCH_RESULT($YODL2TEXINFO, yodl,  
     You should install Yodl 1.30.2 or newer)
 
+AC_MSG_CHECKING(links for running from sourcetree)
+LILYPONDPREFIX=$absolute_builddir
+LOCALES="it nl"
+for i in $LOCALES; do
+       dir=$LILYPONDPREFIX/share/locale/$i/LC_MESSAGES
+       if test ! -x $dir ; then
+               mkdir -p $dir
+       fi
+       rm -f $dir/lilypond.mo 
+       ln -sf $LILYPONDPREFIX/po/out/$i.mo $dir/lilypond.mo
+done
+rm -f afm; ln -sf $LILYPONDPREFIX/mf/out afm
+rm -f tfm; ln -sf $LILYPONDPREFIX/mf/out tfm
+rm -f cmtfm; ln -sf `dirname $TEX_TFMDIR` cmtfm
+AC_MSG_RESULT(ok)
 
-AC_MSG_CHECKING(Checking TFM directory)
-CMR10=`kpsewhich tfm cmr10.tfm`
-TEX_TFMDIR=`dirname $CMR10`
-AC_MSG_RESULT($TEX_TFMDIR)
-
-AC_SUBST(TEX_TFMDIR)
 AC_STEPMAKE_END
 
-
index d25b32274ed126ec6775aee1b53b705e7ec3439f..816a48d3bd1cf1ca7812d20294d265ec02c5c37d 100644 (file)
@@ -1,3 +1,6 @@
+pl 75
+       - bfs: release
+
 pl 74
        - avoid buggy /bin/sh on hp-ux
        - bf: make/stepmake.make
index a9f9a070366163a57873b99023fcd2cfdad873bf..551522be3dc3cd4dfee3f6fc5b135e82697e59f6 100644 (file)
@@ -1,7 +1,7 @@
 PACKAGE_NAME=StepMake
 MAJOR_VERSION=0
 MINOR_VERSION=1
-PATCH_LEVEL=74
+PATCH_LEVEL=75
 MY_PATCH_LEVEL=
 
 # use the above to send patches, always empty for released version:
index e1ea2a59d89e3b5acbba4a5bbd6ed9bf2ae10549..1ae2d849de1b2d028950894e8284bc0894565797 100644 (file)
@@ -196,20 +196,22 @@ AC_DEFUN(AC_STEPMAKE_INIT, [
     fi
     stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"`
 
+    AC_MSG_CHECKING(Package)
     if test "x$PACKAGE" = "xSTEPMAKE"; then
-        echo Stepmake package!
+       AC_MSG_RESULT(Stepmake package!)
        (cd stepmake; rm -f stepmake; ln -s ../stepmake .)
        (cd stepmake; rm -f bin; ln -s ../bin .)
        AC_CONFIG_AUX_DIR(bin)
        stepmake=stepmake
     else
-        echo Package: $PACKAGE
+        AC_MSG_RESULT($PACKAGE)
+       AC_MSG_CHECKING(for stepmake)
        # Check for installed stepmake
        if test -d $stepmake; then
-           echo Using installed stepmake: $stepmake
+           AC_MSG_RESULT($stepmake)
        else
            stepmake='$(depth)'/stepmake
-           echo Using local stepmake: $datadir/stepmake not found
+           AC_MSG_RESULT(./stepmake  ($datadir/stepmake not found))
        fi
        AC_CONFIG_AUX_DIR(\
          $HOME/usr/local/share/stepmake/bin\
@@ -474,7 +476,8 @@ AC_DEFUN(AC_STEPMAKE_MSGFMT, [
     fi
 ])
 
-AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [
+#why has this been dropped?
+AC_DEFUN(XXAC_STEPMAKE_TEXMF_DIRS, [
     AC_ARG_ENABLE(tex-prefix,
     [  enable-tex-prefix=DIR   set the tex-directory to find TeX subdirectories. (default: PREFIX)],
     [TEXPREFIX=$enableval],
@@ -508,6 +511,29 @@ AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [
     AC_SUBST(MFDIR)
 ])
 
+AC_DEFUN(AC_STEPMAKE_TEXMF_DIRS, [
+    AC_ARG_ENABLE(tex-tfmdir,
+    [  enable-tex-tfmdir=DIR   set the tex-directory where cmr10.tfm lives (default: use kpsewhich)],
+    [TFMDIR=$enableval],
+    [TFMDIR=auto] )
+
+    AC_MSG_CHECKING(TeX TFM directory)
+    if test "x$TFMDIR" = xauto ; then
+       if test "x$TEX_TFMDIR" = "x" ; then
+           if kpsewhich --version > /dev/null 2>&1 ; then
+               TEX_TFMDIR=`kpsewhich tfm cmr10.tfm`
+               CMR10=`kpsewhich tfm cmr10.tfm`
+               TEX_TFMDIR=`dirname $CMR10`
+           else
+               AC_STEPMAKE_WARN(Please set TEX_TFMDIR (to where cmr10.tfm lives):
+       TEX_TFMDIR=/usr/local/TeX/lib/tex/fonts ./configure)
+           fi
+       fi
+    fi
+    AC_MSG_RESULT($TEX_TFMDIR)
+    AC_SUBST(TEX_TFMDIR)
+])
+
 AC_DEFUN(AC_STEPMAKE_TEXMF, [
     # urg, never know what names these teTeX guys will think up
 
index 18be2822b20bb73609f48afed53400302e79e0bd..780a1722849ebc3d4a12f6ab4db3c8c9f949e6bb 100755 (executable)
@@ -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')