From 663faa87b03cc9e7aeffbd95b7170a7498430f3d Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 3 Dec 2001 14:16:10 +0100 Subject: [PATCH] patch::: 1.4.9.jcn1 1.4.9.jcn1 ========== * Added Cygwin setup.hint * Removed tex, python wrappers and postinstalls to go with Cywgin's tetex/texmf, python installations. * Updated cygwin installer. * ly2dvi: Don't accept filenames with spaces. 1.4.9 ===== --- CHANGES | 15 + Documentation/windows/GNUmakefile | 72 +---- Documentation/windows/compiling.texi | 21 +- Documentation/windows/cygwin-installer.patch | 300 ++++++++++++------- Documentation/windows/fix-suffixes.sh | 2 +- Documentation/windows/gs-profile.sh | 18 ++ Documentation/windows/gsview-profile.sh | 19 ++ Documentation/windows/lily-gs.sh | 31 -- Documentation/windows/lily-miktex.sh | 22 -- Documentation/windows/lily-python.sh | 20 -- Documentation/windows/post-gs.sh | 54 ---- Documentation/windows/post-lily.sh | 8 - Documentation/windows/post-lilypond.sh | 8 + Documentation/windows/post-miktex.sh | 30 -- Documentation/windows/post-python.sh | 41 --- Documentation/windows/python-wrapper.sh | 13 - Documentation/windows/setup.hint | 4 + Documentation/windows/tex-wrapper.sh | 11 - Documentation/windows/zlily-profile.sh | 4 +- VERSION | 2 +- scripts/ly2dvi.py | 17 +- 21 files changed, 289 insertions(+), 423 deletions(-) create mode 100644 Documentation/windows/gs-profile.sh create mode 100644 Documentation/windows/gsview-profile.sh create mode 100644 Documentation/windows/post-lilypond.sh create mode 100644 Documentation/windows/setup.hint diff --git a/CHANGES b/CHANGES index e397b74e5a..5f97d638ef 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,18 @@ +1.4.9.jcn1 +========== + +* Added Cygwin setup.hint + +* Removed tex, python wrappers and postinstalls to go with Cywgin's + tetex/texmf, python installations. + +* Updated cygwin installer. + +* ly2dvi: Don't accept filenames with spaces. + +1.4.9 +===== + 1.4.8.moh2 ========== diff --git a/Documentation/windows/GNUmakefile b/Documentation/windows/GNUmakefile index 5806e4d922..965599a12c 100644 --- a/Documentation/windows/GNUmakefile +++ b/Documentation/windows/GNUmakefile @@ -1,7 +1,7 @@ depth=../.. -EXTRA_DIST_FILES = LilyPond.ico $(wildcard *.sh *.patch) +EXTRA_DIST_FILES = LilyPond.ico $(wildcard *.sh *.patch) setup.hint STEPMAKE_TEMPLATES=documentation texinfo install install-out @@ -18,28 +18,9 @@ ifeq ($(target),i686-pc-cygwin) POST_INSTALLS=$(wildcard post-*.sh) OUT_POST_INSTALLS=$(POST_INSTALLS:%=$(outdir)/%) -# lily-*: rename to '-profile' or so -PROFILES=$(wildcard *lily-*.sh) lilypond-profile.sh +PROFILES=$(wildcard *-profile.sh) lilypond-profile.sh OUT_PROFILES=$(PROFILES:%=$(outdir)/%) -##as2text.scm -PYTHON_WRAPPERS=\ - abc2ly\ - convert-ly\ - etf2ly\ - lilypond-book\ - ly2dvi\ - mup2ly\ - musedata2ly\ - pmx2ly\ - update-lily\ -# - -OUT_PYTHON_WRAPPERS=$(PYTHON_WRAPPERS:%=$(outdir)/%) - -TEX_WRAPPERS=dvips latex mktextfm tex yap -OUT_TEX_WRAPPERS=$(TEX_WRAPPERS:%=$(outdir)/%) - # profiles $(outdir)/%.sh: %.sh cat $< | sed $(sed-atvariables) > $@ @@ -50,44 +31,9 @@ $(outdir)/lilypond-profile.sh: $(outdir)/../$(depth)/buildscripts/out/lilypond-p cp $< $@ chmod 755 $@ -# python wrappers -$(outdir)/%: python-wrapper.sh - cat $< | sed $(sed-atvariables) -e "s!@name@!$(*F)!g" > $@ - chmod 755 $@ - -ATVARIABLES += OPTIONS - -# tex wrappers -#$(outdir)/%: %-wrapper.sh -# cat $< | sed $(sed-atvariables) -e "s!@name@!$(*F)!g" > $@ -# chmod 755 $@ - -$(outdir)/latex: tex-wrapper.sh - cat $< | sed $(sed-atvariables) -e "s!@name@!latex!g" > $@ - chmod 755 $@ - -$(outdir)/dvips: tex-wrapper.sh - cat $< | sed $(sed-atvariables) -e "s!@name@!dvips!g" > $@ - chmod 755 $@ - -MKTEXFTM_OPTIONS=--dest-dir \"$$(cygpath -w \"\"/usr/lilypond/share/lilypond/tfm\"\")\" -$(outdir)/mktextfm: tex-wrapper.sh - cat $< | sed -e 's!@OPTIONS@!$(MKTEXFTM_OPTIONS)!' $(sed-atvariables) -e "s!@name@!maketfm!g" > $@ - chmod 755 $@ - -$(outdir)/tex: tex-wrapper.sh - cat $< | sed $(sed-atvariables) -e "s!@name@!tex!g" > $@ - chmod 755 $@ - -$(outdir)/yap: tex-wrapper.sh - cat $< | sed $(sed-atvariables) -e "s!@name@!yap!g" > $@ - chmod 755 $@ - -default: $(OUT_PYTHON_WRAPPERS) $(OUT_TEX_WRAPPERS) $(OUT_POST_INSTALLS) $(OUT_PROFILES) - -# urg: change suffixes before overwriting python scripts +default: $(OUT_POST_INSTALLS) $(OUT_PROFILES) -INSTALLATION_OUT_SUFFIXES=1 2 3 4 +INSTALLATION_OUT_SUFFIXES=1 2 # URG. # By popular demand, @@ -100,14 +46,8 @@ INSTALLATION_FILES=$(OUT_POST_INSTALLS) INSTALLATION_OUT_DIR1=$(shell dirname $(shell dirname $(prefix)))/etc/profile.d INSTALLATION_OUT_FILES1=$(OUT_PROFILES) -INSTALLATION_OUT_DIR2=$(prefix)/wrappers -INSTALLATION_OUT_FILES2=$(OUT_PYTHON_WRAPPERS) $(OUT_TEX_WRAPPERS) - -INSTALLATION_OUT_DIR3=$(datadir)/tex -INSTALLATION_OUT_FILES3=$(shell kpsewhich geometry.sty) - -INSTALLATION_OUT_DIR4=$(datadir)/tfm -INSTALLATION_OUT_FILES4=$(shell kpsewhich cmr10.tfm) +INSTALLATION_OUT_DIR2=$(datadir)/tex +INSTALLATION_OUT_FILES2=$(shell kpsewhich geometry.sty) else diff --git a/Documentation/windows/compiling.texi b/Documentation/windows/compiling.texi index dac89d0f61..9cda4bb06d 100644 --- a/Documentation/windows/compiling.texi +++ b/Documentation/windows/compiling.texi @@ -50,19 +50,26 @@ Compiling @file{setup.exe} has been complicated a bit with the introduction of the non-feature bzip2. Here's how I did it: @quotation @example - mkdir cygwin-20010709 - cd cygwin-20010709 - tar xjf cygwin-src-20010709.tar.bz2 - cd winsup/cinstall + mkdir cygwin-20011202 && cd cygwin-20011202 + export CVSROOT=:pserver:anoncvs@@anoncvs.cygnus.com:/cvs/src + touch $HOME/.cvspass + cvs login + cvs -z3 co -D20011202 winsup + cd src/winsup/cinstall patch < $HOME/usr/src/lilypond/Documentation/windows/cygwin-installer.patch + autoconf cd ../bz2lib MINGW32=yes CFLAGS='-mno-cygwin' ./configure make cd - MINGW32=yes CFLAGS='-mno-cygwin' ./configure - cp $HOME/usr/src/cygwin/cygwin-1.3.2/usr/lib/mingw/crt2.o . - make w32api_lib=/home/cygwin/cygwin-1.3.2/usr/lib/w32api \ - CXX='g++ -L/home/cygwin/cygwin-1.3.2/usr/lib/mingw' + CYGWIN=$HOME/usr/src/cygwin/cygwin-1.3.5 + cp $CYGWIN/usr/lib/mingw/crt2.o . + cp $HOME/usr/src/lilypond/Documentation/windows/LilyPond.ico . + make w32api_lib=$CYGWIN/usr/lib/w32api \ + CXX="g++ -L$CYGWIN/usr/lib/mingw" + cp -pv setup.exe $CYGWIN/dist/cygwin-1.3.5/new-setup.exe + strip $CYGWIN/dist/cygwin-1.3.5/new-setup.exe @end example @end quotation @item @var{--prefix=/usr/lilypond-x.y.x} diff --git a/Documentation/windows/cygwin-installer.patch b/Documentation/windows/cygwin-installer.patch index 11bac9d269..9edb6c6f53 100644 --- a/Documentation/windows/cygwin-installer.patch +++ b/Documentation/windows/cygwin-installer.patch @@ -1,29 +1,75 @@ -diff -urN ../cinstall/Makefile.in ./Makefile.in ---- ../cinstall/Makefile.in Thu Feb 8 05:55:22 2001 -+++ ./Makefile.in Thu Apr 12 11:41:37 2001 -@@ -130,11 +130,15 @@ - @chmod a-x $@ +diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/ChangeLog ./ChangeLog +--- ../cinstall.orig/ChangeLog Sat Dec 1 00:36:20 2001 ++++ ./ChangeLog Sun Dec 2 17:21:40 2001 +@@ -1,3 +1,22 @@ ++2001-12-02 Jan Nieuwenhuizen ++ ++ * configure.in (CXXFLAGS): bugfix. ++ ++ * mklink2.c: Compile fix. ++ ++ * Forward ported patch to cvs -D20011202. ++ ++ * Makefile.in: Fixed realclean target. ++ ++ * desktop.cc: Removed spurious line breaks from etc_profile. ++ (make_lily_bat): New function. ++ (save_icon): Parametrized. ++ (do_desktop_setup): LilyPond support; disabled Cygwin support. ++ ++ * res.rc: Adapted for LilyPond. ++ ++ * ini.cc (fprintf): Cygwin -> GNU LilyPond ++ + 2001-12-01 Robert Collins - clean: -- rm -f *.o *.rc $(PROGS) -- $(MAKE) -C zlib clean -+ rm -f *.o $(PROGS) -+ $(MAKE) -C zlib $@ + * package_source.cc (packagesource::set_canonical): Filename was out by one. +@@ -2336,4 +2355,4 @@ Sat Apr 1 20:48:09 2000 Christopher Fa + * zlib/Makefile.in: Regenerate from Makefile.am + + %%% $Id: ChangeLog,v 2.155 2001/11/30 23:36:20 rbcollins Exp $ +-$Revision: 2.155 $ ++$Revision: 2.155.jcn1 $ +Binary files ../cinstall.orig/LilyPond.ico and ./LilyPond.ico differ +diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/Makefile.in ./Makefile.in +--- ../cinstall.orig/Makefile.in Fri Nov 30 13:25:00 2001 ++++ ./Makefile.in Sun Dec 2 17:38:37 2001 +@@ -35,7 +35,7 @@ CC := @CC@ + CC_FOR_TARGET := $(CC) + CXX := @CXX@ + +-CFLAGS := @CFLAGS@ -Werror -Winline -Wall -Wpointer-arith -Wcast-align\ ++CFLAGS := @CFLAGS@ -Winline -Wall -Wpointer-arith -Wcast-align\ + -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ + -Wmissing-declarations -Wcomments + CXXFLAGS := @CXXFLAGS@ $(CFLAGS) -fno-exceptions -fno-rtti +@@ -167,7 +167,9 @@ clean: + $(MAKE) -C zlib clean realclean: clean - rm -f Makefile config.cache -+ rm -f Makefile *.d -+ rm -f config.cache config.log config.status -+ rm -f inilex.c iniparse.c iniparse.h version.c -+ -+distclean: realclean ++ rm -f Makefile *.d version.c ++ rm -f config.cache config.log config.status ++ $(MAKE) -C zlib realclean install: all $(SHELL) $(updir1)/mkinstalldirs $(bindir) $(etcdir) -diff -urN ../cinstall/desktop.cc ./desktop.cc ---- ../cinstall/desktop.cc Sat Nov 11 05:55:16 2000 -+++ ./desktop.cc Thu Apr 12 11:39:52 2001 -@@ -79,9 +79,7 @@ +diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/configure.in ./configure.in +--- ../cinstall.orig/configure.in Mon Dec 11 01:07:56 2000 ++++ ./configure.in Sun Dec 2 17:23:33 2001 +@@ -64,7 +64,7 @@ if test -z "$CXX"; then + test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH]) + fi + +-CXXFLAGS='$(CFLAGS)' ++CXXFLAGS="$CFLAGS" + ]) + + AC_CANONICAL_SYSTEM +diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/desktop.cc ./desktop.cc +--- ../cinstall.orig/desktop.cc Thu Nov 29 10:52:32 2001 ++++ ./desktop.cc Sun Dec 2 17:00:31 2001 +@@ -81,9 +81,7 @@ static const char *etc_profile[] = { "done", "", "export MAKE_MODE=unix", @@ -34,13 +80,13 @@ diff -urN ../cinstall/desktop.cc ./desktop.cc "", "cd \"$HOME\"", "", -@@ -197,6 +195,30 @@ +@@ -204,6 +202,34 @@ make_cygwin_bat () } static void +make_lily_bat () +{ -+ batname = backslash (concat (root_dir, "/lilypond.bat", 0)); ++ batname = backslash (concat (get_root_dir (), "/lilypond.bat", 0)); + + /* if the batch file exists, don't overwrite it */ + if (_access (batname, 0) == 0) @@ -52,77 +98,101 @@ diff -urN ../cinstall/desktop.cc ./desktop.cc + + fprintf (bat, "@echo off\n\n"); + -+ fprintf (bat, "%.2s\n", root_dir); -+ fprintf (bat, "chdir %s\n\n", backslash (concat (root_dir+2, "/bin", 0))); ++ fprintf (bat, "%.2s\n", get_root_dir ()); ++ fprintf (bat, "chdir %s\n\n", ++ backslash (concat (get_root_dir () + 2, "/bin", 0))); + + /* fprintf (bat, "bash --rcfile /bin/lilypond-profile\n"); */ + fprintf (bat, "bash --login -i\n"); + + fclose (bat); ++ ++ if (_access ("/usr/bin/rxvt", 0) == 0) ++ batname = backslash (concat (get_root_dir (), "/usr/bin/rxvt", 0)); +} + +static void make_etc_profile () { - char *fname = concat (root_dir, "/etc/profile", 0); -@@ -299,11 +321,11 @@ + char *fname = cygpath ("/etc/profile", 0); +@@ -301,11 +327,11 @@ out: } static void -save_icon () -+save_icon (char* iconfile, char* iconres) ++save_icon (char const* iconfile, char const* iconres) { -- iconname = backslash (concat (root_dir, "/cygwin.ico", 0)); -+ iconname = backslash (concat (root_dir, iconfile, 0)); - +- iconname = backslash (cygpath ("/cygwin.ico", 0)); +- - HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE"); ++ iconname = backslash (concat (get_root_dir (), iconfile, 0)); ++ + HRSRC rsrc = FindResource (NULL, iconres, "FILE"); if (rsrc == NULL) { fatal ("FindResource failed"); -@@ -323,7 +345,7 @@ +@@ -325,12 +351,13 @@ save_icon () static void - do_desktop_setup() + do_desktop_setup () { - save_icon (); + save_icon ("/cygwin.ico", "CYGWIN.ICON"); make_cygwin_bat (); make_etc_profile (); -@@ -335,6 +357,17 @@ + make_passwd_group (); - if (root_desktop) { - desktop_icon ("Cygwin", batname); -+ } -+ ++#if 0 + if (root_menu) + { + start_menu ("Cygwin Bash Shell", batname); +@@ -339,6 +366,20 @@ do_desktop_setup () + if (root_desktop) + { + desktop_icon ("Cygwin", batname); ++ } ++#endif ++ + save_icon ("/LilyPond.ico", "LILYPOND.ICON"); + make_lily_bat (); -+ -+ if (root_menu) { -+ start_menu ("GNU LilyPond Shell", batname); -+ } -+ -+ if (root_desktop) { -+ desktop_icon ("GNU LilyPond", batname); - } ++ ++ if (root_menu) ++ { ++ start_menu ("GNU LilyPond Shell", batname); ++ } ++ ++ if (root_desktop) ++ { ++ desktop_icon ("GNU LilyPond", batname); + } } -diff -urN ../cinstall/ini.cc ./ini.cc ---- ../cinstall/ini.cc Thu Oct 5 05:55:27 2000 -+++ ./ini.cc Thu Apr 12 11:39:52 2001 -@@ -174,7 +174,7 @@ +diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/ini.cc ./ini.cc +--- ../cinstall.orig/ini.cc Thu Nov 29 10:52:32 2001 ++++ ./ini.cc Sun Dec 2 16:11:25 2001 +@@ -187,7 +187,7 @@ fprintf (FILE * f, const char *fmt, ...) { *nl = 0; - /*OutputDebugString (stderrbuf);*/ + /*OutputDebugString (stderrbuf); */ - MessageBox (0, buf, "Cygwin Setup", 0); -+ MessageBox (0, buf, "GNU LilyPond Cygwin Setup", 0); ++ MessageBox (0, buf, "GNU LilyPond Cygwin Setup", 0); stderrbuf[0] = 0; } - -diff -urN ../cinstall/msg.cc ./msg.cc ---- ../cinstall/msg.cc Sat Aug 26 05:55:14 2000 -+++ ./msg.cc Thu Apr 12 11:39:52 2001 -@@ -44,7 +44,7 @@ + +diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/mklink2.c ./mklink2.c +--- ../cinstall.orig/mklink2.c Tue Nov 13 02:49:32 2001 ++++ ./mklink2.c Sun Dec 2 17:09:31 2001 +@@ -1,5 +1,5 @@ +-#include + #include "win32.h" ++#include + #include "shlobj.h" + #include "mklink2.h" + +diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/msg.cc ./msg.cc +--- ../cinstall.orig/msg.cc Tue Nov 13 02:49:32 2001 ++++ ./msg.cc Sun Dec 2 15:42:13 2001 +@@ -47,7 +47,7 @@ mbox (const char *name, int type, int id vsprintf (buf, fmt, args); log (0, "mbox %s: %s", name, buf); @@ -131,10 +201,10 @@ diff -urN ../cinstall/msg.cc ./msg.cc } void -diff -urN ../cinstall/res.rc ./res.rc ---- ../cinstall/res.rc Wed Mar 7 18:13:31 2001 -+++ ./res.rc Fri Apr 13 16:06:40 2001 -@@ -30,10 +30,10 @@ +diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/res.rc ./res.rc +--- ../cinstall.orig/res.rc Wed Nov 14 01:11:35 2001 ++++ ./res.rc Sun Dec 2 15:50:36 2001 +@@ -30,10 +30,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U IDD_SOURCE DIALOG DISCARDABLE 0, 0, 215, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -144,11 +214,15 @@ diff -urN ../cinstall/res.rc ./res.rc BEGIN - ICON IDI_CYGWIN,-1,5,5,20,20 + ICON IDI_LILYPOND,-1,5,5,20,20 - CONTROL "&Download from Internet",IDC_SOURCE_DOWNLOAD,"Button", - BS_AUTORADIOBUTTON,55,15,152,10 CONTROL "&Install from Internet",IDC_SOURCE_NETINST,"Button", -@@ -49,7 +49,7 @@ - CAPTION "Local package directory" + BS_AUTORADIOBUTTON,55,15,75,10 + CONTROL "&Download from Internet",IDC_SOURCE_DOWNLOAD,"Button", +@@ -46,10 +46,10 @@ END + + IDD_LOCAL_DIR DIALOG DISCARDABLE 0, 0, 215, 95 + STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +-CAPTION "Cygwin Setup" ++CAPTION "GNU LilyPond Setup" FONT 8, "MS Sans Serif" BEGIN - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20 @@ -156,7 +230,7 @@ diff -urN ../cinstall/res.rc ./res.rc PUSHBUTTON "B&rowse...",IDC_LOCAL_DIR_BROWSE,150,10,34,14 LTEXT "Local Package &Directory",IDC_STATIC,55,15,85,11 EDITTEXT IDC_LOCAL_DIR,55,25,127,12,ES_AUTOHSCROLL -@@ -60,10 +60,10 @@ +@@ -60,10 +60,10 @@ END IDD_ROOT DIALOG DISCARDABLE 0, 0, 215, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -169,7 +243,7 @@ diff -urN ../cinstall/res.rc ./res.rc PUSHBUTTON "B&rowse...",IDC_ROOT_BROWSE,150,10,34,14 LTEXT "Select install root &directory",IDC_STATIC,55,15,85,11 EDITTEXT IDC_ROOT_DIR,55,25,127,12,ES_AUTOHSCROLL -@@ -84,10 +84,10 @@ +@@ -84,10 +84,10 @@ END IDD_SITE DIALOG DISCARDABLE 0, 0, 222, 206 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -182,7 +256,7 @@ diff -urN ../cinstall/res.rc ./res.rc LTEXT "Select Download &Site",IDC_STATIC,55,5,135,11 LISTBOX IDC_URL_LIST,55,20,160,155,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP -@@ -98,10 +98,10 @@ +@@ -98,10 +98,10 @@ END IDD_OTHER_URL DIALOG DISCARDABLE 0, 0, 215, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -195,9 +269,9 @@ diff -urN ../cinstall/res.rc ./res.rc LTEXT "Select &URL to download from",IDC_STATIC,55,15,135,11 EDITTEXT IDC_OTHER_URL,55,25,127,12,ES_AUTOHSCROLL DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15 -@@ -111,10 +111,10 @@ +@@ -111,10 +111,10 @@ END - IDD_NET DIALOG DISCARDABLE 0, 0, 215, 95 + IDD_NET DIALOGEX 0, 0, 215, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Cygwin Setup" +CAPTION "GNU LilyPond Setup" @@ -205,10 +279,10 @@ diff -urN ../cinstall/res.rc ./res.rc BEGIN - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 - CONTROL "Use &IE5 Settings",IDC_NET_IE5,"Button", - BS_AUTORADIOBUTTON,55,10,69,10 CONTROL "&Direct Connection",IDC_NET_DIRECT,"Button", -@@ -135,10 +135,10 @@ + BS_AUTORADIOBUTTON,55,10,73,10 + CONTROL "Use &IE5 Settings",IDC_NET_IE5,"Button", +@@ -135,10 +135,10 @@ END IDD_DLSTATUS DIALOG DISCARDABLE 0, 0, 215, 95 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU @@ -221,7 +295,7 @@ diff -urN ../cinstall/res.rc ./res.rc PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15 LTEXT "Downloading...",IDC_STATIC,55,5,135,8 LTEXT "(URL)",IDC_DLS_URL,55,15,150,8 -@@ -157,10 +157,10 @@ +@@ -157,10 +157,10 @@ END IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 215, 95 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU @@ -234,7 +308,7 @@ diff -urN ../cinstall/res.rc ./res.rc PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15 LTEXT "Installing...",IDC_INS_ACTION,55,5,135,8 LTEXT "(PKG)",IDC_INS_PKG,55,15,150,8 -@@ -178,10 +178,10 @@ +@@ -178,10 +178,10 @@ END IDD_PROXY_AUTH DIALOG DISCARDABLE 0, 0, 215, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -247,7 +321,7 @@ diff -urN ../cinstall/res.rc ./res.rc LTEXT "Proxy &User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE, WS_EX_RIGHT EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL -@@ -195,10 +195,10 @@ +@@ -195,10 +195,10 @@ END IDD_NET_AUTH DIALOG DISCARDABLE 0, 0, 215, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -260,7 +334,7 @@ diff -urN ../cinstall/res.rc ./res.rc LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE, WS_EX_RIGHT EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL -@@ -212,26 +212,25 @@ +@@ -212,17 +212,14 @@ END IDD_SPLASH DIALOG DISCARDABLE 0, 0, 215, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -270,32 +344,34 @@ diff -urN ../cinstall/res.rc ./res.rc BEGIN - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20 - LTEXT "Cygwin Net Release Setup Program",IDC_STATIC,55,10,114, -+ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 -+ LTEXT "GNU LilyPond GNU LilyPond Setup Program",IDC_STATIC,55,10,114, - 8 +- 8 - LTEXT "Version (unknown)",IDC_VERSION,55,25,120,10 -- LTEXT "Copyright (C) 2000 Red Hat Inc",IDC_STATIC,55,35,135,8 -- LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,55,50,150, -- 10 -+ LTEXT "Version (1.4pre)",IDC_VERSION,55,25,120,10 +- LTEXT "Copyright 2000, 2001 Red Hat Inc.",IDC_STATIC,55,35,120, +- 8 +- LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,55,50,112, +- 8 ++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 ++ LTEXT "GNU LilyPond Setup Program",IDC_STATIC,55,10,114,8 ++ LTEXT "Version 1.4.9",IDC_VERSION,55,25,120,10 + LTEXT "Copyright (C) 2000-2001 Red Hat Inc",IDC_STATIC,55,35,135,8 + LTEXT " (C) 2001 Jan Nieuwenhuizen ",IDC_STATIC,55,45,135,8 DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15 PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15 END - - IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 292, 206 - STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +@@ -230,10 +227,10 @@ END + IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 429, 266 + STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION | + WS_SYSMENU -CAPTION "Cygwin Setup" +CAPTION "GNU LilyPond Setup" FONT 8, "MS Sans Serif" BEGIN -- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20 -+ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 - LTEXT "Select packages to install",IDC_STATIC,55,5,85,8 +- ICON IDI_CYGWIN,IDC_STATIC,0,2,21,20 ++ ICON IDI_LILYPOND,IDC_STATIC,0,2,21,20 + LTEXT "Select packages to install",IDC_CHOOSE_INST_TEXT,125,5, + 99,8 CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT - WS_VISIBLE,55,15,230,155 -@@ -249,10 +248,10 @@ +@@ -256,10 +253,10 @@ END IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 215, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -308,7 +384,20 @@ diff -urN ../cinstall/res.rc ./res.rc CONTROL "Create Desktop &Icon",IDC_ROOT_DESKTOP,"Button", BS_AUTOCHECKBOX,55,25,100,8 CONTROL "Add to &Start Menu",IDC_ROOT_MENU,"Button", -@@ -298,6 +297,7 @@ +@@ -271,10 +268,10 @@ END + + IDD_FTP_AUTH DIALOGEX 0, 0, 215, 95 + STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +-CAPTION "Cygwin Setup" ++CAPTION "GNU LilyPond Setup" + FONT 8, "MS Sans Serif" + BEGIN +- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20 ++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 + LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE, + WS_EX_RIGHT + EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL +@@ -322,6 +319,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. @@ -316,7 +405,7 @@ diff -urN ../cinstall/res.rc ./res.rc IDI_CYGWIN ICON DISCARDABLE "cygwin.ico" ///////////////////////////////////////////////////////////////////////////// -@@ -305,6 +305,7 @@ +@@ -329,6 +327,7 @@ IDI_CYGWIN ICON DISCARDA // FILE // @@ -324,7 +413,7 @@ diff -urN ../cinstall/res.rc ./res.rc CYGWIN.ICON FILE DISCARDABLE "cygwin.ico" ///////////////////////////////////////////////////////////////////////////// -@@ -354,7 +355,8 @@ +@@ -383,7 +382,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_ROOT_SLASH "Warning: we recommend you do NOT use the root of your hard drive as the cygwin root. Proceed anyway?" IDS_ROOT_SPACE "You should not choose a root path that include spaces in directory names. Proceed anyway?" @@ -334,10 +423,10 @@ diff -urN ../cinstall/res.rc ./res.rc IDS_DIALOG_FAILED "Unable to create Dialog Box" IDS_CYGWIN_FUNC_MISSING "Error: unable to find function `%s' in %s" IDS_DOWNLOAD_SHORT "Download error: %s too short (%d, wanted %d)" -diff -urN ../cinstall/resource.h ./resource.h ---- ../cinstall/resource.h Thu Mar 1 05:55:20 2001 -+++ ./resource.h Thu Apr 12 11:39:52 2001 -@@ -47,11 +47,12 @@ +diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/resource.h ./resource.h +--- ../cinstall.orig/resource.h Sat Jun 30 03:37:55 2001 ++++ ./resource.h Sun Dec 2 15:45:18 2001 +@@ -47,12 +47,13 @@ #define IDB_SPIN 118 #define IDB_RTARROW 119 #define IDI_SPIN 120 @@ -347,21 +436,8 @@ diff -urN ../cinstall/resource.h ./resource.h #define IDB_CHECK_YES 123 #define IDB_CHECK_NO 124 #define IDB_CHECK_NA 125 -+#define IDI_CYGWIN 126 + #define IDD_FTP_AUTH 126 ++#define IDI_CYGWIN 127 #define IDC_SOURCE_DOWNLOAD 1000 #define IDC_SOURCE_NETINST 1001 #define IDC_SOURCE_CWD 1002 -diff -urN ../cinstall/zlib/Makefile.in ./zlib/Makefile.in ---- ../cinstall/zlib/Makefile.in Tue Aug 8 05:55:18 2000 -+++ ./zlib/Makefile.in Thu Apr 12 11:42:10 2001 -@@ -299,6 +299,10 @@ - - clean: clean-am - -+realclean: clean -+ rm -f Makefile *.d -+ rm -f config.cache config.log config.status -+ - distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-tags distclean-generic clean-am - diff --git a/Documentation/windows/fix-suffixes.sh b/Documentation/windows/fix-suffixes.sh index 0f8792a552..b48a81e70f 100644 --- a/Documentation/windows/fix-suffixes.sh +++ b/Documentation/windows/fix-suffixes.sh @@ -27,6 +27,6 @@ function fix_extension () for i in `/bin/ls -d1 $*`; do fix_extension $i .exe '.*Windows.*\(executable\).*' - fix_extension $i .py '.*\(python\).*' +# fix_extension $i .py '.*\(python\).*' done diff --git a/Documentation/windows/gs-profile.sh b/Documentation/windows/gs-profile.sh new file mode 100644 index 0000000000..b3342f8baa --- /dev/null +++ b/Documentation/windows/gs-profile.sh @@ -0,0 +1,18 @@ +#!@SHELL@ +# /etc/profile.d/gs-profile.sh -- Check for GhostScript + +gs550="/usr/windows/gstools/gs5.50" +gs650="/usr/windows/gs/gs6.50/bin" + +# Maybe read registry, but that may be hairy? +# +# $ regtool get \\HKLM\\Software\\CLASSES\\psfile\\shell\\open\\command\\ +# "C:\GSTOOLS\GSVIEW\gsview32.exe" "%1" + +if [ -e "$gs550/gswin32.exe" ]; then + PATH="$gs550:$PATH" +fi + +if [ -e "$gs650/gswin32.exe" ]; then + PATH="$gs650:$PATH" +fi diff --git a/Documentation/windows/gsview-profile.sh b/Documentation/windows/gsview-profile.sh new file mode 100644 index 0000000000..eb5aeaf8a6 --- /dev/null +++ b/Documentation/windows/gsview-profile.sh @@ -0,0 +1,19 @@ +#!@SHELL@ +# /etc/profile.d/gsview-profile.sh Check for GhostView + +gsview26="/usr/windows/gstools/gsview" +gsview36="/usr/windows/Ghostgum/GSview" + +# Maybe read registry, but that may be hairy? +# +# $ regtool get \\HKLM\\Software\\CLASSES\\psfile\\shell\\open\\command\\ +# "C:\GSTOOLS\GSVIEW\gsview32.exe" "%1" + +if [ -e "$gsview26/gsview32.exe" ]; then + PATH="$gsview26:$PATH" +fi + +if [ -e "$gsview36/gsview32.exe" ]; then + PATH="$gsview36:$PATH" +fi + diff --git a/Documentation/windows/lily-gs.sh b/Documentation/windows/lily-gs.sh index 5ae3acbad1..e69de29bb2 100644 --- a/Documentation/windows/lily-gs.sh +++ b/Documentation/windows/lily-gs.sh @@ -1,31 +0,0 @@ -#!@SHELL@ -# /etc/profile.d/lily-gs.sh -- Check for GhostScript and GSView - - -gs550="/usr/windows/gstools/gs5.50" -gs650="/usr/windows/gs/gs6.50/bin" - -gsview26="/usr/windows/gstools/gsview" -gsview36="/usr/windows/Ghostgum/GSview" - -# Maybe read registry, but that may be hairy? -# -# $ regtool get \\HKLM\\Software\\CLASSES\\psfile\\shell\\open\\command\\ -# "C:\GSTOOLS\GSVIEW\gsview32.exe" "%1" - - -if [ -e "$gs550/gswin32.exe" ]; then - PATH="$gs550:$PATH" -fi - -if [ -e "$gs650/gswin32.exe" ]; then - PATH="$gs650:$PATH" -fi - -if [ -e "$gsview26/gsview32.exe" ]; then - PATH="$gsview26:$PATH" -fi - -if [ -e "$gsview36/gsview32.exe" ]; then - PATH="$gsview36:$PATH" -fi diff --git a/Documentation/windows/lily-miktex.sh b/Documentation/windows/lily-miktex.sh index eb14f16791..e69de29bb2 100644 --- a/Documentation/windows/lily-miktex.sh +++ b/Documentation/windows/lily-miktex.sh @@ -1,22 +0,0 @@ -#!@SHELL@ -# /etc/profile.d/lily-miktex.sh -- Check for MiKTeX - - -# Educated guess in case we have no regtool -a="//c/Program Files/MiKTeX" - -# Registry entry -reg="$(regtool -q get 'HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX\Install Root\')" -b="$(cygpath -u ""$reg"")" - -# Where we installed it -c="/usr/windows/MiKTeX" - -for i in "$a" "$b" "$c"; do - if [ -d "$i" ]; then - texmf="$i" - fi -done - -PATH="$texmf/miktex/bin:$PATH" - diff --git a/Documentation/windows/lily-python.sh b/Documentation/windows/lily-python.sh index fdefba7d4b..e69de29bb2 100644 --- a/Documentation/windows/lily-python.sh +++ b/Documentation/windows/lily-python.sh @@ -1,20 +0,0 @@ -#!@SHELL@ -# /etc/profile.d/post-python.sh -- Check for Python - -# Educated guess in case we have no regtool -a="//c/Program Files/Python" - -# Registry entry -reg="$(regtool -q get 'HKLM\Software\Python\PythonCore\1.5\InstallPath\')" -b="$(cygpath -u ""$reg"")" - -# Where we installed it -c="/usr/windows/Python" - -for i in "$a" "$b" "$c"; do - if [ -d "$i" ]; then - python="$i" - fi -done - -PATH="$python:$PATH" diff --git a/Documentation/windows/post-gs.sh b/Documentation/windows/post-gs.sh index a460393794..e69de29bb2 100644 --- a/Documentation/windows/post-gs.sh +++ b/Documentation/windows/post-gs.sh @@ -1,54 +0,0 @@ -#!@SHELL@ -# /etc/postinstall/post-gs.sh -- Install GS and GSView - - -gs550="/usr/windows/gstools/gs5.50" -gs650="/usr/windows/gs/gs6.50" - -gsview26="/usr/windows/gstools/gsview" -gsview36="/usr/windows/Ghostgum/GSview" - -# maybe set this too, but how (what type is value, a list?) -# $ regtool get \\HKLM\\Software\\CLASSES\\psfile\\shell\\open\\command\\ -# "C:\GSTOOLS\GSVIEW\gsview32.exe" "%1" - -# gsview needs gs register entries, so it seems - -if [ -e "$gs550/gswin32.exe" ]; then - regtool -s set 'HKLM\Software\Aladdin Ghostscript\5.50\GS_LIB' \ - "c:\cygwin\windows\gstools\gs5.50;c:\cygwin\windows\gstools\gs5.50\fonts" - regtool -s set 'HKLM\Software\Aladdin Ghostscript\5.50\GS_DLL' \ - "c:\cygwin\windows\gstools\gs5.50\\gsdll32.dll" -fi - -if [ -e "$gs650/gswin32.exe" ]; then - regtool -s set 'HKLM\Software\AFPL Ghostscript\6.50\GS_DLL' \ - "C:\cygwin\windows\gs\gs6.50\bin\gsdll32.dll" - regtool -s set 'HKLM\Software\AFPL Ghostscript\6.50\GS_LIB' \ - "C:\cygwin\windows\gs\gs6.50\lib;C:\cygwin\windows\gs\fonts" -fi - -# nothing to be done -if [ -e "$gsview26/gsview32.exe" ]; then - true -fi - -if [ -e "$gsview36/gsview32.exe" ]; then - regtool -s set 'HKLM\Software\Ghostgum\GSview\3.6' \ - "C:\cygwin\windows\Ghostgum" -fi - -# What's in the registry - -# regtool -v list HKLM\Software\Aladdin Ghostscript\5.50 -# GS_LIB = "c:\cygwin\windows\gstools\gs5.50;c:\cygwin\windows\gstools\gs5.50\fonts" -# GS_DLL = "c:\cygwin\windows\gstools\gs5.50\\gsdll32.dll" - -# regtool -v list HKLM\Software\Ghostgum\GSview -# 3.6 = "C:\cygwin\windows\Ghostgum" - -# regtool -v list HKLM\Software\AFPL Ghostscript\6.50 -# GS_DLL = "C:\cygwin\windows\gs\gs6.50\bin\gsdll32.dll" -# GS_LIB = "C:\cygwin\windows\gs\gs6.50\lib;C:\cygwin\windows\gs\fonts" - - diff --git a/Documentation/windows/post-lily.sh b/Documentation/windows/post-lily.sh index 8259c90f64..e69de29bb2 100644 --- a/Documentation/windows/post-lily.sh +++ b/Documentation/windows/post-lily.sh @@ -1,8 +0,0 @@ -#!@SHELL@ -# /etc/profile.d/post-lily.sh -- Setup LilyPond - -rm -f /usr/lilypond -lily=@prefix@ -ln -s $lily /usr/lilypond - - diff --git a/Documentation/windows/post-lilypond.sh b/Documentation/windows/post-lilypond.sh new file mode 100644 index 0000000000..8259c90f64 --- /dev/null +++ b/Documentation/windows/post-lilypond.sh @@ -0,0 +1,8 @@ +#!@SHELL@ +# /etc/profile.d/post-lily.sh -- Setup LilyPond + +rm -f /usr/lilypond +lily=@prefix@ +ln -s $lily /usr/lilypond + + diff --git a/Documentation/windows/post-miktex.sh b/Documentation/windows/post-miktex.sh index 7f3f33879f..e69de29bb2 100644 --- a/Documentation/windows/post-miktex.sh +++ b/Documentation/windows/post-miktex.sh @@ -1,30 +0,0 @@ -#!@SHELL@ -# /etc/profile.d/post-miktex.sh -- Setup MiKTeX - - -# Educated guess in case we have no regtool -a="//c/Program Files/MiKTeX" - -# Registry entry -reg="$(regtool -q get 'HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX\Install Root\')" -b="$(cygpath -u ""$reg"")" - -# Where we installed it -c="/usr/windows/MiKTeX" - -for i in "$a" "$b" "$c"; do - if [ -d "$i" ]; then - texmf="$i" - fi -done - -rm -f /usr/share/texmf -ln -s "$texmf" /usr/share/texmf - -# What's in the registry -# $ regtool -s set 'HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX\Install Root\' "C:\cygwin\usr\windows\MiKTeX" - -# regtool -v list HKLM\Software\MiK\MiKTeX\CurrentVersion\MiKTeX -# TEXMF Root Directories = "C:\cygwin\usr\windows\miktex\spool\texmf;C:\cygwin\windows\MiKTeX" -# Install Root = "C:\cygwin\usr\windows\MiKTeX" - diff --git a/Documentation/windows/post-python.sh b/Documentation/windows/post-python.sh index 89b2c6a4df..e69de29bb2 100644 --- a/Documentation/windows/post-python.sh +++ b/Documentation/windows/post-python.sh @@ -1,41 +0,0 @@ -#!@SHELL@ -# /etc/profile.d/post-python.sh -- Setup Python - -# Educated guess in case we have no regtool -a="//c/Program Files/Python" - -# Registry entry -reg="$(regtool -q get 'HKLM\Software\Python\PythonCore\1.5\InstallPath\')" -b="$(cygpath -u ""$reg"")" - -# Where we installed it -c="/usr/windows/Python" - -for i in "$a" "$b" "$c"; do - if [ -d "$i" ]; then - python="$i" - fi -done - -# What's in the registry - -# regtool -v list HKLM\Software\Python\PythonCore\1.5 -# InstallPath\ () -# PythonPath\ () -# Dll\ () -# Modules\ () - -# regtool -v list HKLM\Software\Python\PythonCore\1.5\InstallPath -# InstallGroup\ () -# = "C:\cygwin\usr\windows\Python" - -# regtool -v list HKLM\Software\Python\PythonCore\1.5\PythonPath -# = "C:\cygwin\usr\windows\Python\Lib\plat-win;C:\cygwin\usr\windows\Python\Lib;C:\cygwin\usr\windows\Python\DLLs;C:\cygwin\usr\windows\Python\Lib\lib-tk" - -# regtool -v list HKLM\Software\Python\PythonCore\1.5\Dll -# = "C:\WINDOWS\SYSTEM\Python15.dll" - -# regtool -v list HKLM\Software\Python\PythonCore\1.5\Modules\ -# = "" - - diff --git a/Documentation/windows/python-wrapper.sh b/Documentation/windows/python-wrapper.sh index 2b49c87e84..e69de29bb2 100644 --- a/Documentation/windows/python-wrapper.sh +++ b/Documentation/windows/python-wrapper.sh @@ -1,13 +0,0 @@ -#!@SHELL@ -# @name@.sh -- @name@ wrapper for Windows - -if echo | python - >/dev/null 2>&1; then - echo -else - cat <= 0: + user_error (_ ("filename should not contain spaces: `%s'") % i) + if os.path.dirname (output_name) != '.': dep_prefix = os.path.dirname (output_name) else: @@ -889,8 +899,7 @@ if files and files[0] != '-': else: # FIXME: read from stdin when files[0] = '-' help () - errorport.write (program_name + ":" + _ ("error: ") + _ ("no files specified on command line.") + '\n') - sys.exit (2) + user_error (_ ("no files specified on command line."), 2) -- 2.39.5