* 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/.

diff --git a/ChangeLog b/ChangeLog
index 0df957d44f0fc1374ab56d5bf5435c566d159ef4..2157ac91a37cb56736cb260584d8458a57ccb4af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-09-19  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * 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  <hanwen@cs.uu.nl>
 
        * lily/slur.cc (after_line_breaking): only set control points if

diff --git a/cygwin/GNUmakefile b/cygwin/GNUmakefile
index 93fc10c5960107d5d541ecd6886746e7fd8203b0..cf85225c0c871ba9c2359b04ee8bc5b191217f41 100644 (file)
--- 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 faf4a6397dad67b55742336dca054712db23cea0..b704a76774390e3e8447775ba4802d7068e84363 100644 (file)
--- 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 1c61929e5865b529393dd1aa39b19aee7692e87b..b0c0c2d89467e0bd4df2d6c132466326965448d7 100644 (file)
--- 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 6da5d9a53ce2bd1e04a7c006c4a68919e946249d..2a306b649b25ce69b7b9ddf0c152b4715129e2ec 100644 (file)
--- a/cygwin/changelog
+++ b/cygwin/changelog
@@ -1,3 +1,30 @@
+lilypond (1.9.8-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Fri, 19 Sep 2003 23:20:46 +0200
+
+lilypond (1.8.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  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 <janneke@gnu.org>  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 <janneke@gnu.org>  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 abab339b9331778a40dee5456790023cf7ee7452..35dde5291e28065e8e1590d40033440a13f5770e 100644 (file)
--- 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 d887f79a4326ab11d1d0f867f6274ecb17b675b7..8ba4491d3975394371e5ef954cf1532596719bde 100644 (file)
--- 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 aee68a7e928e1424a4833ad14521fa62b376f703..4fb5bf81e45dfa3261f75cc9debb4d8f7a5114aa 100644 (file)
--- 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 <<EOC
@@ -69,7 +72,7 @@ EOF
     chmod 755 guile-config
     PATH=$(pwd):$PATH
 
-    export CFLAGS="-fpermissive"
+
     if [ "$ABI" != "1.5" ];then
        export LDFLAGS="$cygwin_prefix/bin/cygkpathsea-3abi13.dll"
     fi

diff --git a/cygwin/post-lilypond.sh b/cygwin/post-lilypond.sh
deleted file mode 100644 (file)
index ba2cb80..0000000
--- a/cygwin/post-lilypond.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!@SHELL@
-# /etc/profile.d/post-lily.sh  -- Setup LilyPond
-
-touch /tmp/.lilypond-install
-rm $(find /var/lib/texmf /var/spool/texmf -name /var/cache/fonts 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm')
-rm -f /tmp/.lilypond-install
-
-
-

diff --git a/cygwin/postinstall-lilypond.sh b/cygwin/postinstall-lilypond.sh
new file mode 100644 (file)
index 0000000..16f30a2
--- /dev/null
+++ b/cygwin/postinstall-lilypond.sh
@@ -0,0 +1,59 @@
+#!@SHELL@
+# /etc/postinstall/lilypond.sh  -- Setup LilyPond
+
+# register .ly
+ROOT=$(cygpath -w /)
+[ -z "$ROOT" ] && ROOT=$(regtool get '/machine/Software/Cygnus Solutions/Cygwin/mounts v2/\\\//native')
+[ -z "$ROOT" ] && ROOT=$(cat '/proc/registry/HKEY_LOCAL_MACHINE/Software/Cygnus Solutions/Cygwin/mounts v2/\\\//native')
+[ -z "$ROOT" ] && ROOT='c:\cygwin'
+
+regtool add '/root/.ly'
+regtool set '/root/.ly/' 'LilyPond'
+regtool set '/root/.ly/Content Type' 'text/lilypond-source'
+regtool add '/root/LilyPond'
+regtool set '/root/LilyPond/' 'LilyPond source'
+regtool add '/root/LilyPond/shell'
+regtool add '/root/LilyPond/shell/open'
+regtool add '/root/LilyPond/shell/open/command'
+
+# old ideas - discarded for now
+# regtool set '/root/LilyPond/shell/open/command/' $ROOT'\bin\python /usr/bin/lily-wins %1'
+# invoking python directly does not work
+# regtool set '/root/LilyPond/shell/open/command/' $ROOT'\bin\run-lily-wins.bat %1'
+# we now use generated run-lily-wins.bat in /
+# regtool set '/root/LilyPond/shell/open/command/' $ROOT'\run-lily-wins.bat %1'
+# the direct bash route:
+
+# TODO: should 'open' run LilyPond?
+#       should 'open' also start PDF viewer?
+regtool set '/root/LilyPond/shell/open/command/' $ROOT'\bin\bash.exe --login -c '"'"'/usr/bin/lily-wins "%1"'"'"
+regtool add '/root/LilyPond/shell/edit'
+regtool set '/root/LilyPond/shell/edit/' '&Edit source in Notepad ...'
+regtool add '/root/LilyPond/shell/edit/command'
+regtool set '/root/LilyPond/shell/edit/command/' '%SystemRoot%\system32\notepad.exe %1'
+regtool add '/root/LilyPond/shell/generate'
+regtool set '/root/LilyPond/shell/generate/' '&Generate PDF ...'
+regtool add '/root/LilyPond/shell/generate/command'
+# regtool set '/root/LilyPond/shell/generate/command/' $ROOT'\bin\python /usr/bin/lily-wins %1'
+regtool set '/root/LilyPond/shell/generate/command/' $ROOT'\bin\bash.exe --login -c '"'"'/usr/bin/lily-wins "%1"'"'"
+
+# static run-lily-wins.bat, does not work.
+# @echo off
+# rem run-lily-wins.bat - Invoke /usr/bin/lily-wins from explorer
+# rem cd %~dp0%
+# rem bash.exe --login -c "/usr/bin/lily-wins '%1%'"
+# rem only works in Windows NT
+# rem %~dp0~bin\bash.exe --login -c "/usr/bin/lily-wins '%1%'"
+
+# generate run-lily-wins.bat - not necessary: direct bash route
+# how to handle \r\n endings? text/bin mode?
+#cat > /run-lily-wins.bat <<EOF
+#@echo off\r
+#rem run-lily-wins.bat - Invoke /usr/bin/lily-wins from explorer\r
+#$ROOT\\bin\\bash.exe --login -c "/usr/bin/lily-wins '%1%'"\r
+#EOF
+
+# cleanup old fonts
+touch /tmp/.lilypond-install
+rm $(find /var/lib/texmf /var/spool/texmf -name /var/cache/fonts 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm')
+rm -f /tmp/.lilypond-install

diff --git a/cygwin/postremove-lilypond.sh b/cygwin/postremove-lilypond.sh
new file mode 100644 (file)
index 0000000..c351f2e
--- /dev/null
+++ b/cygwin/postremove-lilypond.sh
@@ -0,0 +1,17 @@
+#!@SHELL@
+# /etc/postremove/lilypond.sh -- Remove all traces of LilyPond
+
+regtool remove '/root/.ly'
+regtool remove '/root/LilyPond/shell/open/command'
+regtool remove '/root/LilyPond/shell/open'
+regtool remove '/root/LilyPond/shell/edit/command'
+regtool remove '/root/LilyPond/shell/edit'
+regtool remove '/root/LilyPond/shell/generate/command'
+regtool remove '/root/LilyPond/shell/generate'
+regtool remove '/root/LilyPond/shell'
+regtool remove '/root/LilyPond'
+
+# cleanup old fonts
+touch /tmp/.lilypond-install
+rm $(find /var/lib/texmf /var/spool/texmf -name /var/cache/fonts 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm')
+rm -f /tmp/.lilypond-install