-Binary files ../cinstall/LilyPond.ico and ./LilyPond.ico differ
-diff -purN ../cinstall/Makefile.in ./Makefile.in
---- ../cinstall/Makefile.in Fri Jun 1 05:56:01 2001
-+++ ./Makefile.in Thu Sep 13 21:38:27 2001
-@@ -135,8 +135,9 @@ clean:
+diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/ChangeLog ./ChangeLog
+--- ../cinstall.orig/ChangeLog Sat Dec 1 00:36:20 2001
++++ ./ChangeLog Sun Dec 2 17:21:40 2001
+@@ -1,3 +1,22 @@
++2001-12-02 Jan Nieuwenhuizen <janneke@gnu.org>
++
++ * configure.in (CXXFLAGS): bugfix.
++
++ * mklink2.c: Compile fix.
++
++ * Forward ported patch to cvs -D20011202.
++
++ * Makefile.in: Fixed realclean target.
++
++ * desktop.cc: Removed spurious line breaks from etc_profile.
++ (make_lily_bat): New function.
++ (save_icon): Parametrized.
++ (do_desktop_setup): LilyPond support; disabled Cygwin support.
++
++ * res.rc: Adapted for LilyPond.
++
++ * ini.cc (fprintf): Cygwin -> GNU LilyPond
++
+ 2001-12-01 Robert Collins <rbtcollins@hotmail.com>
+
+ * package_source.cc (packagesource::set_canonical): Filename was out by one.
+@@ -2336,4 +2355,4 @@ Sat Apr 1 20:48:09 2000 Christopher Fa
+ * zlib/Makefile.in: Regenerate from Makefile.am
+
+ %%% $Id: cygwin-installer.patch,v 1.6 2001/12/05 13:53:28 fred Exp $
+-$Revision: 1.6 $
++$Revision: 1.6 $
+Binary files ../cinstall.orig/LilyPond.ico and ./LilyPond.ico differ
+diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/Makefile.in ./Makefile.in
+--- ../cinstall.orig/Makefile.in Fri Nov 30 13:25:00 2001
++++ ./Makefile.in Sun Dec 2 17:38:37 2001
+@@ -35,7 +35,7 @@ CC := @CC@
+ CC_FOR_TARGET := $(CC)
+ CXX := @CXX@
+
+-CFLAGS := @CFLAGS@ -Werror -Winline -Wall -Wpointer-arith -Wcast-align\
++CFLAGS := @CFLAGS@ -Winline -Wall -Wpointer-arith -Wcast-align\
+ -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \
+ -Wmissing-declarations -Wcomments
+ CXXFLAGS := @CXXFLAGS@ $(CFLAGS) -fno-exceptions -fno-rtti
+@@ -167,7 +167,9 @@ clean:
$(MAKE) -C zlib clean
realclean: clean
- rm -f Makefile config.cache
--
-+ rm -f Makefile *.d
-+ rm -f config.cache config.log config.status
-+
++ rm -f Makefile *.d version.c
++ rm -f config.cache config.log config.status
++ $(MAKE) -C zlib realclean
+
install: all
$(SHELL) $(updir1)/mkinstalldirs $(bindir) $(etcdir)
- for i in $(PROGS) ; do \
-diff -purN ../cinstall/desktop.cc ./desktop.cc
---- ../cinstall/desktop.cc Tue Aug 14 05:55:37 2001
-+++ ./desktop.cc Thu Sep 13 21:37:38 2001
-@@ -76,9 +76,7 @@ static char *etc_profile[] = {
+diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/configure.in ./configure.in
+--- ../cinstall.orig/configure.in Mon Dec 11 01:07:56 2000
++++ ./configure.in Sun Dec 2 17:23:33 2001
+@@ -64,7 +64,7 @@ if test -z "$CXX"; then
+ test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
+ fi
+
+-CXXFLAGS='$(CFLAGS)'
++CXXFLAGS="$CFLAGS"
+ ])
+
+ AC_CANONICAL_SYSTEM
+diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/desktop.cc ./desktop.cc
+--- ../cinstall.orig/desktop.cc Thu Nov 29 10:52:32 2001
++++ ./desktop.cc Sun Dec 2 17:00:31 2001
+@@ -81,9 +81,7 @@ static const char *etc_profile[] = {
"done",
"",
"export MAKE_MODE=unix",
"",
"cd \"$HOME\"",
"",
-@@ -194,6 +192,30 @@ make_cygwin_bat ()
+@@ -204,6 +202,34 @@ make_cygwin_bat ()
}
static void
+ fprintf (bat, "@echo off\n\n");
+
+ fprintf (bat, "%.2s\n", get_root_dir ());
-+ fprintf (bat, "chdir %s\n\n", backslash (concat (get_root_dir ()+2, "/bin", 0)));
++ fprintf (bat, "chdir %s\n\n",
++ backslash (concat (get_root_dir () + 2, "/bin", 0)));
+
+ /* fprintf (bat, "bash --rcfile /bin/lilypond-profile\n"); */
+ fprintf (bat, "bash --login -i\n");
+
+ fclose (bat);
++
++ if (_access ("/usr/bin/rxvt", 0) == 0)
++ batname = backslash (concat (get_root_dir (), "/usr/bin/rxvt", 0));
+}
+
+static void
make_etc_profile ()
{
char *fname = cygpath ("/etc/profile", 0);
-@@ -290,9 +312,9 @@ make_passwd_group ()
+@@ -301,11 +327,11 @@ out:
}
static void
-save_icon ()
-+save_icon (char* iconfile, char* iconres)
++save_icon (char const* iconfile, char const* iconres)
{
- iconname = backslash (cygpath ("/cygwin.ico", 0));
+-
+- HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE");
+ iconname = backslash (concat (get_root_dir (), iconfile, 0));
-
- HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE");
++
++ HRSRC rsrc = FindResource (NULL, iconres, "FILE");
if (rsrc == NULL)
-@@ -314,7 +336,7 @@ save_icon ()
+ {
+ fatal ("FindResource failed");
+@@ -325,12 +351,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 ();
-@@ -326,6 +348,17 @@ do_desktop_setup()
+ make_passwd_group ();
- if (root_desktop) {
- desktop_icon ("Cygwin", batname);
-+ }
-+
++#if 0
+ if (root_menu)
+ {
+ start_menu ("Cygwin Bash Shell", batname);
+@@ -339,6 +366,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 -purN ../cinstall/ini.cc ./ini.cc
---- ../cinstall/ini.cc Thu Jun 14 05:55:26 2001
-+++ ./ini.cc Thu Sep 13 21:27:48 2001
-@@ -175,7 +175,7 @@ fprintf (FILE *f, const char *fmt, ...)
+diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/ini.cc ./ini.cc
+--- ../cinstall.orig/ini.cc Thu Nov 29 10:52:32 2001
++++ ./ini.cc Sun Dec 2 16:11:25 2001
+@@ -187,7 +187,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 Cygwin Setup", 0);
stderrbuf[0] = 0;
}
-diff -purN ../cinstall/msg.cc ./msg.cc
---- ../cinstall/msg.cc Sat Aug 26 05:55:14 2000
-+++ ./msg.cc Thu Sep 13 21:27:48 2001
-@@ -44,7 +44,7 @@ mbox (char *name, int type, int id, va_l
+diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/mklink2.c ./mklink2.c
+--- ../cinstall.orig/mklink2.c Tue Nov 13 02:49:32 2001
++++ ./mklink2.c Sun Dec 2 17:09:31 2001
+@@ -1,5 +1,5 @@
+-#include <stdlib.h>
+ #include "win32.h"
++#include <stdlib.h>
+ #include "shlobj.h"
+ #include "mklink2.h"
+
+diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/msg.cc ./msg.cc
+--- ../cinstall.orig/msg.cc Tue Nov 13 02:49:32 2001
++++ ./msg.cc Sun Dec 2 15:42:13 2001
+@@ -47,7 +47,7 @@ mbox (const char *name, int type, int id
vsprintf (buf, fmt, args);
log (0, "mbox %s: %s", name, buf);
}
void
-diff -purN ../cinstall/res.rc ./res.rc
---- ../cinstall/res.rc Thu Jul 5 05:55:22 2001
-+++ ./res.rc Thu Sep 13 21:36:25 2001
+diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/res.rc ./res.rc
+--- ../cinstall.orig/res.rc Wed Nov 14 01:11:35 2001
++++ ./res.rc Sun Dec 2 15:50:36 2001
@@ -30,10 +30,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
IDD_SOURCE DIALOG DISCARDABLE 0, 0, 215, 95
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,27 +212,25 @@ END
+@@ -212,17 +212,14 @@ END
IDD_SPLASH DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
- LTEXT "Cygwin Net Release Setup Program",IDC_STATIC,55,10,114,
- 8
- LTEXT "Version (unknown)",IDC_VERSION,55,25,120,10
-- LTEXT "Copyright 2000, 2001 Red Hat Inc.",IDC_STATIC,55,35,
-- 120,8
+- LTEXT "Copyright 2000, 2001 Red Hat Inc.",IDC_STATIC,55,35,120,
+- 8
- LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,55,50,112,
+- 8
+ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
-+ LTEXT "GNU LilyPond GNU LilyPond Setup Program",IDC_STATIC,55,10,114,
- 8
-+ LTEXT "Version (1.5)",IDC_VERSION,55,25,120,10
++ LTEXT "GNU LilyPond Setup Program",IDC_STATIC,55,10,114,8
++ LTEXT "Version 1.4.9",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
END
-
- IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 430, 207
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+@@ -230,10 +227,10 @@ END
+ IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 429, 266
+ STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
-CAPTION "Cygwin Setup"
+CAPTION "GNU LilyPond Setup"
FONT 8, "MS Sans Serif"
BEGIN
-- ICON IDI_CYGWIN,IDC_STATIC,5,5,21,20
-+ ICON IDI_LILYPOND,IDC_STATIC,5,5,21,20
- LTEXT "Select packages to install",IDC_CHOOSE_INST_TEXT,55,5,
+- ICON IDI_CYGWIN,IDC_STATIC,0,2,21,20
++ ICON IDI_LILYPOND,IDC_STATIC,0,2,21,20
+ LTEXT "Select packages to install",IDC_CHOOSE_INST_TEXT,125,5,
99,8
CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT
-@@ -255,10 +253,10 @@ END
+@@ -256,10 +253,10 @@ END
IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 215, 95
STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
CONTROL "Create Desktop &Icon",IDC_ROOT_DESKTOP,"Button",
BS_AUTOCHECKBOX,55,25,100,8
CONTROL "Add to &Start Menu",IDC_ROOT_MENU,"Button",
-@@ -273,7 +271,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POP
- CAPTION "Cygwin Setup"
+@@ -271,10 +268,10 @@ END
+
+ IDD_FTP_AUTH DIALOGEX 0, 0, 215, 95
+ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | 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 "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
WS_EX_RIGHT
EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
-@@ -322,6 +320,7 @@ END
+@@ -322,6 +319,7 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDI_CYGWIN ICON DISCARDABLE "cygwin.ico"
/////////////////////////////////////////////////////////////////////////////
-@@ -329,6 +328,7 @@ IDI_CYGWIN ICON DISCARDA
+@@ -329,6 +327,7 @@ IDI_CYGWIN ICON DISCARDA
// FILE
//
CYGWIN.ICON FILE DISCARDABLE "cygwin.ico"
/////////////////////////////////////////////////////////////////////////////
-@@ -383,7 +383,8 @@ STRINGTABLE DISCARDABLE
+@@ -383,7 +382,8 @@ 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_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 -purN ../cinstall/resource.h ./resource.h
---- ../cinstall/resource.h Mon Jul 2 05:55:40 2001
-+++ ./resource.h Thu Sep 13 21:29:51 2001
+diff -purN --exclude=*~ --exclude=configure ../cinstall.orig/resource.h ./resource.h
+--- ../cinstall.orig/resource.h Sat Jun 30 03:37:55 2001
++++ ./resource.h Sun Dec 2 15:45:18 2001
@@ -47,12 +47,13 @@
#define IDB_SPIN 118
#define IDB_RTARROW 119
#define IDC_SOURCE_DOWNLOAD 1000
#define IDC_SOURCE_NETINST 1001
#define IDC_SOURCE_CWD 1002
-diff -purN ../cinstall/version.c ./version.c
---- ../cinstall/version.c Thu Jan 1 01:00:00 1970
-+++ ./version.c Mon Sep 17 18:44:46 2001
-@@ -0,0 +1,2 @@
-+char *version = "2.96.jcn1";
-+static char *id = "\n%%% setup-version 2.96.jcn1\n";
@setfilename installing.info
@settitle LilyPond on Windows
-@html
-<!--- @@WEB-TITLE@@=Windows Installation --->
-@end html
-
@node Top
@top
on a Microsoft Windows 95, 98, NT or 2000 machine.
This release is a free extra service of the developers to assist windows
-users. Please remember that we (the developers) rather dislike windows,
-and none of us use it. Don't complain to us that installing LilyPond is
-too difficult; rather, if you know something about your Windows, send us
-code that works better (see @uref{compiling.html,compiling}).
-Nevertheless, detailed bug reports are appreciated; before you send a
-report, make sure to read the section on bugreports below.
-
+users. When reporting problems, please keep in mind that we (the developers)
+do not use Windows. In fact, if you know something about Windows, and
+are able to write code, please send us code that works better (see
+@uref{compiling.html,compiling}).
@section Windows binary setup
+Apart from LilyPond itself, you need Cygwin, GUILE, Python and a TeX
+installation, but all this software be installed by running setup.exe:
+
+@table @asis
+@item LilyPond
+Download and run
+@c let's do http, so that people read the README
+@uref{http://www.lilypond.org/gnu-windows/setup.exe, setup.exe}
+to install LilyPond.
+
+This will install the minimal set of cygwin tools needed to run
+LilyPond. Make sure to install in the default place, @file{c:/cygwin},
+and install everything.
+
+As of version 1.3.150, you also have the option to install MiKTeX and
+GSView from this installer, which is recommended. If you choose to
+install these by hand (see below), make sure to install them
+@strong{before} you install LilyPond, otherwise your LilyPond setup will
+be broken.
-All the software you need is installed by downloading and running
-@uref{http://www.lilypond.org/gnu-windows/setup.exe, setup.exe}. You
-will be asked some questions. If you are unsure just click "Next". Do
-not change the default install directory @file{c:/cygwin}.
+If you already have cygwin installed, don't worry: nothing will be
+installed twice. To expand on this minimal set, click
+@uref{http://sources.redhat.com/cygwin/setup.exe,here}, or visit a
+Cygwin @uref{http://sources.redhat.com/cygwin/mirrors.html,mirror site}.
+@end table
-This installs LilyPond, and Cygwin, GUILE, Python, MiKTeX and GSView If
-you already have some of that software under @file{c:/cygwin}, then
-don't worry: nothing will be installed twice.
-If you want to install any of this software by hand, do this
-@strong{before} you run @file{setup.exe}, otherwise your LilyPond setup
-will not work.
+@section Windows running setup
-@section Testing LilyPond
+If you're lucky, after running @file{setup.exe} you're all set up.
-Open a LilyPond shell (To open a a lilypond shell, click the "GNU
-LilyPond" icon), and type
+Open a LilyPond shell (or any bash shell), and type
@quotation
@example
@end example
@end quotation
-You should see something similar to
+If you don't see something similar to
@quotation
@example
@end example
@end quotation
-Then, prepare a file called @file{foo.ly}, by issuing
-@example
-notepad foo.ly
-@end example
-Enter the following into the file
-@example
-
-\score @{ \notes @{ c4 ( ) c4 @} @}
-
-@end example
-Close the file and save it. Run the following command a few times until
-it says @code{PS output to `foo.ps', DVI output to `foo.dvi'}.
-@example
-
-ly2dvi -P foo
-
-@end example
-You can now view the file using the following command
-@example
-
-gsview32 foo.ps
-
-@end example
-
-If this works, then you can head to the
-@uref{../../user/out-www/lilypond/Tutorial.html,Tutorial} to start using
-LilyPond.
+you should try adding @file{/usr/lilypond-x.y.z/bin} to your @var{PATH},
+do:
-
-
-@section Removing LilyPond
-
-Start @file{setup.exe}, click Next, select "Install from Local
-Directory". Then click next until you reach "Select packages to
-install". Click "View". Now, for every package, click on the recycle
-icon until it says "Uninstall". Then, click Next.
-
-(If you find this too tedious, you can also simply remove
-@file{c:/cygwin}. This also removes the @file{/home/} directories under
-cygwin (i.e. @file{C:\CYGWIN\HOME}, so make sure that you bring
-important files in safety first.)
-
-@section Troubleshooting
-
-
-@unnumberedsubsec invoking lilypond --help doesn't work
-
-Open the shell, and try adding @file{/usr/lilypond-x.y.z/bin} to your
-@var{PATH}, do:
@quotation
@example
PATH=/usr/lilypond-1.4.2/bin:$PATH
@end example
@end quotation
-Now, invoke @file{lilypond --help}
+and try again.
+
+
+@subsection Trouble
For problems and solutions see
@uref{http://lilypond.org/wiki?TroubleshootingWindows,Troubleshooting
Windows}
-
-
-@ignore
@subsection Additional software
LilyPond needs a number of software packages to be really useful. These
@uref{ftp://ftp.cs.wisc.edu/ghost/ghostgum,ftp.cs.wisc.edu}.
or visit the
@uref{http://www.cs.wisc.edu/~ghost/,Ghostscript, Ghostview and GSview site}.
+
@end table
+
+
[TODO:
]
+
+@ignore
+
guile -v
Guile 1.4.1
@end ignore
-@ignore
-@c irrelevant.
-
-If you want to install more of cygwnTo expand on this minimal set,
-@section If you already have MikTeX, GSView or
-If you already have cygwin installed, don't worry: nothing will be
-installed twice. To expand on this minimal set, click
-@uref{http://sources.redhat.com/cygwin/setup.exe,here}, or visit a
-Cygwin @uref{http://sources.redhat.com/cygwin/mirrors.html,mirror site}.
-
-
-This will install the minimal set of cygwin tools needed to run
-LilyPond. Make sure to install in the default place, @file{c:/cygwin},
-and install everything.
-@end ignore
projects / lilypond.git / commitdiff