1 diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/ChangeLog ./ChangeLog
2 --- ../cinstall.orig/ChangeLog Sat Dec 1 00:36:20 2001
3 +++ ./ChangeLog Sun Dec 2 17:21:40 2001
5 +2001-12-02 Jan Nieuwenhuizen <janneke@gnu.org>
7 + * configure.in (CXXFLAGS): bugfix.
9 + * mklink2.c: Compile fix.
11 + * Forward ported patch to cvs -D20011202.
13 + * Makefile.in: Fixed realclean target.
15 + * desktop.cc: Removed spurious line breaks from etc_profile.
16 + (make_lily_bat): New function.
17 + (save_icon): Parametrized.
18 + (do_desktop_setup): LilyPond support; disabled Cygwin support.
20 + * res.rc: Adapted for LilyPond.
22 + * ini.cc (fprintf): Cygwin -> GNU LilyPond
24 2001-12-01 Robert Collins <rbtcollins@hotmail.com>
26 * package_source.cc (packagesource::set_canonical): Filename was out by one.
27 @@ -2336,4 +2355,4 @@ Sat Apr 1 20:48:09 2000 Christopher Fa
28 * zlib/Makefile.in: Regenerate from Makefile.am
30 %%% $Id: ChangeLog,v 2.155 2001/11/30 23:36:20 rbcollins Exp $
32 +$Revision: 2.155.jcn1 $
33 Binary files ../cinstall.orig/LilyPond.ico and ./LilyPond.ico differ
34 diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/Makefile.in ./Makefile.in
35 --- ../cinstall.orig/Makefile.in Fri Nov 30 13:25:00 2001
36 +++ ./Makefile.in Sun Dec 2 17:38:37 2001
37 @@ -35,7 +35,7 @@ CC := @CC@
38 CC_FOR_TARGET := $(CC)
41 -CFLAGS := @CFLAGS@ -Werror -Winline -Wall -Wpointer-arith -Wcast-align\
42 +CFLAGS := @CFLAGS@ -Winline -Wall -Wpointer-arith -Wcast-align\
43 -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
44 -Wmissing-declarations -Wcomments
45 CXXFLAGS := @CXXFLAGS@ $(CFLAGS) -fno-exceptions -fno-rtti
46 @@ -167,7 +167,9 @@ clean:
50 - rm -f Makefile config.cache
51 + rm -f Makefile *.d version.c
52 + rm -f config.cache config.log config.status
53 + $(MAKE) -C zlib realclean
56 $(SHELL) $(updir1)/mkinstalldirs $(bindir) $(etcdir)
57 diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/configure.in ./configure.in
58 --- ../cinstall.orig/configure.in Mon Dec 11 01:07:56 2000
59 +++ ./configure.in Sun Dec 2 17:23:33 2001
60 @@ -64,7 +64,7 @@ if test -z "$CXX"; then
61 test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
69 diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/desktop.cc ./desktop.cc
70 --- ../cinstall.orig/desktop.cc Thu Nov 29 10:52:32 2001
71 +++ ./desktop.cc Sun Dec 2 17:00:31 2001
72 @@ -81,9 +81,7 @@ static const char *etc_profile[] = {
75 "export MAKE_MODE=unix",
76 - "export PS1='\\[\\033]0;\\w\\007",
77 - "\\033[32m\\]\\u@\\h \\[\\033[33m\\w\\033[0m\\]",
79 + "export PS1='\\[\\033]0;\\w\\007\\033[32m\\]\\u@\\h \\[\\033[33m\\w\\033[0m\\]$ '",
83 @@ -204,6 +202,34 @@ make_cygwin_bat ()
89 + batname = backslash (concat (get_root_dir (), "/lilypond.bat", 0));
91 + /* if the batch file exists, don't overwrite it */
92 + if (_access (batname, 0) == 0)
95 + FILE *bat = fopen (batname, "wt");
99 + fprintf (bat, "@echo off\n\n");
101 + fprintf (bat, "%.2s\n", get_root_dir ());
102 + fprintf (bat, "chdir %s\n\n",
103 + backslash (concat (get_root_dir () + 2, "/bin", 0)));
105 + /* fprintf (bat, "bash --rcfile /bin/lilypond-profile\n"); */
106 + fprintf (bat, "bash --login -i\n");
110 + if (_access ("/usr/bin/rxvt", 0) == 0)
111 + batname = backslash (concat (get_root_dir (), "/usr/bin/rxvt", 0));
117 char *fname = cygpath ("/etc/profile", 0);
118 @@ -301,11 +327,11 @@ out:
123 +save_icon (char const* iconfile, char const* iconres)
125 - iconname = backslash (cygpath ("/cygwin.ico", 0));
127 - HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE");
128 + iconname = backslash (concat (get_root_dir (), iconfile, 0));
130 + HRSRC rsrc = FindResource (NULL, iconres, "FILE");
133 fatal ("FindResource failed");
134 @@ -325,12 +351,13 @@ save_icon ()
139 + save_icon ("/cygwin.ico", "CYGWIN.ICON");
143 make_passwd_group ();
148 start_menu ("Cygwin Bash Shell", batname);
149 @@ -339,6 +366,20 @@ do_desktop_setup ()
152 desktop_icon ("Cygwin", batname);
156 + save_icon ("/LilyPond.ico", "LILYPOND.ICON");
161 + start_menu ("GNU LilyPond Shell", batname);
166 + desktop_icon ("GNU LilyPond", batname);
170 diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/ini.cc ./ini.cc
171 --- ../cinstall.orig/ini.cc Thu Nov 29 10:52:32 2001
172 +++ ./ini.cc Sun Dec 2 16:11:25 2001
173 @@ -187,7 +187,7 @@ fprintf (FILE * f, const char *fmt, ...)
176 /*OutputDebugString (stderrbuf); */
177 - MessageBox (0, buf, "Cygwin Setup", 0);
178 + MessageBox (0, buf, "GNU LilyPond Cygwin Setup", 0);
182 diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/mklink2.c ./mklink2.c
183 --- ../cinstall.orig/mklink2.c Tue Nov 13 02:49:32 2001
184 +++ ./mklink2.c Sun Dec 2 17:09:31 2001
192 diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/msg.cc ./msg.cc
193 --- ../cinstall.orig/msg.cc Tue Nov 13 02:49:32 2001
194 +++ ./msg.cc Sun Dec 2 15:42:13 2001
195 @@ -47,7 +47,7 @@ mbox (const char *name, int type, int id
197 vsprintf (buf, fmt, args);
198 log (0, "mbox %s: %s", name, buf);
199 - return MessageBox (0, buf, "Cygwin Setup", type | MB_TOPMOST);
200 + return MessageBox (0, buf, "GNU LilyPond Cygwin Setup", type | MB_TOPMOST);
204 diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/res.rc ./res.rc
205 --- ../cinstall.orig/res.rc Wed Nov 14 01:11:35 2001
206 +++ ./res.rc Sun Dec 2 15:50:36 2001
207 @@ -30,10 +30,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
209 IDD_SOURCE DIALOG DISCARDABLE 0, 0, 215, 95
210 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
211 -CAPTION "Cygwin Setup"
212 +CAPTION "GNU LilyPond Setup"
213 FONT 8, "MS Sans Serif"
215 - ICON IDI_CYGWIN,-1,5,5,20,20
216 + ICON IDI_LILYPOND,-1,5,5,20,20
217 CONTROL "&Install from Internet",IDC_SOURCE_NETINST,"Button",
218 BS_AUTORADIOBUTTON,55,15,75,10
219 CONTROL "&Download from Internet",IDC_SOURCE_DOWNLOAD,"Button",
220 @@ -46,10 +46,10 @@ END
222 IDD_LOCAL_DIR DIALOG DISCARDABLE 0, 0, 215, 95
223 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
224 -CAPTION "Cygwin Setup"
225 +CAPTION "GNU LilyPond Setup"
226 FONT 8, "MS Sans Serif"
228 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
229 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
230 PUSHBUTTON "B&rowse...",IDC_LOCAL_DIR_BROWSE,150,10,34,14
231 LTEXT "Local Package &Directory",IDC_STATIC,55,15,85,11
232 EDITTEXT IDC_LOCAL_DIR,55,25,127,12,ES_AUTOHSCROLL
233 @@ -60,10 +60,10 @@ END
235 IDD_ROOT DIALOG DISCARDABLE 0, 0, 215, 95
236 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
237 -CAPTION "Cygwin Setup"
238 +CAPTION "GNU LilyPond Setup"
239 FONT 8, "MS Sans Serif"
241 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
242 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
243 PUSHBUTTON "B&rowse...",IDC_ROOT_BROWSE,150,10,34,14
244 LTEXT "Select install root &directory",IDC_STATIC,55,15,85,11
245 EDITTEXT IDC_ROOT_DIR,55,25,127,12,ES_AUTOHSCROLL
246 @@ -84,10 +84,10 @@ END
248 IDD_SITE DIALOG DISCARDABLE 0, 0, 222, 206
249 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
250 -CAPTION "Cygwin Setup"
251 +CAPTION "GNU LilyPond Setup"
252 FONT 8, "MS Sans Serif"
254 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
255 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
256 LTEXT "Select Download &Site",IDC_STATIC,55,5,135,11
257 LISTBOX IDC_URL_LIST,55,20,160,155,LBS_NOINTEGRALHEIGHT |
258 WS_VSCROLL | WS_HSCROLL | WS_TABSTOP
259 @@ -98,10 +98,10 @@ END
261 IDD_OTHER_URL DIALOG DISCARDABLE 0, 0, 215, 95
262 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
263 -CAPTION "Cygwin Setup"
264 +CAPTION "GNU LilyPond Setup"
265 FONT 8, "MS Sans Serif"
267 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
268 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
269 LTEXT "Select &URL to download from",IDC_STATIC,55,15,135,11
270 EDITTEXT IDC_OTHER_URL,55,25,127,12,ES_AUTOHSCROLL
271 DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
272 @@ -111,10 +111,10 @@ END
274 IDD_NET DIALOGEX 0, 0, 215, 95
275 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
276 -CAPTION "Cygwin Setup"
277 +CAPTION "GNU LilyPond Setup"
278 FONT 8, "MS Sans Serif"
280 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
281 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
282 CONTROL "&Direct Connection",IDC_NET_DIRECT,"Button",
283 BS_AUTORADIOBUTTON,55,10,73,10
284 CONTROL "Use &IE5 Settings",IDC_NET_IE5,"Button",
285 @@ -135,10 +135,10 @@ END
286 IDD_DLSTATUS DIALOG DISCARDABLE 0, 0, 215, 95
287 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE |
288 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 PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
296 LTEXT "Downloading...",IDC_STATIC,55,5,135,8
297 LTEXT "(URL)",IDC_DLS_URL,55,15,150,8
298 @@ -157,10 +157,10 @@ END
299 IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 215, 95
300 STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE |
301 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 PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
309 LTEXT "Installing...",IDC_INS_ACTION,55,5,135,8
310 LTEXT "(PKG)",IDC_INS_PKG,55,15,150,8
311 @@ -178,10 +178,10 @@ END
313 IDD_PROXY_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
314 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
315 -CAPTION "Cygwin Setup"
316 +CAPTION "GNU LilyPond Setup"
317 FONT 8, "MS Sans Serif"
319 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
320 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
321 LTEXT "Proxy &User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
323 EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
324 @@ -195,10 +195,10 @@ END
326 IDD_NET_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
327 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
328 -CAPTION "Cygwin Setup"
329 +CAPTION "GNU LilyPond Setup"
330 FONT 8, "MS Sans Serif"
332 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
333 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
334 LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
336 EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
337 @@ -212,17 +212,14 @@ END
339 IDD_SPLASH DIALOG DISCARDABLE 0, 0, 215, 95
340 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
341 -CAPTION "Cygwin Setup"
342 +CAPTION "GNU LilyPond Setup"
343 FONT 8, "MS Sans Serif"
345 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
346 - LTEXT "Cygwin Net Release Setup Program",IDC_STATIC,55,10,114,
348 - LTEXT "Version (unknown)",IDC_VERSION,55,25,120,10
349 - LTEXT "Copyright 2000, 2001 Red Hat Inc.",IDC_STATIC,55,35,120,
351 - LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,55,50,112,
353 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
354 + LTEXT "GNU LilyPond Setup Program",IDC_STATIC,55,10,114,8
355 + LTEXT "Version 1.4.9",IDC_VERSION,55,25,120,10
356 + LTEXT "Copyright (C) 2000-2001 Red Hat Inc",IDC_STATIC,55,35,135,8
357 + LTEXT " (C) 2001 Jan Nieuwenhuizen <janneke@gnu.org>",IDC_STATIC,55,45,135,8
358 DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15
359 PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
361 @@ -230,10 +227,10 @@ END
362 IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 429, 266
363 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION |
365 -CAPTION "Cygwin Setup"
366 +CAPTION "GNU LilyPond Setup"
367 FONT 8, "MS Sans Serif"
369 - ICON IDI_CYGWIN,IDC_STATIC,0,2,21,20
370 + ICON IDI_LILYPOND,IDC_STATIC,0,2,21,20
371 LTEXT "Select packages to install",IDC_CHOOSE_INST_TEXT,125,5,
373 CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT
374 @@ -256,10 +253,10 @@ END
376 IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 215, 95
377 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
378 -CAPTION "Cygwin Setup"
379 +CAPTION "GNU LilyPond Setup"
380 FONT 8, "MS Sans Serif"
382 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
383 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
384 CONTROL "Create Desktop &Icon",IDC_ROOT_DESKTOP,"Button",
385 BS_AUTOCHECKBOX,55,25,100,8
386 CONTROL "Add to &Start Menu",IDC_ROOT_MENU,"Button",
387 @@ -271,10 +268,10 @@ END
389 IDD_FTP_AUTH DIALOGEX 0, 0, 215, 95
390 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
391 -CAPTION "Cygwin Setup"
392 +CAPTION "GNU LilyPond Setup"
393 FONT 8, "MS Sans Serif"
395 - ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
396 + ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
397 LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
399 EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
400 @@ -322,6 +319,7 @@ END
402 // Icon with lowest ID value placed first to ensure application icon
403 // remains consistent on all systems.
404 +IDI_LILYPOND ICON DISCARDABLE "LilyPond.ico"
405 IDI_CYGWIN ICON DISCARDABLE "cygwin.ico"
407 /////////////////////////////////////////////////////////////////////////////
408 @@ -329,6 +327,7 @@ IDI_CYGWIN ICON DISCARDA
412 +LILYPOND.ICON FILE DISCARDABLE "LilyPond.ico"
413 CYGWIN.ICON FILE DISCARDABLE "cygwin.ico"
415 /////////////////////////////////////////////////////////////////////////////
416 @@ -383,7 +382,8 @@ STRINGTABLE DISCARDABLE
418 IDS_ROOT_SLASH "Warning: we recommend you do NOT use the root of your hard drive as the cygwin root. Proceed anyway?"
419 IDS_ROOT_SPACE "You should not choose a root path that include spaces in directory names. Proceed anyway?"
420 - IDS_MIRROR_LST "http://sources.redhat.com/cygwin/mirrors.lst"
421 + // IDS_MIRROR_LST "http://appel.lilypond.org/lilypond/gnu-windows/mirrors.lst"
422 + IDS_MIRROR_LST "http://www.lilypond.org/gnu-windows/mirrors.lst"
423 IDS_DIALOG_FAILED "Unable to create Dialog Box"
424 IDS_CYGWIN_FUNC_MISSING "Error: unable to find function `%s' in %s"
425 IDS_DOWNLOAD_SHORT "Download error: %s too short (%d, wanted %d)"
426 diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/resource.h ./resource.h
427 --- ../cinstall.orig/resource.h Sat Jun 30 03:37:55 2001
428 +++ ./resource.h Sun Dec 2 15:45:18 2001
431 #define IDB_RTARROW 119
433 -#define IDI_CYGWIN 121
434 +#define IDI_LILYPOND 121
435 #define IDD_LOCAL_DIR 122
436 #define IDB_CHECK_YES 123
437 #define IDB_CHECK_NO 124
438 #define IDB_CHECK_NA 125
439 #define IDD_FTP_AUTH 126
440 +#define IDI_CYGWIN 127
441 #define IDC_SOURCE_DOWNLOAD 1000
442 #define IDC_SOURCE_NETINST 1001
443 #define IDC_SOURCE_CWD 1002