-Binary files ../cinstall/LilyPond.ico and ./LilyPond.ico differ
-diff -urN ../cinstall/Makefile.in ./Makefile.in
---- ../cinstall/Makefile.in Thu Feb 8 05:55:22 2001
-+++ ./Makefile.in Sun Apr 8 19:54:54 2001
-@@ -130,11 +130,15 @@
- @chmod a-x $@
+diff -purN --exclude=configure ../setup/ChangeLog ./ChangeLog
+--- ../setup/ChangeLog Fri Jun 14 18:44:05 2002
++++ ./ChangeLog Fri Jun 14 18:47:17 2002
+@@ -1,3 +1,16 @@
++2002-03-19 Jan Nieuwenhuizen <janneke@gnu.org>
++
++ * Forward port patch to cvs -r setup-200206 -D20020614.
++
++ * desktop.cc: Remove spurious line breaks from etc_profile.
++ (make_lily_bat): New function.
++ (save_icon): Parametrize.
++ (do_desktop_setup): LilyPond support; disable Cygwin support.
++
++ * res.rc: Adapt for LilyPond.
++
++ * ini.cc (fprintf): Cygwin -> GNU LilyPond
++
+ 2002-06-10 Robert Collins <rbtcollins@hotmail.com>
- clean:
-- rm -f *.o *.rc $(PROGS)
-+ rm -f *.o $(PROGS)
- $(MAKE) -C zlib clean
+ * IniParseFindVisitor (IniParseFindVisitor::visitFile): Apply Max
+diff -purN --exclude=configure ../setup/bz2lib/configure.in ./bz2lib/configure.in
+--- ../setup/bz2lib/configure.in Fri Jun 14 18:45:37 2002
++++ ./bz2lib/configure.in Fri Jun 14 18:46:33 2002
+@@ -7,7 +7,7 @@ AC_CONFIG_AUX_DIR(../cfgaux)
+ AM_INIT_AUTOMAKE(libbz2, 0.0)
+ AM_MAINTAINER_MODE
- realclean: clean
- rm -f Makefile config.cache
-+ rm -f inilex.c iniparse.c iniparse.h version.c config.log config.status *.d
-+
-+
-+distclean: 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 Sun Apr 8 21:52:48 2001
-@@ -85,6 +85,11 @@
+-CPPFLAGS=-U_WIN32
++CPPFLAGS="$CPPFLAGS -U_WIN32"
+ AC_CANONICAL_HOST
+ AC_PROG_CC
+ AC_PROG_RANLIB
+diff -purN --exclude=configure ../setup/desktop.cc ./desktop.cc
+--- ../setup/desktop.cc Fri Jun 14 12:51:31 2002
++++ ./desktop.cc Fri Jun 14 18:46:40 2002
+@@ -87,9 +87,7 @@ static const char *etc_profile[] = {
+ "done",
"",
- "cd \"$HOME\"",
+ "export MAKE_MODE=unix",
+- "export PS1='\\[\\033]0;\\w\\007",
+- "\\033[32m\\]\\u@\\h \\[\\033[33m\\w\\033[0m\\]",
+- "$ '",
++ "export PS1='\\[\\033]0;\\w\\007\\033[32m\\]\\u@\\h \\[\\033[33m\\w\\033[0m\\]$ '",
"",
-+ "PATH=\"/usr/lilypond/bin:$PATH\"",
-+ "if [ ! -e \"/usr/lilypond\" ]; then",
-+ " ln -s `tail -1 /usr/lilypond-*` /usr/lilypond",
-+ "fi",
-+ "",
- "test -f ./.bashrc && . ./.bashrc",
+ "cd \"$HOME\"",
0
- };
-@@ -197,6 +202,30 @@
+@@ -216,6 +214,34 @@ make_cygwin_bat ()
}
static void
+make_lily_bat ()
+{
-+ batname = backslash (concat (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", root_dir);
-+ fprintf (bat, "chdir %s\n\n", backslash (concat (root_dir+2, "/bin", 0)));
++ fprintf (bat, "%.2s\n", get_root_dir ().cstr_oneuse ());
++ fprintf (bat, "chdir %s\n\n",
++ backslash (get_root_dir () + "/bin").cstr_oneuse ());
+
-+ /* fprintf (bat, "bash --rcfile /bin/lilypond-profile\n"); */
-+ fprintf (bat, "bash --login -i\n");
++ 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 = concat (root_dir, "/etc/profile", 0);
-@@ -299,11 +328,11 @@
+ String fname = cygpath ("/etc/profile");
+@@ -309,13 +335,13 @@ make_passwd_group ()
+ fprintf (p, "bin\\mkgroup -l > etc\\group\n");
+ fclose (p);
}
-
+-
++
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"));
+-
- HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE");
++ iconname = backslash (cygpath (iconfile));
++
+ HRSRC rsrc = FindResource (NULL, iconres, "FILE");
if (rsrc == NULL)
{
fatal ("FindResource failed");
-@@ -323,7 +352,7 @@
+@@ -335,12 +361,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 +364,17 @@
+ make_passwd_group ();
- if (root_desktop) {
- desktop_icon ("Cygwin", batname);
-+ }
-+
++#if 0
+ if (root_menu)
+ {
+ start_menu ("Cygwin Bash Shell", batname);
+@@ -349,6 +376,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 Sun Apr 8 21:52:03 2001
-@@ -174,7 +174,7 @@
+diff -purN --exclude=configure ../setup/ini.cc ./ini.cc
+--- ../setup/ini.cc Fri Jun 14 12:51:38 2002
++++ ./ini.cc Fri Jun 14 18:46:40 2002
+@@ -310,7 +310,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 Setup", 0);
stderrbuf[0] = 0;
}
-
-diff -urN ../cinstall/msg.cc ./msg.cc
---- ../cinstall/msg.cc Sat Aug 26 05:55:14 2000
-+++ ./msg.cc Sun Apr 8 21:51:56 2001
-@@ -44,7 +44,7 @@
+
+diff -purN --exclude=configure ../setup/msg.cc ./msg.cc
+--- ../setup/msg.cc Fri Jun 14 12:51:46 2002
++++ ./msg.cc Fri Jun 14 18:46:40 2002
+@@ -47,7 +47,7 @@ mbox (HWND owner, const char *name, int
vsprintf (buf, fmt, args);
- log (0, "mbox %s: %s", name, buf);
-- return MessageBox (0, buf, "Cygwin Setup", type | MB_TOPMOST);
-+ return MessageBox (0, buf, "GNU LilyPond Cygwin Setup", type | MB_TOPMOST);
+ log (LOG_PLAIN, String ("mbox ") + name + ": " + buf);
+- return MessageBox (owner, buf, "Cygwin Setup", type);
++ return MessageBox (owner, buf, "GNU LilyPond Setup", type);
}
void
-diff -urN ../cinstall/res.rc ./res.rc
---- ../cinstall/res.rc Wed Mar 7 18:13:31 2001
-+++ ./res.rc Sun Apr 8 19:48:40 2001
-@@ -30,10 +30,10 @@
+diff -purN --exclude=configure ../setup/res.rc ./res.rc
+--- ../setup/res.rc Fri Jun 14 12:51:55 2002
++++ ./res.rc Fri Jun 14 18:46:40 2002
+@@ -30,7 +30,7 @@ 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
+ IDD_SOURCE DIALOG DISCARDABLE 0, 0, 317, 179
+ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
FONT 8, "MS Sans Serif"
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"
- FONT 8, "MS Sans Serif"
- BEGIN
-- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
-+ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
- 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 @@
+@@ -39,7 +39,7 @@ BEGIN
+ BS_AUTORADIOBUTTON | WS_TABSTOP,101,84,115,10
+ CONTROL "Install from &Local Directory",IDC_SOURCE_CWD,"Button",
+ BS_AUTORADIOBUTTON | WS_TABSTOP,101,99,115,10
+- ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
++ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
+ CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
+ 317,1
+ LTEXT "Choose A Download Source",IDC_STATIC_HEADER_TITLE,7,0,
+@@ -50,13 +50,13 @@ END
- IDD_ROOT DIALOG DISCARDABLE 0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ IDD_LOCAL_DIR DIALOG DISCARDABLE 0, 0, 317, 179
+ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | 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
- 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 @@
+ EDITTEXT IDC_LOCAL_DIR,58,83,165,15,ES_AUTOHSCROLL | WS_GROUP
+ PUSHBUTTON "B&rowse...",IDC_LOCAL_DIR_BROWSE,223,83,34,14
+ GROUPBOX "Local Package Directory",IDC_STATIC,53,67,210,45
+- ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
++ 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 downloads. The directory will be created if it does not already exist.",
+@@ -67,7 +67,7 @@ END
- IDD_SITE DIALOG DISCARDABLE 0, 0, 222, 206
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ IDD_ROOT DIALOG DISCARDABLE 0, 0, 317, 179
+ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | 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 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 @@
-
- IDD_OTHER_URL DIALOG DISCARDABLE 0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ GROUPBOX "Root Directory",IDC_STATIC,5,50,305,40,WS_TABSTOP
+@@ -83,7 +83,7 @@ BEGIN
+ WS_GROUP | WS_TABSTOP,170,120,90,8
+ CONTROL "&Unix",IDC_ROOT_BINARY,"Button",BS_AUTORADIOBUTTON |
+ WS_TABSTOP,170,135,90,8
+- ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20
++ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
+ CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
+ 317,1
+ LTEXT "Select the directory where you want to install Cygwin. Also choose a few installation parameters.",
+@@ -96,10 +96,10 @@ IDD_SITE DIALOG DISCARDABLE 0, 0, 317,
+ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
+ WS_CAPTION | WS_SYSMENU
+ EXSTYLE WS_EX_CONTROLPARENT
-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 &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 @@
+- ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20
++ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
+ LISTBOX IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT |
+ LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP |
+ WS_TABSTOP
+@@ -119,7 +119,7 @@ END
- IDD_NET DIALOG DISCARDABLE 0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ IDD_NET DIALOG DISCARDABLE 0, 0, 317, 179
+ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | 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
- 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 @@
- IDD_DLSTATUS DIALOG DISCARDABLE 0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE |
- 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
- 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 @@
- IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE |
- WS_CAPTION | WS_SYSMENU
+@@ -137,7 +137,7 @@ BEGIN
+ NOT WS_GROUP
+ RTEXT "Por&t",IDC_STATIC,85,125,30,12,SS_CENTERIMAGE | NOT
+ WS_GROUP
+- ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
++ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
+ CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
+ 317,1
+ LTEXT "Setup needs to know how you want it to connect to the internet. Choose the appropriate settings below.",
+@@ -149,7 +149,7 @@ END
+ IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 317, 179
+ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | 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
- 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 @@
+ LTEXT "Installing...",IDC_INS_ACTION,45,55,205,8,NOT WS_GROUP
+@@ -164,7 +164,7 @@ BEGIN
+ LTEXT "Package:",IDC_INS_BL_PACKAGE,45,100,47,8,NOT WS_GROUP
+ LTEXT "Total:",IDC_INS_BL_TOTAL,45,115,48,8,NOT WS_GROUP
+ LTEXT "Disk:",IDC_INS_BL_DISK,45,130,47,8,NOT WS_GROUP
+- ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20
++ ICON IDI_LILYPOND,IDC_STATIC,290,0,20,20
+ CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
+ 317,1
+ LTEXT "This page displays the progress of the download or installation.",
+@@ -175,10 +175,10 @@ END
IDD_PROXY_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
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 @@
+@@ -192,10 +192,10 @@ END
IDD_NET_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
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 @@
-
- IDD_SPLASH DIALOG DISCARDABLE 0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+@@ -206,37 +206,34 @@ BEGIN
+ DEFPUSHBUTTON "&OK",IDOK,100,75,45,15,WS_DISABLED
+ PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
+ END
+-
+ IDD_SPLASH DIALOG DISCARDABLE 0, 0, 317, 179
+ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
+ 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
-- 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
-- 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 (C) 2000-2001 Red Hat Inc",IDC_STATIC,55,35,135,8
-+ LTEXT " (C) 2001 Jan Nieuwenhuizen <janneke@gnu.org>",IDC_STATIC,55,45,135,8
- DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
- PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
+- ICON IDI_CYGWIN,IDC_STATIC,113,112,21,20,WS_GROUP
+-# CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,95,178
+- LTEXT "Version (unknown)",IDC_VERSION,115,137,195,10
+- LTEXT "Cygwin Net Release Setup Program",
++ ICON IDI_LILYPOND,IDC_STATIC,113,112,21,20,WS_GROUP
++ CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,95,178
++ LTEXT "Version (1.4.12)",IDC_VERSION,115,137,195,10
++ LTEXT "GNU LilyPond Setup Program",
+ IDC_STATIC_WELCOME_TITLE,115,1,195,24
+- LTEXT "Copyright 2000, 2001 Red Hat Inc.",IDC_STATIC,115,150,
+- 195,8
+- LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,115,162,
+- 195,8
+- LTEXT "This wizard will guide you through the installation and updating of the Cygwin environment and a plethora of GNU packages.",
+- IDC_STATIC,115,33,195,54
++ LTEXT "Copyright (C) 2000, 2001, 2002 Red Hat Inc.",
++ IDC_STATIC,115,138,195,8
++ LTEXT " (C) 2001, 2002 Jan Nieuwenhuizen <janneke@gnu.org>",IDC_STATIC,115,150,195,8
++ LTEXT "http://www.lilypond.org/cygwin/",IDC_STATIC,115,162,195,8
++ LTEXT "This wizard will guide you through the installation and updating LilyPond and all other necessary Cygwin packages.",IDC_STATIC,115,33,195,54
END
-
- IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 292, 206
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+-
+ IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 317, 179
+ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
+ 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
- CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT
- WS_VISIBLE,55,15,230,155
-@@ -249,10 +248,10 @@
+ CONTROL "Create icon on &Desktop",IDC_ROOT_DESKTOP,"Button",
+ BS_AUTOCHECKBOX,108,78,100,8
+ CONTROL "Add icon to &Start Menu",IDC_ROOT_MENU,"Button",
+ BS_AUTOCHECKBOX,108,93,100,8
+- ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
++ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
+ CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
+ 317,1
+ LTEXT "Tell setup if you want it to create a few icons for convenient access to the Cygwin environment.",
+@@ -247,10 +244,10 @@ END
- IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 215, 95
+ IDD_FTP_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
BEGIN
- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
+ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
- 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 @@
+ LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
+ WS_EX_RIGHT
+ EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
+@@ -265,7 +262,7 @@ END
+ IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 317, 179
+ STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
+ WS_SYSMENU
+-CAPTION "Cygwin Setup"
++CAPTION "GNU LilyPond Setup"
+ FONT 8, "MS Sans Serif"
+ BEGIN
+ CONTROL "&Prev",IDC_CHOOSE_PREV,"Button",BS_AUTORADIOBUTTON |
+@@ -279,7 +276,7 @@ BEGIN
+ 317,1
+ CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT
+ WS_VISIBLE,7,41,303,134
+- ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20
++ ICON IDI_LILYPOND,IDC_STATIC,290,0,20,20
+ LTEXT "Select the packages you want setup to install.",
+ IDC_STATIC,21,9,239,16,NOT WS_GROUP
+ LTEXT "Select Packages",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT
+@@ -323,6 +320,7 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_CYGWIN ICON DISCARDABLE "cygwin.ico"
/////////////////////////////////////////////////////////////////////////////
-@@ -305,6 +305,7 @@
+@@ -330,6 +328,7 @@ IDI_CYGWIN ICON DISCARDA
// FILE
//
CYGWIN.ICON FILE DISCARDABLE "cygwin.ico"
/////////////////////////////////////////////////////////////////////////////
-@@ -354,7 +355,7 @@
+@@ -434,7 +433,7 @@ 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?"
- IDS_MIRROR_LST "http://sources.redhat.com/cygwin/mirrors.lst"
-+ IDS_MIRROR_LST "http://appel.lilypond.org/lilypond/gnu-windows/mirrors.lst"
++ IDS_MIRROR_LST "http://www.lilypond.org/cygwin/mirrors.lst"
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 Sun Apr 8 16:38:11 2001
-@@ -47,11 +47,12 @@
+@@ -443,7 +442,7 @@ BEGIN
+ IDS_OLD_SETUPINI "This setup.ini is older than the one you used last time you installed cygwin. Proceed anyway?"
+ IDS_ERR_RENAME "Can't rename %s to %s: %s"
+ IDS_NOTHING_INSTALLED "Nothing needed to be installed"
+- IDS_INSTALL_COMPLETE "Installation Complete"
++ IDS_INSTALL_COMPLETE "Installation Complete. See http://www.lilypond.org/cygwin/ for support."
+ 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=configure ../setup/resource.h ./resource.h
+--- ../setup/resource.h Fri Jun 14 12:51:55 2002
++++ ./resource.h Fri Jun 14 18:46:40 2002
+@@ -50,13 +50,14 @@
#define IDB_SPIN 118
#define IDB_RTARROW 119
#define IDI_SPIN 120
#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 IDD_CHOOSER 127
++#define IDI_CYGWIN 128
#define IDC_SOURCE_DOWNLOAD 1000
#define IDC_SOURCE_NETINST 1001
#define IDC_SOURCE_CWD 1002
projects / lilypond.git / blobdiff