From 0b6e6c325e2fa5831a6d26f418025b5481cbca44 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 18 May 1999 15:09:12 +0200 Subject: [PATCH] patch::: 1.1.43.jcn1 pl 43.jcn1 - configure, set-lily.sh, release stuff --- Documentation/topdocs/INSTALL.yo | 12 ++-- NEWS | 3 +- VERSION | 2 +- aclocal.m4 | 36 ++++++++-- buildscripts/lilypond-login.sh | 2 +- buildscripts/lilypond-profile.sh | 1 - buildscripts/set-lily.sh | 116 +++++++++++++++---------------- configure.in | 24 ++++--- stepmake/NEWS | 3 + stepmake/VERSION | 2 +- stepmake/aclocal.m4 | 36 ++++++++-- stepmake/bin/release.py | 9 ++- 12 files changed, 155 insertions(+), 91 deletions(-) diff --git a/Documentation/topdocs/INSTALL.yo b/Documentation/topdocs/INSTALL.yo index 2faf016ea8..d76531c97d 100644 --- a/Documentation/topdocs/INSTALL.yo +++ b/Documentation/topdocs/INSTALL.yo @@ -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 7d1133c0fd..9b3d25ffa8 100644 --- 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 4a5ed98df2..56e51fb6bb 100644 --- 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. diff --git a/aclocal.m4 b/aclocal.m4 index e1ea2a59d8..1ae2d849de 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -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 diff --git a/buildscripts/lilypond-login.sh b/buildscripts/lilypond-login.sh index b7cfc4d16f..d2c7b96047 100644 --- 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 b40bea1689..4d56f7248a 100644 --- 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 214f3218c1..8d79a65668 100755 --- 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: -# -# -# -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 < /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 diff --git a/stepmake/bin/release.py b/stepmake/bin/release.py index 18be2822b2..780a172284 100755 --- 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') -- 2.39.2