1 diff -purN --exclude=*~ --exclude=zlib ../cinstall/ChangeLog ./ChangeLog
2 --- ../cinstall/ChangeLog Mon Feb 18 14:56:38 2002
3 +++ ./ChangeLog Mon Feb 18 15:05:09 2002
5 +2002-01-29 Jan Nieuwenhuizen <janneke@gnu.org>
7 + * Forward port patch to cvs -D20020218.
9 + * mklink2.c: Compile fix.
11 + * desktop.cc: Remove spurious line breaks from etc_profile.
12 + (make_lily_bat): New function.
13 + (save_icon): Parametrize.
14 + (do_desktop_setup): LilyPond support; disable Cygwin support.
16 + * res.rc: Adapt for LilyPond.
18 + * ini.cc (fprintf): Cygwin -> GNU LilyPond
20 2002-02-05 Jason Tishler <jason@tishler.net>
22 * download.cc (do_download_thread): Fix off-by-one error.
23 @@ -3705,4 +3720,4 @@ Sat Apr 1 20:48:09 2000 Christopher Fa
24 * zlib/Makefile.in: Regenerate from Makefile.am
26 %%% $Id: cygwin-installer.patch,v 1.8 2002/02/19 10:29:05 fred Exp $
29 Binary files ../cinstall/LilyPond.ico and ./LilyPond.ico differ
30 diff -purN --exclude=*~ --exclude=zlib ../cinstall/Makefile.in ./Makefile.in
31 --- ../cinstall/Makefile.in Mon Feb 18 14:56:38 2002
32 +++ ./Makefile.in Mon Feb 18 15:21:39 2002
33 @@ -42,7 +42,7 @@ CC := @CC@
34 CC_FOR_TARGET := $(CC)
37 -CFLAGS := @CFLAGS@ $(MC_DEFS) -Werror -Winline -Wall -Wpointer-arith \
38 +CFLAGS := @CFLAGS@ $(MC_DEFS) -Winline -Wall -Wpointer-arith \
39 -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
40 -Wmissing-declarations -Wcomments
41 CXXFLAGS := @CXXFLAGS@ $(CFLAGS) -fno-rtti
42 diff -purN --exclude=*~ --exclude=zlib ../cinstall/desktop.cc ./desktop.cc
43 --- ../cinstall/desktop.cc Mon Feb 18 14:56:42 2002
44 +++ ./desktop.cc Mon Feb 18 15:18:17 2002
45 @@ -86,9 +86,7 @@ static const char *etc_profile[] = {
48 "export MAKE_MODE=unix",
49 - "export PS1='\\[\\033]0;\\w\\007",
50 - "\\033[32m\\]\\u@\\h \\[\\033[33m\\w\\033[0m\\]",
52 + "export PS1='\\[\\033]0;\\w\\007\\033[32m\\]\\u@\\h \\[\\033[33m\\w\\033[0m\\]$ '",
56 @@ -215,6 +213,34 @@ make_cygwin_bat ()
62 + batname = backslash (cygpath ("/lilypond.bat"));
64 + /* if the batch file exists, don't overwrite it */
65 + if (_access (batname.cstr_oneuse (), 0) == 0)
68 + FILE *bat = fopen (batname.cstr_oneuse (), "wt");
72 + fprintf (bat, "@echo off\n\n");
74 + fprintf (bat, "%.2s\n", get_root_dir ().cstr_oneuse ());
75 + fprintf (bat, "chdir %s\n\n",
76 + backslash (get_root_dir () + "/bin").cstr_oneuse ());
78 + if (_access (cygpath ("/usr/bin/rxvt").cstr_oneuse (), 0) == 0)
79 + fprintf (bat, "rxtv -e /bin/bash --login -i \n");
81 + /* fprintf (bat, "bash --rcfile /bin/lilypond-profile\n"); */
82 + fprintf (bat, "bash --login -i\n");
90 String fname = cygpath ("/etc/profile");
91 @@ -309,13 +335,13 @@ make_passwd_group ()
99 +save_icon (char const* iconfile, char const* iconres)
101 - iconname = backslash (cygpath ("/cygwin.ico"));
103 - HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE");
104 + iconname = backslash (cygpath (iconfile));
106 + HRSRC rsrc = FindResource (NULL, iconres, "FILE");
109 fatal ("FindResource failed");
110 @@ -335,12 +361,13 @@ save_icon ()
115 + save_icon ("/cygwin.ico", "CYGWIN.ICON");
119 make_passwd_group ();
124 start_menu ("Cygwin Bash Shell", batname);
125 @@ -349,6 +376,20 @@ do_desktop_setup ()
128 desktop_icon ("Cygwin", batname);
132 + save_icon ("/LilyPond.ico", "LILYPOND.ICON");
137 + start_menu ("GNU LilyPond Shell", batname);
142 + desktop_icon ("GNU LilyPond", batname);
146 diff -purN --exclude=*~ --exclude=zlib ../cinstall/ini.cc ./ini.cc
147 --- ../cinstall/ini.cc Mon Feb 18 14:56:43 2002
148 +++ ./ini.cc Mon Feb 18 15:00:16 2002
149 @@ -286,7 +286,7 @@ fprintf (FILE * f, const char *fmt, ...)
152 /*OutputDebugString (stderrbuf); */
153 - MessageBox (0, buf, "Cygwin Setup", 0);
154 + MessageBox (0, buf, "GNU LilyPond Setup", 0);
158 diff -purN --exclude=*~ --exclude=zlib ../cinstall/msg.cc ./msg.cc
159 --- ../cinstall/msg.cc Mon Feb 18 14:56:43 2002
160 +++ ./msg.cc Mon Feb 18 15:01:24 2002
161 @@ -47,7 +47,7 @@ mbox (HWND owner, const char *name, int
163 vsprintf (buf, fmt, args);
164 log (LOG_PLAIN, String ("mbox ") + name + ": " + buf);
165 - return MessageBox (owner, buf, "Cygwin Setup", type);
166 + return MessageBox (owner, buf, "GNU LilyPond Setup", type);
170 diff -purN --exclude=*~ --exclude=zlib ../cinstall/res.rc ./res.rc
171 --- ../cinstall/res.rc Mon Feb 18 14:56:43 2002
172 +++ ./res.rc Mon Feb 18 15:00:16 2002
173 @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
175 IDD_SOURCE DIALOG DISCARDABLE 0, 0, 317, 179
176 STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
177 -CAPTION "Cygwin Setup"
178 +CAPTION "GNU LilyPond Setup"
179 FONT 8, "MS Sans Serif"
181 CONTROL "&Install from Internet",IDC_SOURCE_NETINST,"Button",
182 @@ -39,7 +39,7 @@ BEGIN
183 BS_AUTORADIOBUTTON | WS_TABSTOP,101,84,115,10
184 CONTROL "Install from &Local Directory",IDC_SOURCE_CWD,"Button",
185 BS_AUTORADIOBUTTON | WS_TABSTOP,101,99,115,10
186 - ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
187 + ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
188 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
190 LTEXT "Choose A Download Source",IDC_STATIC_HEADER_TITLE,7,0,
191 @@ -50,13 +50,13 @@ END
193 IDD_LOCAL_DIR DIALOG DISCARDABLE 0, 0, 317, 179
194 STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
195 -CAPTION "Cygwin Setup"
196 +CAPTION "GNU LilyPond Setup"
197 FONT 8, "MS Sans Serif"
199 EDITTEXT IDC_LOCAL_DIR,58,83,165,15,ES_AUTOHSCROLL | WS_GROUP
200 PUSHBUTTON "B&rowse...",IDC_LOCAL_DIR_BROWSE,223,83,34,14
201 GROUPBOX "Local Package Directory",IDC_STATIC,53,67,210,45
202 - ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
203 + ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
204 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
206 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.",
207 @@ -67,7 +67,7 @@ END
209 IDD_ROOT DIALOG DISCARDABLE 0, 0, 317, 179
210 STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
211 -CAPTION "Cygwin Setup"
212 +CAPTION "GNU LilyPond Setup"
213 FONT 8, "MS Sans Serif"
215 GROUPBOX "Root Directory",IDC_STATIC,5,50,305,40,WS_TABSTOP
216 @@ -83,7 +83,7 @@ BEGIN
217 WS_GROUP | WS_TABSTOP,170,120,90,8
218 CONTROL "&Unix",IDC_ROOT_BINARY,"Button",BS_AUTORADIOBUTTON |
219 WS_TABSTOP,170,135,90,8
220 - ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20
221 + ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
222 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
224 LTEXT "Select the directory where you want to install Cygwin. Also choose a few installation parameters.",
225 @@ -96,10 +96,10 @@ IDD_SITE DIALOG DISCARDABLE 0, 0, 317, 1
226 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
227 WS_CAPTION | WS_SYSMENU
228 EXSTYLE WS_EX_CONTROLPARENT
229 -CAPTION "Cygwin Setup"
230 +CAPTION "GNU LilyPond Setup"
231 FONT 8, "MS Sans Serif"
233 - ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20
234 + ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
235 LISTBOX IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT |
236 LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP |
238 @@ -119,7 +119,7 @@ END
240 IDD_NET DIALOG DISCARDABLE 0, 0, 317, 179
241 STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
242 -CAPTION "Cygwin Setup"
243 +CAPTION "GNU LilyPond Setup"
244 FONT 8, "MS Sans Serif"
246 CONTROL "&Direct Connection",IDC_NET_DIRECT,"Button",
247 @@ -137,7 +137,7 @@ BEGIN
249 RTEXT "Por&t",IDC_STATIC,85,125,30,12,SS_CENTERIMAGE | NOT
251 - ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
252 + ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
253 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
255 LTEXT "Setup needs to know how you want it to connect to the internet. Choose the appropriate settings below.",
256 @@ -149,7 +149,7 @@ END
257 IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 317, 179
258 STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION |
260 -CAPTION "Cygwin Setup"
261 +CAPTION "GNU LilyPond Setup"
262 FONT 8, "MS Sans Serif"
264 LTEXT "Installing...",IDC_INS_ACTION,45,55,205,8,NOT WS_GROUP
265 @@ -164,7 +164,7 @@ BEGIN
266 LTEXT "Package:",IDC_INS_BL_PACKAGE,45,100,47,8,NOT WS_GROUP
267 LTEXT "Total:",IDC_INS_BL_TOTAL,45,115,48,8,NOT WS_GROUP
268 LTEXT "Disk:",IDC_INS_BL_DISK,45,130,47,8,NOT WS_GROUP
269 - ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20
270 + ICON IDI_LILYPOND,IDC_STATIC,290,0,20,20
271 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
273 LTEXT "This page displays the progress of the download or installation.",
274 @@ -175,10 +175,10 @@ END
276 IDD_PROXY_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
277 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
278 -CAPTION "Cygwin Setup"
279 +CAPTION "GNU LilyPond Setup"
280 FONT 8, "MS Sans Serif"
282 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
283 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
284 LTEXT "Proxy &User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
286 EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
287 @@ -192,10 +192,10 @@ END
289 IDD_NET_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
290 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
291 -CAPTION "Cygwin Setup"
292 +CAPTION "GNU LilyPond Setup"
293 FONT 8, "MS Sans Serif"
295 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
296 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
297 LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
299 EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
300 @@ -210,27 +210,26 @@ END
301 IDD_SPLASH DIALOG DISCARDABLE 0, 0, 317, 179
302 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
303 WS_CAPTION | WS_SYSMENU
304 -CAPTION "Cygwin Setup"
305 +CAPTION "GNU LilyPond Setup"
306 FONT 8, "MS Sans Serif"
308 - ICON IDI_CYGWIN,IDC_STATIC,113,112,21,20,WS_GROUP
309 + ICON IDI_LILYPOND,IDC_STATIC,113,100,21,20,WS_GROUP
310 CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,95,178
311 - LTEXT "Version (unknown)",IDC_VERSION,115,137,195,10
312 - LTEXT "Cygwin Net Release Setup Program",
313 + LTEXT "Version (1.4.10)",IDC_VERSION,115,137,195,10
314 + LTEXT "GNU LilyPond Setup Program",
315 IDC_STATIC_WELCOME_TITLE,115,1,195,24
316 - LTEXT "Copyright 2000, 2001 Red Hat Inc.",IDC_STATIC,115,150,
318 - LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,115,162,
320 - LTEXT "This wizard will guide you through the installation and updating of the Cygwin environment and a plethora of GNU packages.",
321 - IDC_STATIC,115,33,195,54
322 + LTEXT "Copyright (C) 2000-2002 Red Hat Inc.",
323 + IDC_STATIC,115,138,195,8
324 + LTEXT " (C) 2001 Jan Nieuwenhuizen <janneke@gnu.org>",IDC_STATIC,115,150,195,8
325 + LTEXT "http://www.lilypond.org/cygwin/",IDC_STATIC,115,162,195,8
326 + LTEXT "This wizard will guide you through the installation and updating LilyPond and all other necessary Cygwin packages.",IDC_STATIC,115,33,195,54
329 IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 430, 266
330 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
331 WS_CAPTION | WS_SYSMENU
332 EXSTYLE WS_EX_CONTROLPARENT
333 -CAPTION "Cygwin Setup"
334 +CAPTION "GNU LilyPond Setup"
335 FONT 8, "MS Sans Serif"
337 DEFPUSHBUTTON "&Next -->",IDOK,311,242,45,15,WS_GROUP
338 @@ -243,7 +242,7 @@ BEGIN
339 CONTROL "E&xp",IDC_CHOOSE_EXP,"Button",BS_AUTORADIOBUTTON,323,5,
341 PUSHBUTTON "&View",IDC_CHOOSE_VIEW,353,5,20,10,WS_GROUP
342 - ICON IDI_CYGWIN,IDC_STATIC,0,2,20,20
343 + ICON IDI_LILYPOND,IDC_STATIC,0,2,20,20
344 LTEXT "Select packages to install",IDC_CHOOSE_INST_TEXT,125,5,
346 CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT
347 @@ -257,14 +256,14 @@ END
348 IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 317, 179
349 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
350 WS_CAPTION | WS_SYSMENU
351 -CAPTION "Cygwin Setup"
352 +CAPTION "GNU LilyPond Setup"
353 FONT 8, "MS Sans Serif"
355 CONTROL "Create icon on &Desktop",IDC_ROOT_DESKTOP,"Button",
356 BS_AUTOCHECKBOX,108,78,100,8
357 CONTROL "Add icon to &Start Menu",IDC_ROOT_MENU,"Button",
358 BS_AUTOCHECKBOX,108,93,100,8
359 - ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
360 + ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
361 CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
363 LTEXT "Tell setup if you want it to create a few icons for convenient access to the Cygwin environment.",
364 @@ -275,10 +274,10 @@ END
366 IDD_FTP_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
367 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
368 -CAPTION "Cygwin Setup"
369 +CAPTION "GNU LilyPond Setup"
370 FONT 8, "MS Sans Serif"
372 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
373 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
374 LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
376 EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
377 @@ -293,7 +292,7 @@ END
378 IDD_CHOOSER DIALOG DISCARDABLE 0, 0, 247, 116
379 STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
381 -CAPTION "Cygwin Setup"
382 +CAPTION "GNU LilyPond Setup"
383 FONT 8, "MS Sans Serif"
385 CTEXT "This space intentionally left blank",IDC_STATIC,57,45,
386 @@ -336,6 +335,7 @@ END
388 // Icon with lowest ID value placed first to ensure application icon
389 // remains consistent on all systems.
390 +IDI_LILYPOND ICON DISCARDABLE "LilyPond.ico"
391 IDI_CYGWIN ICON DISCARDABLE "cygwin.ico"
393 /////////////////////////////////////////////////////////////////////////////
394 @@ -343,6 +343,7 @@ IDI_CYGWIN ICON DISCARDA
398 +LILYPOND.ICON FILE DISCARDABLE "LilyPond.ico"
399 CYGWIN.ICON FILE DISCARDABLE "cygwin.ico"
401 /////////////////////////////////////////////////////////////////////////////
402 @@ -452,7 +453,7 @@ STRINGTABLE DISCARDABLE
404 IDS_ROOT_SLASH "Warning: we recommend you do NOT use the root of your hard drive as the cygwin root. Proceed anyway?"
405 IDS_ROOT_SPACE "You should not choose a root path that include spaces in directory names. Proceed anyway?"
406 - IDS_MIRROR_LST "http://sources.redhat.com/cygwin/mirrors.lst"
407 + IDS_MIRROR_LST "http://www.lilypond.org/cygwin/mirrors.lst"
408 IDS_DIALOG_FAILED "Unable to create Dialog Box"
409 IDS_CYGWIN_FUNC_MISSING "Error: unable to find function `%s' in %s"
410 IDS_DOWNLOAD_SHORT "Download error: %s too short (%d, wanted %d)"
411 @@ -461,7 +462,7 @@ BEGIN
412 IDS_OLD_SETUPINI "This setup.ini is older than the one you used last time you installed cygwin. Proceed anyway?"
413 IDS_ERR_RENAME "Can't rename %s to %s: %s"
414 IDS_NOTHING_INSTALLED "Nothing needed to be installed"
415 - IDS_INSTALL_COMPLETE "Installation Complete"
416 + IDS_INSTALL_COMPLETE "Installation Complete. See http://www.lilypond.org/cygwin/ for support."
417 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."
420 diff -purN --exclude=*~ --exclude=zlib ../cinstall/resource.h ./resource.h
421 --- ../cinstall/resource.h Sat Jan 19 14:33:17 2002
422 +++ ./resource.h Mon Feb 18 15:00:16 2002
425 #define IDB_RTARROW 119
427 -#define IDI_CYGWIN 121
428 +#define IDI_LILYPOND 121
429 #define IDD_LOCAL_DIR 122
430 #define IDB_CHECK_YES 123
431 #define IDB_CHECK_NO 124
432 #define IDB_CHECK_NA 125
433 #define IDD_FTP_AUTH 126
434 #define IDD_CHOOSER 127
435 +#define IDI_CYGWIN 128
436 #define IDC_SOURCE_DOWNLOAD 1000
437 #define IDC_SOURCE_NETINST 1001
438 #define IDC_SOURCE_CWD 1002