1 Binary files ../cinstall/LilyPond.ico and ./LilyPond.ico differ
2 diff -urN ../cinstall/Makefile.in ./Makefile.in
3 --- ../cinstall/Makefile.in Thu Feb 8 05:55:22 2001
4 +++ ./Makefile.in Sun Apr 8 19:54:54 2001
9 - rm -f *.o *.rc $(PROGS)
14 rm -f Makefile config.cache
15 + rm -f inilex.c iniparse.c iniparse.h version.c config.log config.status *.d
21 $(SHELL) $(updir1)/mkinstalldirs $(bindir) $(etcdir)
22 diff -urN ../cinstall/desktop.cc ./desktop.cc
23 --- ../cinstall/desktop.cc Sat Nov 11 05:55:16 2000
24 +++ ./desktop.cc Sun Apr 8 21:52:48 2001
29 + "PATH=\"/usr/lilypond/bin:$PATH\"",
30 + "if [ ! -e \"/usr/lilypond\" ]; then",
31 + " ln -s `tail -1 /usr/lilypond-*` /usr/lilypond",
34 "test -f ./.bashrc && . ./.bashrc",
43 + batname = backslash (concat (root_dir, "/lilypond.bat", 0));
45 + /* if the batch file exists, don't overwrite it */
46 + if (_access (batname, 0) == 0)
49 + FILE *bat = fopen (batname, "wt");
53 + fprintf (bat, "@echo off\n\n");
55 + fprintf (bat, "%.2s\n", root_dir);
56 + fprintf (bat, "chdir %s\n\n", backslash (concat (root_dir+2, "/bin", 0)));
58 + /* fprintf (bat, "bash --rcfile /bin/lilypond-profile\n"); */
59 + fprintf (bat, "bash --login -i\n");
67 char *fname = concat (root_dir, "/etc/profile", 0);
73 +save_icon (char* iconfile, char* iconres)
75 - iconname = backslash (concat (root_dir, "/cygwin.ico", 0));
76 + iconname = backslash (concat (root_dir, iconfile, 0));
78 - HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE");
79 + HRSRC rsrc = FindResource (NULL, iconres, "FILE");
82 fatal ("FindResource failed");
88 + save_icon ("/cygwin.ico", "CYGWIN.ICON");
95 desktop_icon ("Cygwin", batname);
98 + save_icon ("/LilyPond.ico", "LILYPOND.ICON");
102 + start_menu ("GNU LilyPond Shell", batname);
105 + if (root_desktop) {
106 + desktop_icon ("GNU LilyPond", batname);
110 diff -urN ../cinstall/ini.cc ./ini.cc
111 --- ../cinstall/ini.cc Thu Oct 5 05:55:27 2000
112 +++ ./ini.cc Sun Apr 8 21:52:03 2001
116 /*OutputDebugString (stderrbuf);*/
117 - MessageBox (0, buf, "Cygwin Setup", 0);
118 + MessageBox (0, buf, "GNU LilyPond Cygwin Setup", 0);
122 diff -urN ../cinstall/msg.cc ./msg.cc
123 --- ../cinstall/msg.cc Sat Aug 26 05:55:14 2000
124 +++ ./msg.cc Sun Apr 8 21:51:56 2001
127 vsprintf (buf, fmt, args);
128 log (0, "mbox %s: %s", name, buf);
129 - return MessageBox (0, buf, "Cygwin Setup", type | MB_TOPMOST);
130 + return MessageBox (0, buf, "GNU LilyPond Cygwin Setup", type | MB_TOPMOST);
134 diff -urN ../cinstall/res.rc ./res.rc
135 --- ../cinstall/res.rc Wed Mar 7 18:13:31 2001
136 +++ ./res.rc Sun Apr 8 19:48:40 2001
139 IDD_SOURCE DIALOG DISCARDABLE 0, 0, 215, 95
140 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
141 -CAPTION "Cygwin Setup"
142 +CAPTION "GNU LilyPond Setup"
143 FONT 8, "MS Sans Serif"
145 - ICON IDI_CYGWIN,-1,5,5,20,20
146 + ICON IDI_LILYPOND,-1,5,5,20,20
147 CONTROL "&Download from Internet",IDC_SOURCE_DOWNLOAD,"Button",
148 BS_AUTORADIOBUTTON,55,15,152,10
149 CONTROL "&Install from Internet",IDC_SOURCE_NETINST,"Button",
151 CAPTION "Local package directory"
152 FONT 8, "MS Sans Serif"
154 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
155 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
156 PUSHBUTTON "B&rowse...",IDC_LOCAL_DIR_BROWSE,150,10,34,14
157 LTEXT "Local Package &Directory",IDC_STATIC,55,15,85,11
158 EDITTEXT IDC_LOCAL_DIR,55,25,127,12,ES_AUTOHSCROLL
161 IDD_ROOT DIALOG DISCARDABLE 0, 0, 215, 95
162 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
163 -CAPTION "Cygwin Setup"
164 +CAPTION "GNU LilyPond Setup"
165 FONT 8, "MS Sans Serif"
167 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
168 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
169 PUSHBUTTON "B&rowse...",IDC_ROOT_BROWSE,150,10,34,14
170 LTEXT "Select install root &directory",IDC_STATIC,55,15,85,11
171 EDITTEXT IDC_ROOT_DIR,55,25,127,12,ES_AUTOHSCROLL
174 IDD_SITE DIALOG DISCARDABLE 0, 0, 222, 206
175 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
176 -CAPTION "Cygwin Setup"
177 +CAPTION "GNU LilyPond Setup"
178 FONT 8, "MS Sans Serif"
180 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
181 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
182 LTEXT "Select Download &Site",IDC_STATIC,55,5,135,11
183 LISTBOX IDC_URL_LIST,55,20,160,155,LBS_NOINTEGRALHEIGHT |
184 WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
187 IDD_OTHER_URL DIALOG DISCARDABLE 0, 0, 215, 95
188 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
189 -CAPTION "Cygwin Setup"
190 +CAPTION "GNU LilyPond Setup"
191 FONT 8, "MS Sans Serif"
193 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
194 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
195 LTEXT "Select &URL to download from",IDC_STATIC,55,15,135,11
196 EDITTEXT IDC_OTHER_URL,55,25,127,12,ES_AUTOHSCROLL
197 DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
198 @@ -111,10 +111,10 @@
200 IDD_NET DIALOG DISCARDABLE 0, 0, 215, 95
201 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
202 -CAPTION "Cygwin Setup"
203 +CAPTION "GNU LilyPond Setup"
204 FONT 8, "MS Sans Serif"
206 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
207 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
208 CONTROL "Use &IE5 Settings",IDC_NET_IE5,"Button",
209 BS_AUTORADIOBUTTON,55,10,69,10
210 CONTROL "&Direct Connection",IDC_NET_DIRECT,"Button",
211 @@ -135,10 +135,10 @@
212 IDD_DLSTATUS DIALOG DISCARDABLE 0, 0, 215, 95
213 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE |
214 WS_CAPTION | WS_SYSMENU
215 -CAPTION "Cygwin Setup"
216 +CAPTION "GNU LilyPond Setup"
217 FONT 8, "MS Sans Serif"
219 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
220 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
221 PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
222 LTEXT "Downloading...",IDC_STATIC,55,5,135,8
223 LTEXT "(URL)",IDC_DLS_URL,55,15,150,8
224 @@ -157,10 +157,10 @@
225 IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 215, 95
226 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE |
227 WS_CAPTION | WS_SYSMENU
228 -CAPTION "Cygwin Setup"
229 +CAPTION "GNU LilyPond Setup"
230 FONT 8, "MS Sans Serif"
232 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
233 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
234 PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
235 LTEXT "Installing...",IDC_INS_ACTION,55,5,135,8
236 LTEXT "(PKG)",IDC_INS_PKG,55,15,150,8
237 @@ -178,10 +178,10 @@
239 IDD_PROXY_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
240 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
241 -CAPTION "Cygwin Setup"
242 +CAPTION "GNU LilyPond Setup"
243 FONT 8, "MS Sans Serif"
245 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
246 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
247 LTEXT "Proxy &User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
249 EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
250 @@ -195,10 +195,10 @@
252 IDD_NET_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
253 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
254 -CAPTION "Cygwin Setup"
255 +CAPTION "GNU LilyPond Setup"
256 FONT 8, "MS Sans Serif"
258 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
259 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
260 LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
262 EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
263 @@ -212,26 +212,25 @@
265 IDD_SPLASH DIALOG DISCARDABLE 0, 0, 215, 95
266 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
267 -CAPTION "Cygwin Setup"
268 +CAPTION "GNU LilyPond Setup"
269 FONT 8, "MS Sans Serif"
271 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
272 - LTEXT "Cygwin Net Release Setup Program",IDC_STATIC,55,10,114,
273 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
274 + LTEXT "GNU LilyPond GNU LilyPond Setup Program",IDC_STATIC,55,10,114,
276 - LTEXT "Version (unknown)",IDC_VERSION,55,25,120,10
277 - LTEXT "Copyright (C) 2000 Red Hat Inc",IDC_STATIC,55,35,135,8
278 - LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,55,50,150,
280 + LTEXT "Version (1.4pre)",IDC_VERSION,55,25,120,10
281 + LTEXT "Copyright (C) 2000-2001 Red Hat Inc",IDC_STATIC,55,35,135,8
282 + LTEXT " (C) 2001 Jan Nieuwenhuizen <janneke@gnu.org>",IDC_STATIC,55,45,135,8
283 DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
284 PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
287 IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 292, 206
288 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
289 -CAPTION "Cygwin Setup"
290 +CAPTION "GNU LilyPond Setup"
291 FONT 8, "MS Sans Serif"
293 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
294 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
295 LTEXT "Select packages to install",IDC_STATIC,55,5,85,8
296 CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT
297 WS_VISIBLE,55,15,230,155
298 @@ -249,10 +248,10 @@
300 IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 215, 95
301 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
302 -CAPTION "Cygwin Setup"
303 +CAPTION "GNU LilyPond Setup"
304 FONT 8, "MS Sans Serif"
306 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
307 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
308 CONTROL "Create Desktop &Icon",IDC_ROOT_DESKTOP,"Button",
309 BS_AUTOCHECKBOX,55,25,100,8
310 CONTROL "Add to &Start Menu",IDC_ROOT_MENU,"Button",
313 // Icon with lowest ID value placed first to ensure application icon
314 // remains consistent on all systems.
315 +IDI_LILYPOND ICON DISCARDABLE "LilyPond.ico"
316 IDI_CYGWIN ICON DISCARDABLE "cygwin.ico"
318 /////////////////////////////////////////////////////////////////////////////
323 +LILYPOND.ICON FILE DISCARDABLE "LilyPond.ico"
324 CYGWIN.ICON FILE DISCARDABLE "cygwin.ico"
326 /////////////////////////////////////////////////////////////////////////////
329 IDS_ROOT_SLASH "Warning: we recommend you do NOT use the root of your hard drive as the cygwin root. Proceed anyway?"
330 IDS_ROOT_SPACE "You should not choose a root path that include spaces in directory names. Proceed anyway?"
331 - IDS_MIRROR_LST "http://sources.redhat.com/cygwin/mirrors.lst"
332 + IDS_MIRROR_LST "http://appel.lilypond.org/lilypond/gnu-windows/mirrors.lst"
333 IDS_DIALOG_FAILED "Unable to create Dialog Box"
334 IDS_CYGWIN_FUNC_MISSING "Error: unable to find function `%s' in %s"
335 IDS_DOWNLOAD_SHORT "Download error: %s too short (%d, wanted %d)"
336 diff -urN ../cinstall/resource.h ./resource.h
337 --- ../cinstall/resource.h Thu Mar 1 05:55:20 2001
338 +++ ./resource.h Sun Apr 8 16:38:11 2001
341 #define IDB_RTARROW 119
343 -#define IDI_CYGWIN 121
344 +#define IDI_LILYPOND 121
345 #define IDD_LOCAL_DIR 122
346 #define IDB_CHECK_YES 123
347 #define IDB_CHECK_NO 124
348 #define IDB_CHECK_NA 125
349 +#define IDI_CYGWIN 126
350 #define IDC_SOURCE_DOWNLOAD 1000
351 #define IDC_SOURCE_NETINST 1001
352 #define IDC_SOURCE_CWD 1002