-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 <janneke@gnu.org>
+
-+ * 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.
+
+ (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 <cgf@redhat.com>
+ 2002-02-05 Jason Tishler <jason@tishler.net>
- * 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",
"",
"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 ()
{
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);
}
}
-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); */
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
+ 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
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
#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
self_url = re.sub ('.*topdocs/out-www/index.html', 'index.html', self_url)
#sys.stderr.write ('url2: %s\n' % self_url)
- m = re.match ('.*?(<a href="[\./]*' + self_url + '#?[^"]*">)([^<]*)(</a>)',
- s, re.DOTALL)
+ # ugh, python2.[12] re is broken.
+ ## pat = re.compile ('.*?(<a href="[\./]*' + self_url + '#?[^"]*">)([^<]*)(</a>)', re.DOTALL)
+ pat = re.compile ('[.\n]*?(<a href="[\./]*' + self_url + '#?[^"]*">)([^<]*)(</a>)')
+ 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 ('.*?(<a href="[\./]*' + self_url + '#?[^"]*">)([^<]*)(</a>)',
- s, re.DOTALL)
+ m = pat.search (s)
return s
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 ('.*?<!-- (@[a-zA-Z0-9_-]*@)=(.*?) -->', s, re.DOTALL)
+
+ # ugh, python2.[12] re is broken.
+ #pat = re.compile ('.*?<!--\s*(@[^@]*@)\s*=\s*([^\s]*)\s*-->', re.DOTALL)
+ pat = re.compile ('[.\n]*?<!--\s*(@[^@]*@)\s*=\s*([^\s]*)\s*-->')
+ 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 ('.*?<!-- (@[a-zA-Z0-9_-]*@)=(.*?) -->', s, re.DOTALL)
+ m = pat.search (s)
# urg
# maybe find first node?
fallback_web_title = '-- --'
- m = re.match ('.*?<title>\(.*?\)</title>', s, re.DOTALL)
+
+ # ugh, python2.[12] re is broken.
+ #m = re.match ('.*?<title>\(.*?\)</title>', s, re.DOTALL)
+ m = re.match ('[.\n]*?<title>([.\n]*?)</title>', s)
if m:
fallback_web_title = m.group (1)
s = re.sub ('@WEB-TITLE@', fallback_web_title, s)
projects / lilypond.git / commitdiff