From: Jan Nieuwenhuizen Date: Wed, 5 Dec 2001 13:31:02 +0000 (+0100) Subject: patch::: 1.5.24.jcn2 X-Git-Tag: release/1.5.25~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1eab738760a4d46664d5f16be32f459a558339bc;p=lilypond.git patch::: 1.5.24.jcn2 2001-12-05 Jan Nieuwenhuizen * 1.4.9.jcn3 forward ports. * Really included .cvsignore. * Included Han-Wen's uu1 windows fixes. * Bugfix: lilypond-profile.sh: append to GS_FONTPATH, GS_LIB. * 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 (+ fix). --- Generated by janneke@gnu.org, From = lilypond-1.5.24.jcn1, To = lilypond-1.5.24.jcn2 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.24.jcn2.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure --- diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000000..fd0c7ae134 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,22 @@ +GNUmakefile +TAGS +config.cache +config.h +config.log +config.make +config.status +configure +.dstreamrc +.gdbinit +*~ +#* +*.txt +*.html +*.png +out +out-www +afm +share +tfm +tfm.[0-9] +stepmake diff --git a/ChangeLog b/ChangeLog index efacdd12d7..b3ae394d3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,28 @@ -2001-12-03 Rune Zedeler +--- ../lilypond-1.5.24.jcn1/ChangeLog Sat Dec 1 15:35:46 2001 +++ b/ChangeLog Wed Dec 5 14:31:02 2001 +@@ -1,3 +1,22 @@ +2001-12-05 Jan Nieuwenhuizen + + * 1.4.9.jcn3 forward ports. + + * Really included .cvsignore. + + * Included Han-Wen's uu1 windows fixes. + + * Bugfix: lilypond-profile.sh: append to GS_FONTPATH, GS_LIB. + + * 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 (+ fix). + + 2001-12-01 Han-Wen + + * lily/note-head.cc (head_extent): added to compute width without2001-12-03 Rune Zedeler * lily/lily-guile.cc: Added ly_assoc_front_x() and ly_assoc_cdr() (FIXME: not accessible from guile) 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 0db6f124db..9cda4bb06d 100644 --- a/Documentation/windows/compiling.texi +++ b/Documentation/windows/compiling.texi @@ -1,7 +1,3 @@ -@html - -@end html - @section Obtaining LilyPond You can get the latest version of LilyPond at @@ -44,32 +40,39 @@ needs a number of extra tricks. All code for these tricks can be found in the source package directory @file{Documentation/windows}. @table @asis -@item @file{guile-1.4-gnu-windows.patch} +@item @var{guile-1.4-gnu-windows.patch} You may (Cygwin gets better every day) need this patch to compile GUILE. -@item @file{cygwin-installer.patch} +@item @var{cygwin-installer.patch} Apply this patch to the @file{cinstall} directory of @file{winsup-src/cinstall}, to get the LilyPond installer. Compiling @file{setup.exe} has been complicated a bit with the -introduction of the bzip2 feature: +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 @file{--prefix=/usr/lilypond-x.y.x} +@item @var{--prefix=/usr/lilypond-x.y.x} The standard binary installation installs LilyPond into its own prefix. We think it's silly, but do this is on special request of Windows users. @item @file{fix-suffixes.sh} diff --git a/Documentation/windows/cygwin-installer.patch b/Documentation/windows/cygwin-installer.patch index ffc7613c74..9edb6c6f53 100644 --- a/Documentation/windows/cygwin-installer.patch +++ b/Documentation/windows/cygwin-installer.patch @@ -1,23 +1,75 @@ -Binary files ../cinstall/LilyPond.ico and ./LilyPond.ico differ -diff -purN ../cinstall/Makefile.in ./Makefile.in ---- ../cinstall/Makefile.in Fri Jun 1 05:56:01 2001 -+++ ./Makefile.in Thu Sep 13 21:38:27 2001 -@@ -135,8 +135,9 @@ clean: +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 + + * 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 Makefile *.d version.c ++ rm -f config.cache config.log config.status ++ $(MAKE) -C zlib realclean + install: all $(SHELL) $(updir1)/mkinstalldirs $(bindir) $(etcdir) - for i in $(PROGS) ; do \ -diff -purN ../cinstall/desktop.cc ./desktop.cc ---- ../cinstall/desktop.cc Tue Aug 14 05:55:37 2001 -+++ ./desktop.cc Thu Sep 13 21:37:38 2001 -@@ -76,9 +76,7 @@ static char *etc_profile[] = { +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", @@ -28,7 +80,7 @@ diff -purN ../cinstall/desktop.cc ./desktop.cc "", "cd \"$HOME\"", "", -@@ -194,6 +192,30 @@ make_cygwin_bat () +@@ -204,6 +202,34 @@ make_cygwin_bat () } static void @@ -47,73 +99,100 @@ diff -purN ../cinstall/desktop.cc ./desktop.cc + fprintf (bat, "@echo off\n\n"); + + fprintf (bat, "%.2s\n", get_root_dir ()); -+ fprintf (bat, "chdir %s\n\n", backslash (concat (get_root_dir ()+2, "/bin", 0))); ++ 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 = cygpath ("/etc/profile", 0); -@@ -290,9 +312,9 @@ make_passwd_group () +@@ -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 (cygpath ("/cygwin.ico", 0)); +- +- HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE"); + iconname = backslash (concat (get_root_dir (), iconfile, 0)); - - HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE"); ++ ++ HRSRC rsrc = FindResource (NULL, iconres, "FILE"); if (rsrc == NULL) -@@ -314,7 +336,7 @@ save_icon () + { + fatal ("FindResource failed"); +@@ -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 (); -@@ -326,6 +348,17 @@ do_desktop_setup() + 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 -purN ../cinstall/ini.cc ./ini.cc ---- ../cinstall/ini.cc Thu Jun 14 05:55:26 2001 -+++ ./ini.cc Thu Sep 13 21:27:48 2001 -@@ -175,7 +175,7 @@ fprintf (FILE *f, const char *fmt, ...) +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 -purN ../cinstall/msg.cc ./msg.cc ---- ../cinstall/msg.cc Sat Aug 26 05:55:14 2000 -+++ ./msg.cc Thu Sep 13 21:27:48 2001 -@@ -44,7 +44,7 @@ mbox (char *name, int type, int id, va_l +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); @@ -122,9 +201,9 @@ diff -purN ../cinstall/msg.cc ./msg.cc } void -diff -purN ../cinstall/res.rc ./res.rc ---- ../cinstall/res.rc Thu Jul 5 05:55:22 2001 -+++ ./res.rc Thu Sep 13 21:36:25 2001 +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 @@ -255,7 +334,7 @@ diff -purN ../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,27 +212,25 @@ END +@@ -212,17 +212,14 @@ END IDD_SPLASH DIALOG DISCARDABLE 0, 0, 215, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -267,31 +346,32 @@ diff -purN ../cinstall/res.rc ./res.rc - LTEXT "Cygwin Net Release Setup Program",IDC_STATIC,55,10,114, - 8 - LTEXT "Version (unknown)",IDC_VERSION,55,25,120,10 -- LTEXT "Copyright 2000, 2001 Red Hat Inc.",IDC_STATIC,55,35, -- 120,8 +- 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 GNU LilyPond Setup Program",IDC_STATIC,55,10,114, - 8 -+ LTEXT "Version (1.5)",IDC_VERSION,55,25,120,10 ++ 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, 430, 207 - 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,21,20 -+ ICON IDI_LILYPOND,IDC_STATIC,5,5,21,20 - LTEXT "Select packages to install",IDC_CHOOSE_INST_TEXT,55,5, +- 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 -@@ -255,10 +253,10 @@ END +@@ -256,10 +253,10 @@ END IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 215, 95 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU @@ -304,8 +384,12 @@ diff -purN ../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", -@@ -273,7 +271,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POP - CAPTION "Cygwin Setup" +@@ -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 @@ -313,7 +397,7 @@ diff -purN ../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 -@@ -322,6 +320,7 @@ END +@@ -322,6 +319,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. @@ -321,7 +405,7 @@ diff -purN ../cinstall/res.rc ./res.rc IDI_CYGWIN ICON DISCARDABLE "cygwin.ico" ///////////////////////////////////////////////////////////////////////////// -@@ -329,6 +328,7 @@ IDI_CYGWIN ICON DISCARDA +@@ -329,6 +327,7 @@ IDI_CYGWIN ICON DISCARDA // FILE // @@ -329,7 +413,7 @@ diff -purN ../cinstall/res.rc ./res.rc CYGWIN.ICON FILE DISCARDABLE "cygwin.ico" ///////////////////////////////////////////////////////////////////////////// -@@ -383,7 +383,8 @@ STRINGTABLE DISCARDABLE +@@ -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?" @@ -339,9 +423,9 @@ diff -purN ../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 -purN ../cinstall/resource.h ./resource.h ---- ../cinstall/resource.h Mon Jul 2 05:55:40 2001 -+++ ./resource.h Thu Sep 13 21:29:51 2001 +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 @@ -357,9 +441,3 @@ diff -purN ../cinstall/resource.h ./resource.h #define IDC_SOURCE_DOWNLOAD 1000 #define IDC_SOURCE_NETINST 1001 #define IDC_SOURCE_CWD 1002 -diff -purN ../cinstall/version.c ./version.c ---- ../cinstall/version.c Thu Jan 1 01:00:00 1970 -+++ ./version.c Mon Sep 17 18:44:46 2001 -@@ -0,0 +1,2 @@ -+char *version = "2.96.jcn1"; -+static char *id = "\n%%% setup-version 2.96.jcn1\n"; 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..3e533b1f71 --- /dev/null +++ b/Documentation/windows/gs-profile.sh @@ -0,0 +1,22 @@ +#!@SHELL@ +# /etc/profile.d/gs-profile.sh -- Check for GhostScript + +gs550="/usr/windows/gstools/gs5.50" +gs650="/usr/windows/gs/gs6.50" + +# Maybe read registry, but that may be hairy? +# +# $ regtool get \\HKLM\\Software\\CLASSES\\psfile\\shell\\open\\command\\ +# "C:\GSTOOLS\GSVIEW\gsview32.exe" "%1" + +## we set GS_LIB although the registry keys have been set. + +if [ -e "$gs550/gswin32.exe" ]; then + PATH="$gs550:$PATH" + GS_LIB="$gs550/lib:"${GS_LIB:=""} +fi + +if [ -e "$gs650/bin/gswin32.exe" ]; then + PATH="$gs650/bin:$PATH" + GS_LIB="$gs650/lib:"${GS_LIB:=""} +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/installing.texi b/Documentation/windows/installing.texi index daa584aca5..085fb63e8d 100644 --- a/Documentation/windows/installing.texi +++ b/Documentation/windows/installing.texi @@ -2,10 +2,6 @@ @setfilename installing.info @settitle LilyPond on Windows -@html - -@end html - @node Top @top @@ -15,34 +11,45 @@ This document explains how to install the binary release for windows on a Microsoft Windows 95, 98, NT or 2000 machine. This release is a free extra service of the developers to assist windows -users. Please remember that we (the developers) rather dislike windows, -and none of us use it. Don't complain to us that installing LilyPond is -too difficult; rather, if you know something about your Windows, send us -code that works better (see @uref{compiling.html,compiling}). -Nevertheless, detailed bug reports are appreciated; before you send a -report, make sure to read the section on bugreports below. - +users. When reporting problems, please keep in mind that we (the developers) +do not use Windows. In fact, if you know something about Windows, and +are able to write code, please send us code that works better (see +@uref{compiling.html,compiling}). @section Windows binary setup +Apart from LilyPond itself, you need Cygwin, GUILE, Python and a TeX +installation, but all this software be installed by running setup.exe: + +@table @asis +@item LilyPond +Download and run +@c let's do http, so that people read the README +@uref{http://www.lilypond.org/gnu-windows/setup.exe, setup.exe} +to install LilyPond. + +This will install the minimal set of cygwin tools needed to run +LilyPond. Make sure to install in the default place, @file{c:/cygwin}, +and install everything. + +As of version 1.3.150, you also have the option to install MiKTeX and +GSView from this installer, which is recommended. If you choose to +install these by hand (see below), make sure to install them +@strong{before} you install LilyPond, otherwise your LilyPond setup will +be broken. -All the software you need is installed by downloading and running -@uref{http://www.lilypond.org/gnu-windows/setup.exe, setup.exe}. You -will be asked some questions. If you are unsure just click "Next". Do -not change the default install directory @file{c:/cygwin}. +If you already have cygwin installed, don't worry: nothing will be +installed twice. To expand on this minimal set, click +@uref{http://sources.redhat.com/cygwin/setup.exe,here}, or visit a +Cygwin @uref{http://sources.redhat.com/cygwin/mirrors.html,mirror site}. +@end table -This installs LilyPond, and Cygwin, GUILE, Python, MiKTeX and GSView If -you already have some of that software under @file{c:/cygwin}, then -don't worry: nothing will be installed twice. -If you want to install any of this software by hand, do this -@strong{before} you run @file{setup.exe}, otherwise your LilyPond setup -will not work. +@section Windows running setup -@section Testing LilyPond +If you're lucky, after running @file{setup.exe} you're all set up. -Open a LilyPond shell (To open a a lilypond shell, click the "GNU -LilyPond" icon), and type +Open a LilyPond shell (or any bash shell), and type @quotation @example @@ -50,7 +57,7 @@ lilypond --help @end example @end quotation -You should see something similar to +If you don't see something similar to @quotation @example @@ -68,71 +75,25 @@ Options: @end example @end quotation -Then, prepare a file called @file{foo.ly}, by issuing -@example -notepad foo.ly -@end example -Enter the following into the file -@example - -\score @{ \notes @{ c4 ( ) c4 @} @} - -@end example -Close the file and save it. Run the following command a few times until -it says @code{PS output to `foo.ps', DVI output to `foo.dvi'}. -@example - -ly2dvi -P foo - -@end example -You can now view the file using the following command -@example - -gsview32 foo.ps - -@end example - -If this works, then you can head to the -@uref{../../user/out-www/lilypond/Tutorial.html,Tutorial} to start using -LilyPond. +you should try adding @file{/usr/lilypond-x.y.z/bin} to your @var{PATH}, +do: - - -@section Removing LilyPond - -Start @file{setup.exe}, click Next, select "Install from Local -Directory". Then click next until you reach "Select packages to -install". Click "View". Now, for every package, click on the recycle -icon until it says "Uninstall". Then, click Next. - -(If you find this too tedious, you can also simply remove -@file{c:/cygwin}. This also removes the @file{/home/} directories under -cygwin (i.e. @file{C:\CYGWIN\HOME}, so make sure that you bring -important files in safety first.) - -@section Troubleshooting - - -@unnumberedsubsec invoking lilypond --help doesn't work - -Open the shell, and try adding @file{/usr/lilypond-x.y.z/bin} to your -@var{PATH}, do: @quotation @example PATH=/usr/lilypond-1.4.2/bin:$PATH @end example @end quotation -Now, invoke @file{lilypond --help} +and try again. + + +@subsection Trouble For problems and solutions see @uref{http://lilypond.org/wiki?TroubleshootingWindows,Troubleshooting Windows} - - -@ignore @subsection Additional software LilyPond needs a number of software packages to be really useful. These @@ -176,8 +137,11 @@ Click @uref{ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs650/gs650w32.exe @uref{ftp://ftp.cs.wisc.edu/ghost/ghostgum,ftp.cs.wisc.edu}. or visit the @uref{http://www.cs.wisc.edu/~ghost/,Ghostscript, Ghostview and GSview site}. + @end table + + [TODO: @@ -186,6 +150,9 @@ emacs-on-cygwin setup. ] + +@ignore + guile -v Guile 1.4.1 @@ -217,19 +184,4 @@ in each corner. @end ignore -@ignore -@c irrelevant. - -If you want to install more of cygwnTo expand on this minimal set, -@section If you already have MikTeX, GSView or -If you already have cygwin installed, don't worry: nothing will be -installed twice. To expand on this minimal set, click -@uref{http://sources.redhat.com/cygwin/setup.exe,here}, or visit a -Cygwin @uref{http://sources.redhat.com/cygwin/mirrors.html,mirror site}. - - -This will install the minimal set of cygwin tools needed to run -LilyPond. Make sure to install in the default place, @file{c:/cygwin}, -and install everything. -@end ignore diff --git a/Documentation/windows/lily-gs.sh b/Documentation/windows/lily-gs.sh deleted file mode 100644 index c8c9bd4ad6..0000000000 --- a/Documentation/windows/lily-gs.sh +++ /dev/null @@ -1,43 +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" - - - -## we set GS_LIB although the registry keys have been set. -## - -if [ -e "$gs550/gswin32.exe" ]; then - PATH="$gs550:$PATH" - GS_LIB='C:\cygwin\usr\windows\gs\gs5.50\lib' -fi - -if [ -e "$gs650/gswin32.exe" ]; then - PATH="$gs650:$PATH" - GS_LIB='C:\cygwin\usr\windows\gs\gs6.50\lib' -fi - -if [ -e "$gsview26/gsview32.exe" ]; then - PATH="$gsview26:$PATH" -fi - -if [ -e "$gsview36/gsview32.exe" ]; then - PATH="$gsview36:$PATH" -fi - - - - -export GS_LIB -export PATH diff --git a/Documentation/windows/lily-miktex.sh b/Documentation/windows/lily-miktex.sh deleted file mode 100644 index eb14f16791..0000000000 --- a/Documentation/windows/lily-miktex.sh +++ /dev/null @@ -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 deleted file mode 100644 index fdefba7d4b..0000000000 --- a/Documentation/windows/lily-python.sh +++ /dev/null @@ -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 deleted file mode 100644 index a460393794..0000000000 --- a/Documentation/windows/post-gs.sh +++ /dev/null @@ -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 deleted file mode 100644 index 8259c90f64..0000000000 --- a/Documentation/windows/post-lily.sh +++ /dev/null @@ -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 deleted file mode 100644 index 7f3f33879f..0000000000 --- a/Documentation/windows/post-miktex.sh +++ /dev/null @@ -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 deleted file mode 100644 index 89b2c6a4df..0000000000 --- a/Documentation/windows/post-python.sh +++ /dev/null @@ -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 deleted file mode 100644 index 2b49c87e84..0000000000 --- a/Documentation/windows/python-wrapper.sh +++ /dev/null @@ -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 +897,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)