From 13aa1b79cb9a8a03446fca013317a8aab325bcef Mon Sep 17 00:00:00 2001 From: "Jeffrey B. Reed" Date: Sat, 23 Jan 1999 20:13:39 +0100 Subject: [PATCH] patch::: 1.1.23.jbr1 pl 23.jbr1 - scripts/ly2dvi.py: Windows 95 shell does not support redirection of stderr. We now distribute ash and use it when needed. - stepmake/bin/package-zip32.sh: distribute ash, and guild ice-9/ directory. We build and distribute manpages in html format instead of text format. - Documentation/ntweb: Updated doco and now distributing as a self extracted binary with install script. --- Generated by daboys@bga.com using package-diff 0.62, From = lilypond-1.1.23, To = lilypond-1.1.23.jbr1 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.23.jbr1.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure and possibly make outdirs. --state 1.1.23 1.1.23.jbr1 ++state --- Documentation/ntweb/index.yo | 72 +++++++++++++++++------------------ NEWS | 16 +++++++- VERSION | 2 +- aclocal.m4 | 2 + scripts/ly2dvi.py | 10 +++-- stepmake/aclocal.m4 | 2 + stepmake/bin/package-zip32.sh | 30 +++++++++++++-- 7 files changed, 89 insertions(+), 45 deletions(-) diff --git a/Documentation/ntweb/index.yo b/Documentation/ntweb/index.yo index 81d5f2bea3..a13977d5b1 100644 --- a/Documentation/ntweb/index.yo +++ b/Documentation/ntweb/index.yo @@ -1,6 +1,6 @@ mailto(daboys@bga.com) -article(LilyPond Windows NT 4.0 Distribution)(nemail(Jeffrey B. Reed)(daboys@bga.com))(label(contents)) -sect(Windows NT Binary Distribution) +article(LilyPond Windows NT 4.0/95 Distribution)(nemail(Jeffrey B. Reed)(daboys@bga.com))(label(contents)) +sect(Windows NT/95 Binary Distribution) subsect(Introduction) label(introduction) @@ -16,20 +16,29 @@ includefile(../BLURB.in) link(Back to top)(contents) clearpage() -I'm back from the dead! There have been many changes since my last -update. Please read information on batch files and update as needed. -The fonts have changed so you will also need to remove any cached -fonts. In addition please bring music sources up to date by using -convert-mudela utility. I used: +subsect(NEWS) label(news) -verb( -% bf(convert-mudela.py -e angels.ly) +I have made my first attempt at distributing lilypond as a self +extracting executable for Windows NT 4.0 and Windows 95. The +executable will extract the distribution in the directory specified by +the user and create em(lilypond-@TOPLEVEL_VERSION@\lily.bat). This +batch file initializes the LilyPond environment and fires up a Command +Prompt. From this Command Prompt you may run: + +itemize( + it()ly2dvi + it()convert-mudela + it()mudela-book + it()lilypond + it()mi2mu ) -Also please refer to LilyPond documentation for new and changed -features. +I have also converted the Manual Pages for the above tools to HTML for +easy browsing. This release has been tested on Windows NT 4.0sp3 and +Windows 95 and found to be operational. If you have any troubles and +or comments please do not hesitate to drop me a line +url(Jeffrey B. Reed)(mailto:daboys@bga.com). -subsect(NEWS) label(news) This is what the version @TOPLEVEL_VERSION@ brings: verb( @@ -52,9 +61,13 @@ professional quality music score. code(Python) is an interpreted, interactive, object-oriented programming language. It is often compared to code(Tcl), code(Perl), code(Scheme) or code(Java). +Gsview is used to display and print the music scores created by +LilyPond. + itemize( it()url(code(MiKTeX))(http://www.snafu.de/~cschenk/miktex/) it()url(code(Python))(http://www.python.org) + it()url(code(gsview))(http://www.cs.wisc.edu/~ghost/gsview/index.html) ) link(Back to top)(contents) @@ -64,9 +77,7 @@ clearpage() subsect(Download) label(download) itemize( - it() pre-guile version lurl(lilypond-1.0.17.jbr1.bin.zip) nl() - NOTE: LILYPONDPREFIX=em(LilyPond-dir) for this version - it()lurl(lilypond-@TOPLEVEL_VERSION@.bin.zip) + it()url(lilypond-@TOPLEVEL_VERSION@)(lily1123jbr1.exe) ) link(Back to top)(contents) @@ -77,24 +88,8 @@ subsect(Installation) label(installation) itemize( it()link(Download)(download) the distribution. - it()unzip - it()Set your path variable for lilypond and TeX - description( - dit(batch file) - In a batch file you can add the following entries: nl() - bf(set LILYPONDHOME=em(LilyPond-dir)) nl() - bf(set LILYPONDPREFIX=%LILYPONDHOME%\share\lilypond) nl() - bf(set path=%path%;%LILYPONDHOME%\bin;em(MiKTeX-dir)\miktex\bin) nl() - bf(set TEXINPUTS=%LILYPONDPREFIX%\tex;%LILYPONDPREFIX%\ps;;) nl() - bf(set MFINPUTS=%LILYPONDPREFIX%\mf;;) nl() -COMMENT( dit(Windows Environment) - In the Windows environment you can select - properties menu of the My Computer icon. Click on - the environment tag and add the following to the user - variables path entry. nl() - bf(em(LilyPond-dir)\bin;em(MiKTeX-dir)\miktex\bin)) - ) nl() - it() The first installation of LilyPond also requires these + it()run downloaded executable. nl() + it() The first installation of LilyPond also requires these additional steps: description( dit(LaTeX geometry package) @@ -132,10 +127,15 @@ subsect(Running LilyPond) label(running) itemize( it()Take a look at url(angels.ly)(angels.ly) it()Save angels.ly to your local disk - it()From a Command Prompt run: nl() - bf(ly2dvi.py angels.ly) nl() + it()Execute lilypond-@TOPLEVEL_VERSION@\lily.bat nl() +NOTE: If you get an em(out of environment memory error), simply increase +the environment memory by selecting +em(lilypond-@TOPLEVEL_VERSION@\lily.bat) Properties/Memory and increase +the available environment memory to 1024. + it() From a LilyPond Command Prompt run: nl() + bf(ly2dvi angels.ly) nl() bf(dvips angels.dvi) nl() - bf(cmd /c angels.ps) nl() + bf(start angels.ps) nl() ) link(Back to top)(contents) diff --git a/NEWS b/NEWS index fc1703b340..6209ed181a 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,18 @@ ---- ../lilypond-1.1.23.jcn4/NEWS Fri Jan 22 17:54:13 1999 +--- ../lilypond-1.1.23/NEWS Tue Jan 19 10:29:41 1999 +++ b/NEWS Sat Jan 23 20:13:39 1999 +@@ -1,3 +1,12 @@ +pl 23.jbr1 + - scripts/ly2dvi.py: Windows 95 shell does not support redirection + of stderr. We now distribute ash and use it when needed. + - stepmake/bin/package-zip32.sh: distribute ash, and guild ice-9/ + directory. We build and distribute manpages in html format instead + of text format. + - Documentation/ntweb: Updated doco and now distributing as a self + extracted binary with install script. + + pl 22.jcn4 + - bf's: repeat-engraver; \bar "|:", ":|" now deprecated for repeats + - bf: :|, |:--- ../lilypond-1.1.23.jcn4/NEWS Fri Jan 22 17:54:13 1999 ++ b/NEWS Sat Jan 23 16:13:25 1999 @@ -1,3 +1,6 @@ pl 23.jcn5 diff --git a/VERSION b/VERSION index 34dd45d4d9..95eb4dc541 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_LEVEL=23 -MY_PATCH_LEVEL=jcn5 +MY_PATCH_LEVEL=jbr1 # 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 0e035cad95..cb1ebe6cc0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -2,6 +2,8 @@ dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 7c36e368e6..cf8de43e2f 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -14,7 +14,7 @@ Output: DVI file """ name = 'ly2dvi' -version = '0.0.9' +version = '0.0.10' errorlog = '' import sys @@ -341,7 +341,7 @@ class TeXOutput: psoutfile=this.__base + '.ps' if Props.get('output') != '': psoutfile = os.path.join(Props.get('output'), psoutfile ) - stat = os.system('dvips -o %s %s 2>&1' % (psoutfile,outfile)) + stat = os.system('dvips -o %s %s' % (psoutfile,outfile)) if stat: sys.exit('ExitBadPostscript') @@ -1016,7 +1016,11 @@ def main(): type = infile.type() infile.close() if type == 'source': - cmd = 'lilypond %s %s 2>&1' % (getLilyopts(), file) + if os.environ.has_key('OS') and \ + os.environ['OS'] == 'Windows_95': + cmd = 'ash -c "lilypond %s %s 2>&1"' %(getLilyopts(), file) + else: + cmd = 'lilypond %s %s 2>&1' % (getLilyopts(), file) sys.stderr.write ('executing: %s\n'% cmd) fd = os.popen(cmd , 'r') diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 7cab045e68..0e035cad95 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -1,5 +1,7 @@ dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in diff --git a/stepmake/bin/package-zip32.sh b/stepmake/bin/package-zip32.sh index c766cab549..164faa1519 100644 --- a/stepmake/bin/package-zip32.sh +++ b/stepmake/bin/package-zip32.sh @@ -55,8 +55,8 @@ if ! make install ; then exit 1 fi -if ! make -C Documentation/man doc ; then - echo "make -C documentation/man doc failed" +if ! make -C Documentation/man WWW ; then + echo "make -C documentation/man WWW failed" exit 1 fi @@ -74,6 +74,29 @@ fi # cp $CYGWIN_LIB $distdir/bin +ASH_EXE=$PACKAGE_ROOTDIR/distfiles/winnt/ash.exe +if [ ! -e $ASH_EXE ]; then + echo "Unable to locate $ASH_EXE" + exit 1 +fi + +# +# copy ash into bin +# +cp $ASH_EXE $distdir/bin + +GUILE_SCM=$PACKAGE_ROOTDIR/distfiles/winnt/ice-9 +if [ ! -e $GUILE_SCM ]; then + echo "Unable to locate $GUILE_SCM" + exit 1 +fi + +# +# copy guile init files into share/lilypond +# +echo "copy $GUILE_SCM to $distdir/share/lilypond" +cp -r $GUILE_SCM $distdir/share/lilypond + # # Rename python files to .py # @@ -85,8 +108,7 @@ mv $distdir/bin/mudela-book $distdir/bin/mudela-book.py # copy man documentation to doc directory # mkdir $distdir/doc -cp Documentation/man/out/*.txt $distdir/doc -mv $distdir/doc/ly2dvi32.txt $distdir/doc/ly2dvi.txt +cp Documentation/man/out/*.html $distdir/doc cd $distdir/.. $ZIP_CMD $ZIP_FILE $name echo "Wrote $ZIP_FILE" -- 2.39.5