From 617dc96b2c2ec073f8638fa3d74b4526447587cd Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 18 Feb 2002 15:57:38 +0100 Subject: [PATCH] patch::: 1.5.31.jcn1 2002-02-18 Jan Nieuwenhuizen * Documentation/windows/compiling.texi: Update. * Documentation/index.texi: Add link to orphaned compiling for windows page. * Documentation/footer.html.in: Comment fix. * stepmake/bin/add-html-footer.py: Python2.[12] re workarounds. --- ChangeLog | 10 ++ Documentation/footer.html.in | 2 +- Documentation/index.texi | 1 + Documentation/topdocs/INSTALL.texi | 5 +- Documentation/windows/compiling.texi | 4 +- Documentation/windows/cygwin-installer.patch | 122 +++++++++---------- VERSION | 2 +- stepmake/bin/add-html-footer.py | 25 ++-- 8 files changed, 95 insertions(+), 76 deletions(-) diff --git a/ChangeLog b/ChangeLog index 611b422778..f1c676e0ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2002-02-18 Jan Nieuwenhuizen + + * Documentation/windows/compiling.texi: Update. + + * Documentation/index.texi: Add link to orphaned compiling for + windows page. + + * Documentation/footer.html.in: Comment fix. + + * stepmake/bin/add-html-footer.py: Python2.[12] re workarounds. 2002-02-18 Han-Wen diff --git a/Documentation/footer.html.in b/Documentation/footer.html.in index cfb235d277..fdb96eb797 100644 --- a/Documentation/footer.html.in +++ b/Documentation/footer.html.in @@ -4,7 +4,7 @@ If this file ./Documentation/footer.html.in is present, it is included automatically by add-html-footer.py, which substitutes some @AT_VARIABLES@ as well. -!--> +--> diff --git a/Documentation/index.texi b/Documentation/index.texi index 4b3fa34a8e..f6fc22e683 100644 --- a/Documentation/index.texi +++ b/Documentation/index.texi @@ -130,6 +130,7 @@ A document that shows bugs (also as @uref{http://www2.iro.umontreal.ca/~pinard/po/registry.cgi?domain=lilypond">Translations,lilypond textual domain } in the Translation Project. +@item Compiling for @uref{../windows/out-www/compiling.html,Windows/Cygwin}. @end itemize diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index ac353fb528..bb1c0ac2e0 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -119,10 +119,11 @@ You need the following packages to compile Lilypond. @item A reasonably new version of the GNU C++ compiler: EGCS 1.1, GCC 2.95.2 or newer. Check out @uref{ftp://ftp.gnu.org/gnu/gcc/, the gcc site}. -@item Python (version 1.5 or newer; not 2.1.x) +@item Python (version 1.5 or newer). Check out @uref{http://www.python.org, the python website}. -@item GUILE 1.4 or newer, check out +@item GUILE (version 1.4 or newer). +Check out @uref{http://www.gnu.org/software/guile/guile.html,the GUILE webpage}. Version 1.4 is recommended for better performance. diff --git a/Documentation/windows/compiling.texi b/Documentation/windows/compiling.texi index 025895c78d..39db06541c 100644 --- a/Documentation/windows/compiling.texi +++ b/Documentation/windows/compiling.texi @@ -58,11 +58,11 @@ Compiling @file{setup.exe} has been complicated a bit with the introduction of the bzip2 feature. Here's how I did it: @quotation @example - mkdir cygwin-20020129 && cd cygwin-20020129 + mkdir cygwin-20020218 && cd cygwin-20020218 export CVSROOT=:pserver:anoncvs@@anoncvs.cygnus.com:/cvs/src touch $HOME/.cvspass cvs login - cvs -z3 co -D20020129 winsup + cvs -z3 co -D20020218 winsup cd src/winsup/cinstall patch < $HOME/usr/src/lilypond/Documentation/windows/cygwin-installer.patch (cd ../bz2lib; ./configure; make) diff --git a/Documentation/windows/cygwin-installer.patch b/Documentation/windows/cygwin-installer.patch index 9a17b9c069..e7c7be0b07 100644 --- a/Documentation/windows/cygwin-installer.patch +++ b/Documentation/windows/cygwin-installer.patch @@ -1,12 +1,10 @@ -diff -purN --exclude=*~ ../cinstall.orig/ChangeLog ./ChangeLog ---- ../cinstall.orig/ChangeLog Tue Jan 29 21:50:51 2002 -+++ ./ChangeLog Tue Jan 29 22:29:56 2002 -@@ -1,3 +1,20 @@ +diff -purN --exclude=*~ --exclude=zlib ../cinstall/ChangeLog ./ChangeLog +--- ../cinstall/ChangeLog Mon Feb 18 14:56:38 2002 ++++ ./ChangeLog Mon Feb 18 15:05:09 2002 +@@ -1,3 +1,18 @@ +2002-01-29 Jan Nieuwenhuizen + -+ * site.cc (OnMessageCmd): Bugfix: don't try to add NULL url. -+ -+ * Forward port patch to cvs -D20020129. ++ * Forward port patch to cvs -D20020218. + + * mklink2.c: Compile fix. + @@ -15,24 +13,36 @@ diff -purN --exclude=*~ ../cinstall.orig/ChangeLog ./ChangeLog + (save_icon): Parametrize. + (do_desktop_setup): LilyPond support; disable Cygwin support. + -+ * res.rc: Adapted for LilyPond. ++ * res.rc: Adapt for LilyPond. + + * ini.cc (fprintf): Cygwin -> GNU LilyPond + - 2002-01-29 Christopher Faylor + 2002-02-05 Jason Tishler - * configure: Regenerate. -@@ -3288,4 +3305,4 @@ Sat Apr 1 20:48:09 2000 Christopher Fa + * download.cc (do_download_thread): Fix off-by-one error. +@@ -3705,4 +3720,4 @@ Sat Apr 1 20:48:09 2000 Christopher Fa * zlib/Makefile.in: Regenerate from Makefile.am - %%% $Id: ChangeLog,v 2.189 2002/01/29 14:43:57 cgf Exp $ --$Revision: 2.189 $ -+$Revision: 2.189.jcn1 $ -Binary files ../cinstall.orig/LilyPond.ico and ./LilyPond.ico differ -diff -purN --exclude=*~ ../cinstall.orig/desktop.cc ./desktop.cc ---- ../cinstall.orig/desktop.cc Tue Jan 29 10:24:32 2002 -+++ ./desktop.cc Tue Jan 29 10:33:01 2002 -@@ -83,9 +83,7 @@ static const char *etc_profile[] = { + %%% $Id: ChangeLog,v 2.194 2002/02/18 13:54:49 rbcollins Exp $ +-$Revision: 2.194 $ ++$Revision: 2.194.jcn1 $ +Binary files ../cinstall/LilyPond.ico and ./LilyPond.ico differ +diff -purN --exclude=*~ --exclude=zlib ../cinstall/Makefile.in ./Makefile.in +--- ../cinstall/Makefile.in Mon Feb 18 14:56:38 2002 ++++ ./Makefile.in Mon Feb 18 15:21:39 2002 +@@ -42,7 +42,7 @@ CC := @CC@ + CC_FOR_TARGET := $(CC) + CXX := @CXX@ + +-CFLAGS := @CFLAGS@ $(MC_DEFS) -Werror -Winline -Wall -Wpointer-arith \ ++CFLAGS := @CFLAGS@ $(MC_DEFS) -Winline -Wall -Wpointer-arith \ + -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ + -Wmissing-declarations -Wcomments + CXXFLAGS := @CXXFLAGS@ $(CFLAGS) -fno-rtti +diff -purN --exclude=*~ --exclude=zlib ../cinstall/desktop.cc ./desktop.cc +--- ../cinstall/desktop.cc Mon Feb 18 14:56:42 2002 ++++ ./desktop.cc Mon Feb 18 15:18:17 2002 +@@ -86,9 +86,7 @@ static const char *etc_profile[] = { "done", "", "export MAKE_MODE=unix", @@ -43,59 +53,61 @@ diff -purN --exclude=*~ ../cinstall.orig/desktop.cc ./desktop.cc "", "cd \"$HOME\"", 0 -@@ -204,6 +202,35 @@ make_cygwin_bat () +@@ -215,6 +213,34 @@ make_cygwin_bat () } static void +make_lily_bat () +{ -+ batname = backslash (concat (get_root_dir (), "/lilypond.bat", 0)); ++ batname = backslash (cygpath ("/lilypond.bat")); + + /* if the batch file exists, don't overwrite it */ -+ if (_access (batname, 0) == 0) ++ if (_access (batname.cstr_oneuse (), 0) == 0) + return; + -+ FILE *bat = fopen (batname, "wt"); ++ FILE *bat = fopen (batname.cstr_oneuse (), "wt"); + if (!bat) + return; + + fprintf (bat, "@echo off\n\n"); + -+ fprintf (bat, "%.2s\n", get_root_dir ()); ++ fprintf (bat, "%.2s\n", get_root_dir ().cstr_oneuse ()); + fprintf (bat, "chdir %s\n\n", -+ backslash (concat (get_root_dir () + 2, "/bin", 0))); ++ backslash (get_root_dir () + "/bin").cstr_oneuse ()); + -+ if (_access (cygpath ("/usr/bin/rxvt"), 0) == 0) ++ if (_access (cygpath ("/usr/bin/rxvt").cstr_oneuse (), 0) == 0) + fprintf (bat, "rxtv -e /bin/bash --login -i \n"); + else + /* fprintf (bat, "bash --rcfile /bin/lilypond-profile\n"); */ + fprintf (bat, "bash --login -i\n"); + + fclose (bat); -+ +} + +static void make_etc_profile () { - char *fname = cygpath ("/etc/profile", 0); -@@ -301,11 +328,11 @@ out: + String fname = cygpath ("/etc/profile"); +@@ -309,13 +335,13 @@ make_passwd_group () + out: + fclose (p); } - +- ++ static void -save_icon () +save_icon (char const* iconfile, char const* iconres) { -- iconname = backslash (cygpath ("/cygwin.ico", 0)); +- iconname = backslash (cygpath ("/cygwin.ico")); - - HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE"); -+ iconname = backslash (concat (get_root_dir (), iconfile, 0)); ++ iconname = backslash (cygpath (iconfile)); + + HRSRC rsrc = FindResource (NULL, iconres, "FILE"); if (rsrc == NULL) { fatal ("FindResource failed"); -@@ -325,12 +352,13 @@ save_icon () +@@ -335,12 +361,13 @@ save_icon () static void do_desktop_setup () { @@ -110,7 +122,7 @@ diff -purN --exclude=*~ ../cinstall.orig/desktop.cc ./desktop.cc if (root_menu) { start_menu ("Cygwin Bash Shell", batname); -@@ -339,6 +367,20 @@ do_desktop_setup () +@@ -349,6 +376,20 @@ do_desktop_setup () if (root_desktop) { desktop_icon ("Cygwin", batname); @@ -131,10 +143,10 @@ diff -purN --exclude=*~ ../cinstall.orig/desktop.cc ./desktop.cc } } -diff -purN --exclude=*~ ../cinstall.orig/ini.cc ./ini.cc ---- ../cinstall.orig/ini.cc Tue Jan 29 10:24:34 2002 -+++ ./ini.cc Tue Jan 29 10:33:01 2002 -@@ -282,7 +282,7 @@ fprintf (FILE * f, const char *fmt, ...) +diff -purN --exclude=*~ --exclude=zlib ../cinstall/ini.cc ./ini.cc +--- ../cinstall/ini.cc Mon Feb 18 14:56:43 2002 ++++ ./ini.cc Mon Feb 18 15:00:16 2002 +@@ -286,7 +286,7 @@ fprintf (FILE * f, const char *fmt, ...) { *nl = 0; /*OutputDebugString (stderrbuf); */ @@ -143,21 +155,21 @@ diff -purN --exclude=*~ ../cinstall.orig/ini.cc ./ini.cc stderrbuf[0] = 0; } -diff -purN --exclude=*~ ../cinstall.orig/msg.cc ./msg.cc ---- ../cinstall.orig/msg.cc Sun Dec 23 13:13:29 2001 -+++ ./msg.cc Tue Jan 29 11:10:03 2002 +diff -purN --exclude=*~ --exclude=zlib ../cinstall/msg.cc ./msg.cc +--- ../cinstall/msg.cc Mon Feb 18 14:56:43 2002 ++++ ./msg.cc Mon Feb 18 15:01:24 2002 @@ -47,7 +47,7 @@ mbox (HWND owner, const char *name, int vsprintf (buf, fmt, args); - log (0, "mbox %s: %s", name, buf); + log (LOG_PLAIN, String ("mbox ") + name + ": " + buf); - return MessageBox (owner, buf, "Cygwin Setup", type); + return MessageBox (owner, buf, "GNU LilyPond Setup", type); } void -diff -purN --exclude=*~ ../cinstall.orig/res.rc ./res.rc ---- ../cinstall.orig/res.rc Tue Jan 29 10:24:34 2002 -+++ ./res.rc Tue Jan 29 22:26:51 2002 +diff -purN --exclude=*~ --exclude=zlib ../cinstall/res.rc ./res.rc +--- ../cinstall/res.rc Mon Feb 18 14:56:43 2002 ++++ ./res.rc Mon Feb 18 15:00:16 2002 @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U IDD_SOURCE DIALOG DISCARDABLE 0, 0, 317, 179 @@ -191,7 +203,7 @@ diff -purN --exclude=*~ ../cinstall.orig/res.rc ./res.rc + ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28, 317,1 - LTEXT "Select a directory where you want Setup to store the installation files it dowmloads. The directory will be created if it does not already exist.", + LTEXT "Select a directory where you want Setup to store the installation files it downloads. The directory will be created if it does not already exist.", @@ -67,7 +67,7 @@ END IDD_ROOT DIALOG DISCARDABLE 0, 0, 317, 179 @@ -405,9 +417,9 @@ diff -purN --exclude=*~ ../cinstall.orig/res.rc ./res.rc IDS_REBOOT_REQUIRED "In-use files have been replaced. You need to reboot as soon as possible to activate the new versions. Cygwin may operate incorrectly until you reboot." END -diff -purN --exclude=*~ ../cinstall.orig/resource.h ./resource.h ---- ../cinstall.orig/resource.h Tue Jan 29 10:24:34 2002 -+++ ./resource.h Tue Jan 29 10:34:12 2002 +diff -purN --exclude=*~ --exclude=zlib ../cinstall/resource.h ./resource.h +--- ../cinstall/resource.h Sat Jan 19 14:33:17 2002 ++++ ./resource.h Mon Feb 18 15:00:16 2002 @@ -48,13 +48,14 @@ #define IDB_SPIN 118 #define IDB_RTARROW 119 @@ -424,15 +436,3 @@ diff -purN --exclude=*~ ../cinstall.orig/resource.h ./resource.h #define IDC_SOURCE_DOWNLOAD 1000 #define IDC_SOURCE_NETINST 1001 #define IDC_SOURCE_CWD 1002 -diff -purN --exclude=*~ ../cinstall.orig/site.cc ./site.cc ---- ../cinstall.orig/site.cc Tue Jan 29 10:24:34 2002 -+++ ./site.cc Tue Jan 29 22:17:13 2002 -@@ -415,6 +415,8 @@ bool SitePage::OnMessageCmd (int id, HWN - { - // User pushed the Add button. - other_url = eget (GetHWND (), IDC_EDIT_USER_URL, other_url); -+ if (!other_url) -+ break; - site_list_type * - newsite = - new diff --git a/VERSION b/VERSION index 72be86c85d..06a5281065 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=31 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py index fe15316b41..54e313b9f2 100644 --- a/stepmake/bin/add-html-footer.py +++ b/stepmake/bin/add-html-footer.py @@ -171,13 +171,14 @@ def remove_self_ref (s): self_url = re.sub ('.*topdocs/out-www/index.html', 'index.html', self_url) #sys.stderr.write ('url2: %s\n' % self_url) - m = re.match ('.*?()([^<]*)()', - s, re.DOTALL) + # ugh, python2.[12] re is broken. + ## pat = re.compile ('.*?()([^<]*)()', re.DOTALL) + pat = re.compile ('[.\n]*?()([^<]*)()') + m = pat.search (s) while m: #sys.stderr.write ('self: %s\n' % m.group (2)) s = s[:m.start (1)] + m.group (2) + s[m.end (3):] - m = re.match ('.*?()([^<]*)()', - s, re.DOTALL) + m = pat.search (s) return s def do_file (f): @@ -247,19 +248,25 @@ def do_file (f): s = re.sub ('@LOCALTIME@', localtime, s) s = re.sub ('@MAILADDRESS@', mail_address, s) s = re.sub ('@BRANCH@', branch_str, s) - - m = re.match ('.*?', s, re.DOTALL) + + # ugh, python2.[12] re is broken. + #pat = re.compile ('.*?', re.DOTALL) + pat = re.compile ('[.\n]*?') + m = pat.search (s) while m: at_var = m.group (1) at_val = m.group (2) - #sys.stderr.write ('at: %s -> %s\n' % (at_var, at_val)) + sys.stderr.write ('at: %s -> %s\n' % (at_var, at_val)) s = re.sub (at_var, at_val, s) - m = re.match ('.*?', s, re.DOTALL) + m = pat.search (s) # urg # maybe find first node? fallback_web_title = '-- --' - m = re.match ('.*?\(.*?\)', s, re.DOTALL) + + # ugh, python2.[12] re is broken. + #m = re.match ('.*?\(.*?\)', s, re.DOTALL) + m = re.match ('[.\n]*?([.\n]*?)', s) if m: fallback_web_title = m.group (1) s = re.sub ('@WEB-TITLE@', fallback_web_title, s) -- 2.39.2