From 3be6f4438da57b6865c4d91a79586a8f71717017 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 19 Sep 2003 21:20:32 +0000 Subject: [PATCH] * cygwin/GNUmakefile: * cygwin/lily-wins.py: * cygwin/postremove-lilypond.sh: * cygwin/postinstall-lilypond.sh: Merge from stable. * cygwin/bug-lilypond-cygwin.sh: s/lilypond/lilypond-bin, s/ly2dvi/lilypond/. --- ChangeLog | 10 ++++++ cygwin/GNUmakefile | 26 +++++++++------ cygwin/README.in | 16 ++++----- cygwin/bug-lilypond-cygwin.sh | 19 +++++------ cygwin/changelog | 27 ++++++++++++++++ cygwin/lilypond-doc.hint | 3 +- cygwin/lilypond.hint | 3 +- cygwin/mknetrel | 5 ++- cygwin/post-lilypond.sh | 9 ------ cygwin/postinstall-lilypond.sh | 59 ++++++++++++++++++++++++++++++++++ cygwin/postremove-lilypond.sh | 17 ++++++++++ 11 files changed, 153 insertions(+), 41 deletions(-) delete mode 100644 cygwin/post-lilypond.sh create mode 100644 cygwin/postinstall-lilypond.sh create mode 100644 cygwin/postremove-lilypond.sh diff --git a/ChangeLog b/ChangeLog index 0df957d44f..2157ac91a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2003-09-19 Jan Nieuwenhuizen + + * cygwin/GNUmakefile: + * cygwin/lily-wins.py: + * cygwin/postremove-lilypond.sh: + * cygwin/postinstall-lilypond.sh: Merge from stable. + + * cygwin/bug-lilypond-cygwin.sh: s/lilypond/lilypond-bin, + s/ly2dvi/lilypond/. + 2003-09-19 Han-Wen Nienhuys * lily/slur.cc (after_line_breaking): only set control points if diff --git a/cygwin/GNUmakefile b/cygwin/GNUmakefile index 93fc10c596..cf85225c0c 100644 --- a/cygwin/GNUmakefile +++ b/cygwin/GNUmakefile @@ -4,7 +4,7 @@ NAME = cygwin EXTRA_DIST_FILES = changelog mknetrel $(wildcard *.hint) -SEXECUTABLES=bug-lilypond-cygwin +SEXECUTABLES=bug-lilypond-cygwin lily-wins STEPMAKE_TEMPLATES = install install-out script include $(depth)/make/stepmake.make @@ -14,36 +14,42 @@ ifneq ($(CYGWIN_BUILD),) include $(stepdir)/executable-targets.make -POST_INSTALLS=$(wildcard post-*.sh) -OUT_POST_INSTALLS=$(POST_INSTALLS:%=$(outdir)/%) +POSTINSTALLS=$(wildcard postinstall*.sh) +OUT_POSTINSTALLS=$(POSTINSTALLS:%=$(outdir)/%) + +POSTREMOVES=$(wildcard postremove*.sh) +OUT_POSTREMOVES=$(POSTREMOVES:%=$(outdir)/%) PROFILES=$(wildcard *-profile.sh) lilypond-profile.sh OUT_PROFILES=$(PROFILES:%=$(outdir)/%) # profiles -$(outdir)/%.sh: %.sh +$(outdir)/%.sh: %.sh $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -# Urg +# Get profile from buildscripts $(outdir)/lilypond-profile.sh: $(outdir)/../$(depth)/buildscripts/$(outconfbase)/lilypond-profile cp $< $@ chmod 755 $@ -default: $(OUT_POST_INSTALLS) $(OUT_PROFILES) $(OUTIN_FILES) +default: $(OUT_POSTINSTALLS) $(OUT_POSTREMOVES) $(OUT_PROFILES) $(OUTIN_FILES) -INSTALLATION_OUT_SUFFIXES=1 2 +INSTALLATION_OUT_SUFFIXES=1 2 # 3 # Avoid collapsed directory constructs '//' etc=$(patsubst %/, %, $(dir $(prefix)))/etc INSTALLATION_DIR=$(etc)/postinstall -INSTALLATION_FILES=$(OUT_POST_INSTALLS) +INSTALLATION_FILES=$(OUT_POSTINSTALLS) INSTALLATION_OUT_DIR1=$(etc)/profile.d INSTALLATION_OUT_FILES1=$(OUT_PROFILES) -INSTALLATION_OUT_DIR2=$(local_lilypond_datadir)/tex -INSTALLATION_OUT_FILES2=$(shell kpsewhich geometry.sty) +INSTALLATION_OUT_DIR2=$(etc)/postremove +INSTALLATION_OUT_FILES2=$(OUT_POSTREMOVES) + +# INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/tex +# INSTALLATION_OUT_FILES3=$(shell kpsewhich geometry.sty) endif diff --git a/cygwin/README.in b/cygwin/README.in index faf4a6397d..b704a76774 100644 --- a/cygwin/README.in +++ b/cygwin/README.in @@ -13,15 +13,15 @@ When it all works, head straight to the tutorial: Runtime requirements: - cygwin-1.5.0 or newer - libguile12 + cygwin-1.5.2 or newer + libguile12-1.6.4-12 or newer bash ghostscript libiconv2 libintl2 - libkpathsea3 + libkpathsea3-2.0.2-12 or newer python - tetex-bin + tetex-bin-2.0.2-12 or newer tetex-tiny or tetex-base Suggested: @@ -35,19 +35,19 @@ Suggested: http://www.cs.wisc.edu/~ghost Build requirements: - cygwin-1.5.0 or newer + cygwin-1.5.2 or newer binutils-20011102 or newer gcc-2.95.3-5 or newer bison-1.35 or newer guile-devel-1.6.4-11 or newer fileutils flex-2.5.4 or newer - libguile12-1.6.0-1 or newer - libkpathsea3-2.0.2-11 or newer + libguile12-1.6.4-12 or newer + libkpathsea3-2.0.2-12 or newer python-2.2 or newer sed-3.02 or newer sh-utils - tetex-devel-2.0.2-11 or newer + tetex-devel-2.0.2-12 or newer texinfo-4.2 or newer Website/documentation build requirements (lilypond-doc package): diff --git a/cygwin/bug-lilypond-cygwin.sh b/cygwin/bug-lilypond-cygwin.sh index 1c61929e58..b0c0c2d894 100644 --- a/cygwin/bug-lilypond-cygwin.sh +++ b/cygwin/bug-lilypond-cygwin.sh @@ -22,7 +22,8 @@ fi docdir=@prefix@/share/doc/lilypond-@TOPLEVEL_VERSION@-1 [ ! -d $docdir ] && docdir=@prefix@/doc/lilypond-@TOPLEVEL_VERSION@-1 -[ ! -d $docdir ] && docdir=$(echo /usr/doc/lilypond-[0-9]*) +[ ! -d $docdir ] && docdir=$(echo @prefix@/share/doc/lilypond-[.-0-9]*) +[ ! -d $docdir ] && docdir=$(echo @prefix@/doc/lilypond-[.-0-9]*) echo echo Availability of executables @@ -30,19 +31,19 @@ echo =========================== type -p tex type -p latex type -p kpsewhich -type -p lilypond +type -p lilypond-bin type -p python -type -p ly2dvi +type -p lilypond type -p tex.exe type -p latex.exe type -p kpsewhich.exe -type -p lilypond.exe +type -p lilypond-bin.exe type -p python.exe -lilypond --version +lilypond-bin --version python -V -ly2dvi --version +lilypond --version echo @@ -58,16 +59,16 @@ kpsewhich feta20.pk cp $docdir/input/example-1.ly . cp $docdir/input/example-2.ly . lilypond example-1.ly -tex \\nonstopmode \\input example-1.tex +latex \\nonstopmode \\input example-1.tex dvips -o example-1.ps example-1.dvi ls -l -ly2dvi --verbose example-2 +lilypond --verbose example-2 ls -l echo echo Environment settings echo ==================== -# If python is ok and ly2dvi runs, this all is not really necessary. +# If python is ok and lilypond runs, this all is not really necessary. echo HOME="<$HOME>" echo SHELL="<$SHELL>" echo LILYPONDPREFIX="<$LILYPONDPREFIX>" diff --git a/cygwin/changelog b/cygwin/changelog index 6da5d9a53c..2a306b649b 100644 --- a/cygwin/changelog +++ b/cygwin/changelog @@ -1,3 +1,30 @@ +lilypond (1.9.8-1) unstable; urgency=low + + * New upstream release. + + -- Jan Nieuwenhuizen Fri, 19 Sep 2003 23:20:46 +0200 + +lilypond (1.8.2-1) unstable; urgency=low + + * New upstream release. + + -- Jan Nieuwenhuizen Wed, 17 Sep 2003 18:46:53 +0200 + +lilypond (1.8.1-12) unstable; urgency=low + + * Cygwin build fix: add cygwin-specific profile and postinstall scripts. + + -- Jan Nieuwenhuizen Fri, 29 Aug 2003 13:10:17 +0200 + +lilypond (1.8.1-11) unstable; urgency=low + + * New upstream release. + * ly2dvi fixes for /dev/std* redirection in Python's os.system () for + when /bin/sh is the lesser /bin/ash from CVS. + * lilypond-book fix from CVS. + + -- Jan Nieuwenhuizen Wed, 27 Aug 2003 19:29:23 +0200 + lilypond (1.8.0-11) unstable; urgency=low * New upstream release. diff --git a/cygwin/lilypond-doc.hint b/cygwin/lilypond-doc.hint index abab339b93..35dde5291e 100644 --- a/cygwin/lilypond-doc.hint +++ b/cygwin/lilypond-doc.hint @@ -1,6 +1,5 @@ sdesc: "LilyPond documentation." -test: 1.7.29-11 -curr: 1.6.11-1 +test: 1.9.8 category: Doc ldesc: "LilyPond Documentation in HTML, PS, PDF and DVI formats. This package contains the HTML, PostScript PDF and DVI documentation for diff --git a/cygwin/lilypond.hint b/cygwin/lilypond.hint index d887f79a43..8ba4491d39 100644 --- a/cygwin/lilypond.hint +++ b/cygwin/lilypond.hint @@ -1,6 +1,5 @@ sdesc: "A program for printing sheet music" -test: 1.7.29-11 -curr: 1.6.11-1 +test: 1.9.8 category: Publishing requires: bash cygwin fileutils findutils ghostscript libguile12abi13 libguile12 libiconv2 libintl2 libkpathsea3 libkpathsea3abi13 python tetex-bin tetex-tiny #requires: tetex-bin, tetex-tiny | tetex-base diff --git a/cygwin/mknetrel b/cygwin/mknetrel index aee68a7e92..4fb5bf81e4 100644 --- a/cygwin/mknetrel +++ b/cygwin/mknetrel @@ -6,6 +6,9 @@ # stable LilyPond releases: lilypond-1.8 # archive=ftp://lilypond.org/pub/LilyPond/v1.8 +# development LilyPond releases: lilypond-1.9 +# archive=ftp://lilypond.org/pub/LilyPond/v1.9 + # LilyPond mknetrel overrides # To use this, do something like: cat >/dev/null < /run-lily-wins.bat <