* cygwin/GNUmakefile: [CYGWIN] Install bug-lilypond-cygwin.

* cygwin/bug-lilypond-cygwin.sh: New file.

diff --git a/ChangeLog b/ChangeLog
index eec538e0f1e2c027687be3b2943ff4924ac4de82..b5db3df3267e1a615c915247a0d55c619b34bf59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-08-15  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * cygwin/GNUmakefile: [CYGWIN] Install bug-lilypond-cygwin.
+
+       * cygwin/bug-lilypond-cygwin.sh: New file.
+
        * stepmake/stepmake/help2man-rules.make: Better way of showing
        help2man command.
 

diff --git a/cygwin/GNUmakefile b/cygwin/GNUmakefile
index cd46ca533dc80e51f68810e68f5165b596c99fbf..5d9f1fc5676531b520f24acd9c2a52742ae73b05 100644 (file)
--- a/cygwin/GNUmakefile
+++ b/cygwin/GNUmakefile
@@ -4,12 +4,15 @@ NAME = cygwin
 
 EXTRA_DIST_FILES = changelog mknetrel $(wildcard *.sh *.hint)
 
+SEXECUTABLES=bug-lilypond-cygwin
+STEPMAKE_TEMPLATES = install install-out script
+
 include $(depth)/make/stepmake.make
 
-# For cygwin builds only
-ifneq ($(CYGWIN_BUILD),)
+# For Cygwin builds only
+infeq ($(CYGWIN_BUILD),)
 
-STEPMAKE_TEMPLATES = install install-out
+include $(stepdir)/executable-targets.make
 
 POST_INSTALLS=$(wildcard post-*.sh)
 OUT_POST_INSTALLS=$(POST_INSTALLS:%=$(outdir)/%)
@@ -27,17 +30,11 @@ $(outdir)/lilypond-profile.sh: $(outdir)/../$(depth)/buildscripts/$(outconfbase)
        cp $< $@
        chmod 755 $@
 
-default: $(OUT_POST_INSTALLS) $(OUT_PROFILES) $(OUTIN_FILES)
+default: $(OUT_POST_INSTALLS) $(OUT_PROFILES) $(OUTIN_FILES) 
 
 INSTALLATION_OUT_SUFFIXES=1 2
 
-# URG.
-# By popular demand,
-# LilyPond on windows is configured with --prefix=/usr/lilypond-x.y.x
-# The cygwin profile.d dir, however, is in /etc
-
-# avoid collapsed directory constructs '//'
-#etc=$(dir $(patsubst %/, %, $(dir $(prefix)/)))etc
+# Avoid collapsed directory constructs '//'
 etc=$(patsubst %/, %, $(dir $(prefix)))/etc
 INSTALLATION_DIR=$(etc)/postinstall
 INSTALLATION_FILES=$(OUT_POST_INSTALLS)

diff --git a/cygwin/bug-lilypond-cygwin.sh b/cygwin/bug-lilypond-cygwin.sh
new file mode 100644 (file)
index 0000000..9599f0a
--- /dev/null
+++ b/cygwin/bug-lilypond-cygwin.sh
@@ -0,0 +1,84 @@
+#!@SHELL@
+# /usr/bin/bug-lilypond-cygwin.sh -- harvest relevant info for bugreport
+#
+# Ideas
+#   * add some kpathsea tricks
+#   * distribute for other platforms too
+#   * failure/success tracking and indication (-> rewrite in python)
+
+set -x
+
+name="$(basename $0)"
+# Running this in new shell may yield deceptive results
+if [ "$name" = "bug-lilypond-cygwin" ]; then
+    # HMM
+    cat <<EOF
+Please source this script, ie do:
+
+    . /usr/bin/bug-lilypond-cygwin > bug.txt
+
+EOF
+fi
+
+docdir=@prefix@/share/doc/lilypond-@TOPLEVEL_VERSION@
+if [ ! -d $docdir ]; then
+    docdir=@prefix@/doc/lilypond-@TOPLEVEL_VERSION@
+fi
+
+echo
+echo Availability of executables
+echo ===========================
+type -p tex
+type -p latex
+type -p lilypond
+type -p python
+type -p ly2dvi
+
+type -p tex.exe
+type -p latex.exe
+type -p lilypond.exe
+type -p python.exe
+
+lilypond --version
+ly2dvi --version
+
+
+echo
+echo Test runs
+echo =========
+mkdir -p /tmp/lily
+cd /tmp/lily
+rm -f example-1.* sample2e.*
+ls -l
+latex \\nonstopmode \\input sample2e
+cp $docdir/input/example-1.ly .
+cp $docdir/input/example-2.ly .
+lilypond example-1.ly
+tex \\nonstopmode \\input example-1.tex
+dvips -o example-1.ps example-1.dvi
+ls -l
+ly2dvi --verbose example-2
+ls -l
+
+echo
+echo Environment settings
+echo ====================
+echo HOME="<$HOME>"
+echo SHELL="<$SHELL>"
+echo LILYPONDPREFIX="<$LILYPONDPREFIX>"
+echo TEXMF="<$TEXMF>"
+echo MFINPUTS="<$MFINPUTS>"
+echo TFMFONTS="<$TFMFONTS>"
+echo TEXINPUTS="<$TEXINPUTS>"
+
+
+echo
+echo System information
+echo ==================
+uname -a
+cygcheck -s
+
+if false; then
+    cat /var/log/setup.log
+    # cat /var/log/setup.log.full
+fi