1 diff -purN --exclude=configure ../setup/ChangeLog ./ChangeLog
2 --- ../setup/ChangeLog Fri Jun 14 18:44:05 2002
3 +++ ./ChangeLog Fri Jun 14 18:47:17 2002
5 +2002-03-19 Jan Nieuwenhuizen <janneke@gnu.org>
7 + * Forward port patch to cvs -r setup-200206 -D20020614.
9 + * desktop.cc: Remove spurious line breaks from etc_profile.
10 + (make_lily_bat): New function.
11 + (save_icon): Parametrize.
12 + (do_desktop_setup): LilyPond support; disable Cygwin support.
14 + * res.rc: Adapt for LilyPond.
16 + * ini.cc (fprintf): Cygwin -> GNU LilyPond
18 2002-06-10 Robert Collins <rbtcollins@hotmail.com>
20 * IniParseFindVisitor (IniParseFindVisitor::visitFile): Apply Max
21 diff -purN --exclude=configure ../setup/bz2lib/configure.in ./bz2lib/configure.in
22 --- ../setup/bz2lib/configure.in Fri Jun 14 18:45:37 2002
23 +++ ./bz2lib/configure.in Fri Jun 14 18:46:33 2002
24 @@ -7,7 +7,7 @@ AC_CONFIG_AUX_DIR(../cfgaux)
25 AM_INIT_AUTOMAKE(libbz2, 0.0)
29 +CPPFLAGS="$CPPFLAGS -U_WIN32"
33 diff -purN --exclude=configure ../setup/desktop.cc ./desktop.cc
34 --- ../setup/desktop.cc Fri Jun 14 12:51:31 2002
35 +++ ./desktop.cc Fri Jun 14 18:46:40 2002
36 @@ -87,9 +87,7 @@ static const char *etc_profile[] = {
39 "export MAKE_MODE=unix",
40 - "export PS1='\\[\\033]0;\\w\\007",
41 - "\\033[32m\\]\\u@\\h \\[\\033[33m\\w\\033[0m\\]",
43 + "export PS1='\\[\\033]0;\\w\\007\\033[32m\\]\\u@\\h \\[\\033[33m\\w\\033[0m\\]$ '",
47 @@ -216,6 +214,34 @@ make_cygwin_bat ()
53 + batname = backslash (cygpath ("/lilypond.bat"));
55 + /* if the batch file exists, don't overwrite it */
56 + if (_access (batname.cstr_oneuse (), 0) == 0)
59 + FILE *bat = fopen (batname.cstr_oneuse (), "wt");
63 + fprintf (bat, "@echo off\n\n");
65 + fprintf (bat, "%.2s\n", get_root_dir ().cstr_oneuse ());
66 + fprintf (bat, "chdir %s\n\n",
67 + backslash (get_root_dir () + "/bin").cstr_oneuse ());
69 + if (_access (cygpath ("/usr/bin/rxvt").cstr_oneuse (), 0) == 0)
70 + fprintf (bat, "rxtv -e /bin/bash --login -i \n");
72 + /* fprintf (bat, "bash --rcfile /bin/lilypond-profile\n"); */
73 + fprintf (bat, "bash --login -i\n");
81 String fname = cygpath ("/etc/profile");
82 @@ -309,13 +335,13 @@ make_passwd_group ()
83 fprintf (p, "bin\\mkgroup -l > etc\\group\n");
90 +save_icon (char const* iconfile, char const* iconres)
92 - iconname = backslash (cygpath ("/cygwin.ico"));
94 - HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE");
95 + iconname = backslash (cygpath (iconfile));
97 + HRSRC rsrc = FindResource (NULL, iconres, "FILE");
100 fatal ("FindResource failed");
101 @@ -335,12 +361,13 @@ save_icon ()
106 + save_icon ("/cygwin.ico", "CYGWIN.ICON");
110 make_passwd_group ();
115 start_menu ("Cygwin Bash Shell", batname);
116 @@ -349,6 +376,20 @@ do_desktop_setup ()
119 desktop_icon ("Cygwin", batname);
123 + save_icon ("/LilyPond.ico", "LILYPOND.ICON");
128 + start_menu ("GNU LilyPond Shell", batname);
133 + desktop_icon ("GNU LilyPond", batname);
137 diff -purN --exclude=configure ../setup/ini.cc ./ini.cc
138 --- ../setup/ini.cc Fri Jun 14 12:51:38 2002
139 +++ ./ini.cc Fri Jun 14 18:46:40 2002
140 @@ -310,7 +310,7 @@ fprintf (FILE * f, const char *fmt, ...)
143 /*OutputDebugString (stderrbuf); */
144 - MessageBox (0, buf, "Cygwin Setup", 0);
145 + MessageBox (0, buf, "GNU LilyPond Setup", 0);
149 diff -purN --exclude=configure ../setup/msg.cc ./msg.cc
150 --- ../setup/msg.cc Fri Jun 14 12:51:46 2002
151 +++ ./msg.cc Fri Jun 14 18:46:40 2002
152 @@ -47,7 +47,7 @@ mbox (HWND owner, const char *name, int
154 vsprintf (buf, fmt, args);
155 log (LOG_PLAIN, String ("mbox ") + name + ": " + buf);
156 - return MessageBox (owner, buf, "Cygwin Setup", type);
157 + return MessageBox (owner, buf, "GNU LilyPond Setup", type);
161 diff -purN --exclude=configure ../setup/res.rc ./res.rc
162 --- ../setup/res.rc Fri Jun 14 12:51:55 2002
163 +++ ./res.rc Fri Jun 14 18:46:40 2002
164 @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
166 IDD_SOURCE DIALOG DISCARDABLE 0, 0, 317, 179
167 STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
168 -CAPTION "Cygwin Setup"
169 +CAPTION "GNU LilyPond Setup"
170 FONT 8, "MS Sans Serif"
172 CONTROL "&Install from Internet",IDC_SOURCE_NETINST,"Button",
173 @@ -39,7 +39,7 @@ BEGIN
174 BS_AUTORADIOBUTTON | WS_TABSTOP,101,84,115,10
175 CONTROL "Install from &Local Directory",IDC_SOURCE_CWD,"Button",
176 BS_AUTORADIOBUTTON | WS_TABSTOP,101,99,115,10
177 - ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
178 + ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
179 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
181 LTEXT "Choose A Download Source",IDC_STATIC_HEADER_TITLE,7,0,
182 @@ -50,13 +50,13 @@ END
184 IDD_LOCAL_DIR DIALOG DISCARDABLE 0, 0, 317, 179
185 STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
186 -CAPTION "Cygwin Setup"
187 +CAPTION "GNU LilyPond Setup"
188 FONT 8, "MS Sans Serif"
190 EDITTEXT IDC_LOCAL_DIR,58,83,165,15,ES_AUTOHSCROLL | WS_GROUP
191 PUSHBUTTON "B&rowse...",IDC_LOCAL_DIR_BROWSE,223,83,34,14
192 GROUPBOX "Local Package Directory",IDC_STATIC,53,67,210,45
193 - ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
194 + ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
195 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
197 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.",
198 @@ -67,7 +67,7 @@ END
200 IDD_ROOT DIALOG DISCARDABLE 0, 0, 317, 179
201 STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
202 -CAPTION "Cygwin Setup"
203 +CAPTION "GNU LilyPond Setup"
204 FONT 8, "MS Sans Serif"
206 GROUPBOX "Root Directory",IDC_STATIC,5,50,305,40,WS_TABSTOP
207 @@ -83,7 +83,7 @@ BEGIN
208 WS_GROUP | WS_TABSTOP,170,120,90,8
209 CONTROL "&Unix",IDC_ROOT_BINARY,"Button",BS_AUTORADIOBUTTON |
210 WS_TABSTOP,170,135,90,8
211 - ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20
212 + ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
213 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
215 LTEXT "Select the directory where you want to install Cygwin. Also choose a few installation parameters.",
216 @@ -96,10 +96,10 @@ IDD_SITE DIALOG DISCARDABLE 0, 0, 317,
217 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
218 WS_CAPTION | WS_SYSMENU
219 EXSTYLE WS_EX_CONTROLPARENT
220 -CAPTION "Cygwin Setup"
221 +CAPTION "GNU LilyPond Setup"
222 FONT 8, "MS Sans Serif"
224 - ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20
225 + ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
226 LISTBOX IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT |
227 LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP |
229 @@ -119,7 +119,7 @@ END
231 IDD_NET DIALOG DISCARDABLE 0, 0, 317, 179
232 STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
233 -CAPTION "Cygwin Setup"
234 +CAPTION "GNU LilyPond Setup"
235 FONT 8, "MS Sans Serif"
237 CONTROL "&Direct Connection",IDC_NET_DIRECT,"Button",
238 @@ -137,7 +137,7 @@ BEGIN
240 RTEXT "Por&t",IDC_STATIC,85,125,30,12,SS_CENTERIMAGE | NOT
242 - ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
243 + ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
244 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
246 LTEXT "Setup needs to know how you want it to connect to the internet. Choose the appropriate settings below.",
247 @@ -149,7 +149,7 @@ END
248 IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 317, 179
249 STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION |
251 -CAPTION "Cygwin Setup"
252 +CAPTION "GNU LilyPond Setup"
253 FONT 8, "MS Sans Serif"
255 LTEXT "Installing...",IDC_INS_ACTION,45,55,205,8,NOT WS_GROUP
256 @@ -164,7 +164,7 @@ BEGIN
257 LTEXT "Package:",IDC_INS_BL_PACKAGE,45,100,47,8,NOT WS_GROUP
258 LTEXT "Total:",IDC_INS_BL_TOTAL,45,115,48,8,NOT WS_GROUP
259 LTEXT "Disk:",IDC_INS_BL_DISK,45,130,47,8,NOT WS_GROUP
260 - ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20
261 + ICON IDI_LILYPOND,IDC_STATIC,290,0,20,20
262 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
264 LTEXT "This page displays the progress of the download or installation.",
265 @@ -175,10 +175,10 @@ END
267 IDD_PROXY_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
268 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
269 -CAPTION "Cygwin Setup"
270 +CAPTION "GNU LilyPond Setup"
271 FONT 8, "MS Sans Serif"
273 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
274 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
275 LTEXT "Proxy &User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
277 EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
278 @@ -192,10 +192,10 @@ END
280 IDD_NET_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
281 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
282 -CAPTION "Cygwin Setup"
283 +CAPTION "GNU LilyPond Setup"
284 FONT 8, "MS Sans Serif"
286 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
287 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
288 LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
290 EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
291 @@ -206,37 +206,34 @@ BEGIN
292 DEFPUSHBUTTON "&OK",IDOK,100,75,45,15,WS_DISABLED
293 PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
296 IDD_SPLASH DIALOG DISCARDABLE 0, 0, 317, 179
297 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
298 WS_CAPTION | WS_SYSMENU
299 -CAPTION "Cygwin Setup"
300 +CAPTION "GNU LilyPond Setup"
301 FONT 8, "MS Sans Serif"
303 - ICON IDI_CYGWIN,IDC_STATIC,113,112,21,20,WS_GROUP
304 -# CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,95,178
305 - LTEXT "Version (unknown)",IDC_VERSION,115,137,195,10
306 - LTEXT "Cygwin Net Release Setup Program",
307 + ICON IDI_LILYPOND,IDC_STATIC,113,112,21,20,WS_GROUP
308 + CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,95,178
309 + LTEXT "Version (1.4.12)",IDC_VERSION,115,137,195,10
310 + LTEXT "GNU LilyPond Setup Program",
311 IDC_STATIC_WELCOME_TITLE,115,1,195,24
312 - LTEXT "Copyright 2000, 2001 Red Hat Inc.",IDC_STATIC,115,150,
314 - LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,115,162,
316 - LTEXT "This wizard will guide you through the installation and updating of the Cygwin environment and a plethora of GNU packages.",
317 - IDC_STATIC,115,33,195,54
318 + LTEXT "Copyright (C) 2000, 2001, 2002 Red Hat Inc.",
319 + IDC_STATIC,115,138,195,8
320 + LTEXT " (C) 2001, 2002 Jan Nieuwenhuizen <janneke@gnu.org>",IDC_STATIC,115,150,195,8
321 + LTEXT "http://www.lilypond.org/cygwin/",IDC_STATIC,115,162,195,8
322 + LTEXT "This wizard will guide you through the installation and updating LilyPond and all other necessary Cygwin packages.",IDC_STATIC,115,33,195,54
325 IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 317, 179
326 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
327 WS_CAPTION | WS_SYSMENU
328 -CAPTION "Cygwin Setup"
329 +CAPTION "GNU LilyPond Setup"
330 FONT 8, "MS Sans Serif"
332 CONTROL "Create icon on &Desktop",IDC_ROOT_DESKTOP,"Button",
333 BS_AUTOCHECKBOX,108,78,100,8
334 CONTROL "Add icon to &Start Menu",IDC_ROOT_MENU,"Button",
335 BS_AUTOCHECKBOX,108,93,100,8
336 - ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
337 + ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
338 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
340 LTEXT "Tell setup if you want it to create a few icons for convenient access to the Cygwin environment.",
341 @@ -247,10 +244,10 @@ END
343 IDD_FTP_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
344 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
345 -CAPTION "Cygwin Setup"
346 +CAPTION "GNU LilyPond Setup"
347 FONT 8, "MS Sans Serif"
349 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
350 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
351 LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
353 EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
354 @@ -265,7 +262,7 @@ END
355 IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 317, 179
356 STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
358 -CAPTION "Cygwin Setup"
359 +CAPTION "GNU LilyPond Setup"
360 FONT 8, "MS Sans Serif"
362 CONTROL "&Prev",IDC_CHOOSE_PREV,"Button",BS_AUTORADIOBUTTON |
363 @@ -279,7 +276,7 @@ BEGIN
365 CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT
366 WS_VISIBLE,7,41,303,134
367 - ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20
368 + ICON IDI_LILYPOND,IDC_STATIC,290,0,20,20
369 LTEXT "Select the packages you want setup to install.",
370 IDC_STATIC,21,9,239,16,NOT WS_GROUP
371 LTEXT "Select Packages",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT
372 @@ -323,6 +320,7 @@ END
374 // Icon with lowest ID value placed first to ensure application icon
375 // remains consistent on all systems.
376 +IDI_LILYPOND ICON DISCARDABLE "LilyPond.ico"
377 IDI_CYGWIN ICON DISCARDABLE "cygwin.ico"
379 /////////////////////////////////////////////////////////////////////////////
380 @@ -330,6 +328,7 @@ IDI_CYGWIN ICON DISCARDA
384 +LILYPOND.ICON FILE DISCARDABLE "LilyPond.ico"
385 CYGWIN.ICON FILE DISCARDABLE "cygwin.ico"
387 /////////////////////////////////////////////////////////////////////////////
388 @@ -434,7 +433,7 @@ STRINGTABLE DISCARDABLE
390 IDS_ROOT_SLASH "Warning: we recommend you do NOT use the root of your hard drive as the cygwin root. Proceed anyway?"
391 IDS_ROOT_SPACE "You should not choose a root path that include spaces in directory names. Proceed anyway?"
392 - IDS_MIRROR_LST "http://sources.redhat.com/cygwin/mirrors.lst"
393 + IDS_MIRROR_LST "http://www.lilypond.org/cygwin/mirrors.lst"
394 IDS_DIALOG_FAILED "Unable to create Dialog Box"
395 IDS_CYGWIN_FUNC_MISSING "Error: unable to find function `%s' in %s"
396 IDS_DOWNLOAD_SHORT "Download error: %s too short (%d, wanted %d)"
397 @@ -443,7 +442,7 @@ BEGIN
398 IDS_OLD_SETUPINI "This setup.ini is older than the one you used last time you installed cygwin. Proceed anyway?"
399 IDS_ERR_RENAME "Can't rename %s to %s: %s"
400 IDS_NOTHING_INSTALLED "Nothing needed to be installed"
401 - IDS_INSTALL_COMPLETE "Installation Complete"
402 + IDS_INSTALL_COMPLETE "Installation Complete. See http://www.lilypond.org/cygwin/ for support."
403 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."
406 diff -purN --exclude=configure ../setup/resource.h ./resource.h
407 --- ../setup/resource.h Fri Jun 14 12:51:55 2002
408 +++ ./resource.h Fri Jun 14 18:46:40 2002
411 #define IDB_RTARROW 119
413 -#define IDI_CYGWIN 121
414 +#define IDI_LILYPOND 121
415 #define IDD_LOCAL_DIR 122
416 #define IDB_CHECK_YES 123
417 #define IDB_CHECK_NO 124
418 #define IDB_CHECK_NA 125
419 #define IDD_FTP_AUTH 126
420 #define IDD_CHOOSER 127
421 +#define IDI_CYGWIN 128
422 #define IDC_SOURCE_DOWNLOAD 1000
423 #define IDC_SOURCE_NETINST 1001
424 #define IDC_SOURCE_CWD 1002