From 4b318c7b80d4b4c4084c49f62fa5ab8035adb136 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 8 Apr 2001 20:07:26 +0200 Subject: [PATCH] patch::: 1.3.146.jcn4 1.3.146.jcn4 ============ * Updated doco to reflect Windows installer. * Ripped Cygnus' installer/updater for Windows. --- Generated by janneke@gnu.org, From = lilypond-1.3.146.jcn3, To = lilypond-1.3.146.jcn4 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.146.jcn4.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure --- CHANGES | 14 +- Documentation/GNUmakefile | 2 +- Documentation/README-W32.texi | 820 ------------------ Documentation/index.texi | 1 + Documentation/topdocs/INSTALL.texi | 4 +- Documentation/topdocs/WINDOWS.texi | 118 +++ Documentation/windows/GNUmakefile | 10 + Documentation/windows/cygwin-installer.patch | 352 ++++++++ .../windows/guile-1.4-gnu-windows.patch | 85 ++ Documentation/windows/gv.sh | 9 + Documentation/windows/ly2dvi.sh | 8 + GNUmakefile.in | 2 +- VERSION | 2 +- 13 files changed, 601 insertions(+), 826 deletions(-) delete mode 100644 Documentation/README-W32.texi create mode 100644 Documentation/topdocs/WINDOWS.texi create mode 100644 Documentation/windows/GNUmakefile create mode 100644 Documentation/windows/cygwin-installer.patch create mode 100644 Documentation/windows/guile-1.4-gnu-windows.patch create mode 100644 Documentation/windows/gv.sh create mode 100644 Documentation/windows/ly2dvi.sh diff --git a/CHANGES b/CHANGES index a478451bc4..9da4d8c8fb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,16 @@ -1.3.146.jcn1 +--- ../lilypond-1.3.146.jcn3/CHANGES Fri Apr 6 17:25:56 2001 +++ b/CHANGES Sun Apr 8 20:07:26 2001 +@@ -1,3 +1,10 @@ +1.3.146.jcn4 +============ + +* Updated doco to reflect Windows installer. + +* Ripped Cygnus' installer/updater for Windows. + + 1.3.146.jcn3 + ============ + 1.3.146.jcn1 ============ * Added warning message, rather than encouragement, against configuring diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index d4b99a936a..46149c1f5f 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -1,7 +1,7 @@ depth = .. NAME = documentation -SUBDIRS=user bibliography pictures topdocs misc +SUBDIRS=user bibliography pictures topdocs misc windows STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly diff --git a/Documentation/README-W32.texi b/Documentation/README-W32.texi deleted file mode 100644 index 8abbb88413..0000000000 --- a/Documentation/README-W32.texi +++ /dev/null @@ -1,820 +0,0 @@ -\input texinfo @c -*-texinfo-*- -@setfilename README-W32.info -@settitle LilyPond on W32 - - -@node Top, , , (dir) - -@chapter LilyPond on W32 - -FIXME: remove yodl refs. - -[FIXME: THIS DOCUMENTED IS OUTDATED] - -No, there's no reason to be concered, Lily should work in -Windows-NT(/95/98?) too. The setup may not be easy or smooth. This -document will help you getting started. - - -@section DISCLAIMER - -If you have the Cygnus gnu-windows32 port of the GNU utils, LilyPond -will work in Windows-NT (/95/98?). - -We still recommend you use Unix. In particular, use GNU/Linux: We've -been there, and we've seen it happen several times. It is @strong{much} -easier and quicker to install RedHat Linux and LilyPond than to -obtain, compile and install all the necessary tools to compile and run -LilyPond on Windows. - -``Ok, thanks for the suggestions. I can't run Linux or I don't want -to run Unix. What can I expect?'' - -@itemize @bullet -@item LilyPond development is moving quite fast, and all developers use Unix. - Newly added features may require some attention to get them to work. -@item LilyPond depends on a number of other packages that usually are - available on Unix boxes, but are not installed by default on Windows. -@end itemize - - -LilyPond will now install/extract in a unix-like tree: -@example - - usr/[local/]bin/ - usr/[local/]share/lilypond/* - -@end example - -etc. - -Lily runs in a the unix-like Cygnus gnu-windows environment; -hopefully Cygnus will adopt the @file{/usr/[local/]} tree too. - -@* -If you really don't want usr/ in your root directory, but rather scatter -your programs and packages all over your harddisk, do something like: -@example - - md lilypond - cd lilypond - unzip ../lilypond-0.1.77.exe.zip - -@end example - -and add @file{lilypond/usr/bin} to your @file{PATH} and -@file{lilypond/usr/share/lilypond} to your @file{LILYINCLUDE}. - - -If you've received a binary release of LilyPond (@file{.exe.zip}), -you may skip the following sections. - - -It can be done! Occasionally, the Cygnus b19.1 cross compiler and -utilities under GNU/Linux are used to make the binary @file{.exe.zip} -releases (some makefile hacking was needed to build this stuff). Jeffrey -Reed tries to keep-up with LilyPond development, and is doing quite -well. His latest release is available on -@uref{http://home.austin.rr.com/jbr/jeff/lilypond/}. - - -I have heard of such tools that think they're probably much smarter than the -packager and thus decide for themselves that they don't need to unpack certain -files (e.g., empty directories such as bin/out). - -To unpack the lilypond sources, you should do something like: @example - - tar zxf releases/lilypond-x.y.z.tar.gz - -@end example - - -If you're familiar with the GNU/Cygnus development package, you may skip -this. - -Don't forget to set -@example - - /start/settings/control-panel/system/environment/system-variables: - GCC_EXEC_PREFIX=/Cygnus/b19/H-i386-cygwin32/lib/gcc-lib/ - MAKE_MODE=UNIX - -@end example - -You want to run bash, while building Lily: -@example - - c:\bash - bash-2.01$ - -@end example - -The install instructions mention something like: -@example - - configure - make - make install - -@end example - -Now for a small UNIX lesson: The current working directory (cwd) is -by default not in your PATH, like it is under DOS (for security reasons). -Check this by looking at the output of: -@example - - echo $PATH - -@end example - -The cwd looks like @code{'::'} or @code{':.'}. If it's not there, you may -add the cwd to your path: -@example - - PATH=$PATH:. - -@end example - -or you must use './' when issuing a command in th cwd, try: -@example - - ./configure - make - -@end example - -My point of reference comes from 15 odd years working with a variety -of @code{UNIX} platforms. I am relatively new to Windows-NT and, even -though I am a card carrying @code{UNIX} bigot, I am excited about the -NT OS. My goals for lilypond are to give back to the Free Software -Foundation a little of what they have given me over the years and to -contribute to the lilypond project by supporting a Windows-NT port. I -hope that someday we can distribute and run lilypond on the NT OS in a -much more native fashion. - -@itemize @bullet - -@item Building lilypond on Windows-NT -@item Maintaining lilypond on Windows-NT -@item Running lilypond on Windows-NT - -@end itemize - - -Currently as stated above lilypond is primarily a @code{UNIX} thing. -The Windows-NT port is based on the @code{UNIX} environment provided by -@uref{http://www.cygnus.com,Cygnus}. Therefore the first step is to -download and install the Cygnus development kit: - -@uref{http://www.cygnus.com/misc/gnu-win32/} - -Please follow the documentation Cygnus has on there web site for -downloading and installing. The important part is that you down load -the entire development kit. I believe it is @file{full.exe}. The -installation will ask you where you want to install it. I will refer -to Cygnus installation directory as @file{/gnuwin32/cygwin-b20}. There -should be a @file{README} file that contains installation instructions. -After the installation is complete you should have a @emph{Cygnus} -shortcut in your @emph{Program} section of your @emph{Start Menu}. This -shortcut is your door to the @code{UNIX} world and I will refer to the -resulting window as a @file{bash} shell. - -The shortcut points to @file{/gnuwin32/cygwin-b20/cygnus.bat}. The -following is my @file{cygnus.bat} file. - -@example - -@@ECHO OFF -rem default environment - -rem GNU cygnus installation - -SET CYGREL=B19.1 -SET MAKE_MODE=unix -SET LOCAL_ROOT=d:\gnuwin32 -SET LOCAL_FS=d:/gnuwin32 -SET LOCAL_DIR=d:/gnuwin32/cygwin-b20 -SET CYGROOT=%LOCAL_ROOT%\cygwin-b20 -SET CYGFS=%LOCAL_FS%/cygwin-b20 -SET TCL_LIBRARY=%CYGROOT%\share\tcl8.0 -rem -rem This was not in the original but is needed by lots of packages -rem -SET BISON_SIMPLE=%CYGFS%/share/bison.simple - -rem -rem I place the cygnus stuff in front of /WINNT -rem - -SET PATH=d:\bin;%LOCAL_ROOT%\bin;%CYGROOT%\H-i586-cygwin32\bin;%PATH% -SET MANPATH=%LOCAL_ROOT%\man;%LOCAL_ROOT%\cygwin-b20\full-man\man -SET INFOPATH=%LOCAL_FS%/cygwin-b20/full-man/info;%LOCAL_FS%/cygwin-b20/info;%LOCAL_DIR%/info - -rem General tools not included with Cygnus Development Kit - -rem CVS - -SET PATH=%PATH%;%LOCAL_ROOT%\cvs-1.9.28\bin -SET INFOPATH=%INFOPATH%;%LOCAL_FS%/cvs-1.9.28/info -SET MANPATH=%MANPATH%;%LOCAL_ROOT%\cvs-1.9.28\man - -rem EMACS - -SET PATH=%PATH%;%LOCAL_ROOT%\emacs-19.34\bin -SET INFOPATH=%INFOPATH%;%LOCAL_FS%/emacs-19.34/info - -rem VIM - -SET VIM=%LOCAL_ROOT%\vim-4.6\doc -SET PATH=%PATH%;%LOCAL_ROOT%\vim-4.6 - -rem TeX - -SET PATH=%PATH%;%LOCAL_ROOT%\texmf\miktex\bin - -rem a2ps - -SET PATH=%PATH%;%LOCAL_ROOT%\a2ps-4.10\bin -SET INFOPATH=%INFOPATH%;%LOCAL_FS%/a2ps-4.10/info -SET MANPATH=%MANPATH%;%LOCAL_ROOT%\a2ps-4.10\man - -rem python - -SET PATH=%PATH%;\Program Files\Python - -rem perl - -SET PATH=%PATH%;\qub - -rem yodl - -uname -sv -bash -login - -@end example - -Please look over this carefully. Be careful with the forward and -backward slash notations. The paths specified were done for good -reasons. Maybe someday we will all be using @code{UNC}. Note the -@code{BISON} entry and the @code{PATH} ordering in particular. Also note -that the generic @file{cygnus.bat} you will be looking at does not -include alot of the packages listed. We will be installing some of -these. - -The installation also suggests that you create a directory @file{/bin} -and copy @file{/gnuwin32/cygwin-b20/H-i586-cygwin32/bin/sh.exe} to -@file{/bin}. The @file{sh.exe} shell provided by Cygnus is a descendant -of the @file{ash} shell. The @file{sh.exe} shell has improved greatly -and is much faster than the @file{bash} shell for script invocations. -So this is my recommendation for post installation steps. From a -@file{bash} shell: - -@itemize @bullet -@item @code{cd /} -@item @code{mkdir bin} -@item @code{cd /bin} -@item @code{cp /gnuwin32/cygwin-b20/H-i586-cygwin32/bin/sh.exe sh.exe} -@item @code{cp /gnuwin32/cygwin-b20/H-i586-cygwin32/bin/bash.exe bash.exe} -@item @code{cd /} -@item @code{mkdir /tmp} -@item @code{chmod a+rwx tmp} -@item @code{mkdir /etc} -@item @code{cd /etc} -@item @code{mkpasswd -l > passwd} -@item @code{mkgroup -l > group} -@end itemize - - -There is also some discussion of how you want to @emph{mount} the Cygnus -development kit. @emph{mount} is a @code{UNIX} term that refers to the -mechanism used to provide a disk resource to the filesystem. Cygnus -supplies a mechinism for @emph{mounting} a filesystem as a @code{DOS} like -resource or a @code{UNIX} like resource. Among other things this -attempts to deal with the text file carriage return line feed on -@code{DOS} versus the line feed on @code{UNIX} and the issue that @code{DOS} -has two file types, text and binary. Where @code{UNIX} deals with a -single streams type. My opinion on this matter currently is to use -binary mounts only. This can be accomplished by: - -@itemize @bullet -@item From a bash shell, umount / -@item mount -b d: / -@end itemize - -If you have other disks that you intend to use for data generated by -cygnus tools you will have to mount those devices with the @emph{-b} -switch. - - -@uref{http://www.xraylith.wisc.edu/~khan/software/gnu-win32/egcs.html} - -Cygnus now distributes the ecgs compiler with cygwin-b20. - - -@uref{http://www.gnu.org/order/ftp.html} - -Considering the origin of the major contributors of lilypond, this is a -must. However before we actually do a @strong{GNU} build we have to -discuss some caveats of the Windows-NT OS in particular the naming of -executable files. @code{Windows-NT} uses a .exe extension where @code{UNIX} -does not use an extension. This causes a problem during the -installation portion of a @strong{GNU} build. The following script can be -used to help alleviate this problem. - -@example - -#!/bin/sh - -realinstall=/gnuwin32/cygwin-b20/H-i586-cygwin32/bin/install.exe -args='' -while [ $# -ne 0 ] -do - case $1 in - -*) args="$args $1" - ;; - - *) if [ -f $1.exe ]; then - args="$args $1.exe" - else - args="$args $1" - fi - ;; - esac - shift -done - -$realinstall $args - -@end example - -I place this in script @file{~/bin}. The LilyPond configure, build, -and install process handles this with it's own install script. In -addition there are patches to the cygnus install command that also -deals with this problem. Having said that, here is how one -might build the @emph{gettext} package. - -@itemize @bullet -@item download the package from one of the ftp sites. -@item From a bash shell, cd ~/usr/src. -@item tar zxf gettext-0.10.tar.gz -@item cd gettext-0.10 -@item ./configure --prefix=$CYGFS/H-i586-cygwin32 -@item make -@item make install -@end itemize - - -@uref{http://www.gnu.org/order/ftp.html} - -Following the instructions for @emph{gettext} package to download, build, -and install the @emph{groff} package. - - -@uref{http://www.python.org} - -Python is the scripting language of choice for a lilypond build. -There is a native @code{Windows-NT} self extracting binary distribution -available. I recommend installing Python in a directory that does -@strong{not} have spaces. And then place it in the bash shell path by -editing $CYGFS/cygnus.bat. - - -@uref{http://www.cpan.org} - -I believe perl is used in some legacy scripts to date. There is a -native @code{Windows-NT} self extracting binary distribution available. -I recommend installing Perl in a directory that does @strong{not} have -spaces. And then place it in the bash shell path by editing -$CYGFS/cygnus.bat. - -The development methodology of @emph{LilyPond} relies on a the following -directory structure: - - -@example - -$HOME/usr/src/ - |-releases/ - |-patches/ - |-test/ - -@end example - -@table @samp - -@item releases/ Downloaded and generated releases live here. For -example @file{lilypond-1.1.17.tar.gz}. - -@item patches/ Downloaded and generated patches live here. For -example @file{lilypond-1.1.17.diff.gz}. - -@item test/ This directory is used to generate releases and patches. - -@end table - -I strongly recommend using this file structure to build @emph{yodl} and -@emph{lilypond}. - -@itemize @bullet -@item download the package from -@uref{http://www.xs4all.nl/~jantien/yodl/} to -@file{$HOME/usr/src/releases}. -@item From a bash shell, cd @file{$HOME/usr/src}. -@item tar zxf releases/yodl-@emph{}.tar.gz -@item cd yodl-@emph{} -@item ./configure --prefix=/gnuwin32/yodl-@emph{} --srcdir=. -Since @emph{yodl} is under development I choose to install it in a -version rooted directory. This allows me to test newly released -versions without losing a known working version. - -@item make -@item make install -@item place it in the bash shell path by editing $CYGFS/cygnus.bat. -For example: -@example -rem yodl - -SET PATH=%PATH%;%LOCAL_ROOT%\yodl-1.31.7\bin - - -@end example - -@end itemize - - - -GUILE, GNU's Ubiquitous Intelligent Language for Extension, is a -library that implements the Scheme language plus various convenient -facilities. It's designed so that you can link it into an application -or utility to make it extensible. GNU's plan is to link this library -into all GNU programs that call for extensibility. - -@itemize @bullet -@item download guile-1.3 patch from -@uref{http://home.austin.rr.com/jbr/jeff/lilypond/guile.patch} and save it -to @file{/tmp/guile.patch}. -@item download guile-1.3 from one of GNU's ftp sites. -@item From a bash shell, tar zxf guile-1.3.tar.gz -@item cd guile-1.3 -@item patch -p2 < /tmp/guile.patch -@item LD=/gnuwin32/cygwin-b20/H-i586-cygwin32/bin/ld \ @* - ./configure --prefix=$CYGFS/H-i586-cygwin32 -@item make sure bin_PROGRAMS macro in libguile/Makefile does @emph{not} have the -.exe extension during the build -@item make -@item make sure bin_PROGRAMS in libguile/Makefile @emph{does} have the -.exe extension during the install. Yuck. -@item make install -@end itemize - - -@itemize @bullet -@item download the package from -@uref{http://www.cs.uu.nl/people/hanwen/lilypond/} to -@file{$HOME/usr/src/releases}. -@item From a bash shell, cd @file{$HOME/usr/src}. -@item tar zxf releases/lilypond-@emph{}.tar.gz -@item cd lilypond-@emph{} -@item ./configure --prefix=/gnuwin32/lilypond-@emph{} \ @* - --srcdir=. @* -Since @emph{lilypond} is under development I choose to install it in a -version rooted directory. This allows me to test newly released -versions without losing a known working version. -@item make -@item make install -@item place it in the bash shell path by editing $CYGFS/cygnus.bat. -For example: -@example -rem lilypond - -SET PATH=%PATH%;%LOCAL_ROOT%\lilypond-1.1.17\bin - - -@end example - -@end itemize - - -If you have built @emph{lilypond} on @code{Windows-NT} using the directory - and the process described -in section FIXME, then you are ready to maintain -@emph{lilypond}. It can not be that easy!? Well, there is one caveat. -Currently to use the @file{stepmake/bin/release.py} and -@file{stepmake/bin/package-diff.py} scripts you need to obtain/build a -version of @emph{python} that was built with @strong{Cygnus} development kit. -The process I used is as follows: - -@itemize @bullet -@item obtain python source from @uref{http://www.python.org} -@item tar zxf /tmp/python-@emph{}.tar.gz -@item cd python-@emph{} -@item configure --prefix=/gnuwin32/Python-@emph{} -@item edit toplevel @file{Makefile} @code{EXE} macro so it reads @code{EXE=.exe} -@item make -@item make install -@item place it in the bash shell path by editing $CYGFS/cygnus.bat. -For example: -@example -rem python - -SET PATH=%PATH%;%LOCAL_ROOT%\python-1.5.1\bin - - -@end example - -@end itemize - -I choose to build @emph{lilypond} with the standard @code{Windows-NT} -@emph{python} and use the @strong{Cygnus} version for using the release -scripts. This way I can make sure the @code{Windows-NT} @emph{python} -version is able to build @emph{lilypond}. Currently there are several -issues with the release scripts. Using @code{os.link} and -@code{os.system(set -x;...)} are to name a few. - -To generate a new release and patch you must use the directory -. And follow the -instructions found in @file{PATCH.txt}. Editing -@file{Documentation/AUTHORS.yo}, @file{VERSION}, and @file{NEWS} is also -required. When my edits are complete and tested I: - -@itemize @bullet -@item Edit @file{config.make} and change @emph{python} path to the -@strong{Cygnus} version: @code{PYTHON=/gnuwin32/Python-1.5.1/bin/python}. -@item make release -@end itemize - -The new release is placed in @file{releases} directory and the patch is -placed in the @file{patches} directory. I email the new patch to -@email{gnu-music-discuss@@gnu.org}. More than one patch a day can be -generated by: - -@itemize @bullet -@item cd $HOME/usr/src -@item tar zxf releases/lilypond-@emph{}.@emph{} -@item use your normal configure -@item make edits -@item Change @file{VERSION} to increment @emph{} -@item Change @file{NEWS} -@item make release -@end itemize - - -We are now distributing a formated binary distribution for -Windows-NT. Please refer to -@uref{http://home.austin.rr.com/jbr/jeff/lilypond/} for current news, -download, installation, and running information. - -Jeffrey B. Reed @email{daboys@@austin.rr.com} - -@section RUNNING LILYPOND -- by Dominique Cretel - -You may want to refer to section FIXME, for more current -information about downloading, installing, and running the Windows-NT -binary distribution. - -@enumerate i -@item First, I have download tha 0.1.64 version of LilyPond music software. - -@item Then I extract it in a temp directory, and I move the directory -"lilypond-0.1.64" to the root directory of my D drive. - -@item I go to the D:\Lilypond-0.1.64\tex directory to modify the -lilyponddefs.tex file (lines 75 and 84), and comment all -cmbx15 ans cmbx14, and replace them by cmbx12. - -@item build a command file like this: -Note: I use MiKTeX to process the tex file generated. - -@example - ----begin ly2dvi.bat -echo off -set ver=0.1.64 -set path=%path%;d:\lilypond-%ver%\bin -lilypond -I d:\lilypond-%ver%\init %1 -rem *** pause - -set path=c:\texmf\miktex\bin;%path% -set TEXINPUTS=%TEXINPUTS%;d:\lilypond-%ver%\tex -set MFINPUTS=%MFINPUTS%;d:\lilypond-%ver%\mf -tex %1.tex -rem *** pause - -dvips %1.dvi -rem *** pause - -set path=%path%;d:\gstools\gsview -gsview32 %1.ps ----end ly2dvi.bat - -@end example - -@item execute lilypond by doing: -@example - -ly2ps silly - -@end example - -@end enumerate - -Note: -@* -You'll better have to put the SET commands lines in a separate command -file to avoid consumming each time environnment ressources. - -Bye,@* -Dominique Cretel @email{dominique.cretel@@cfwb.be} - -@section PROBLEMS AND ANWSWERS - -This is all to confusing. I have: -@enumerate i -@item downloaded @file{/tmp/lilypond-0.1.78.tar.gz} -@item @example - - cd ~/usr/src - -@end example - -@item @example - - tar zxf /tmp/lilypond-0.1.78.tar.gz - -@end example - -@item @example - - ./configure --prefix=/users/jeff/lilypond-0.1.78 \--enable-tex-prefix=/users/jeff/lilypond-0.1.78/texmf \--enable-tex-dir=/users/jeff/lilypond-0.1.78/texmf/tex \--enable-mf-dir=/users/jeff/lilypond-0.1.78/texmf/mf - -@end example - -@item @example - - make - -@end example - -@item @example - - make install - -@end example - -@end enumerate - -I did have a problem with lilypond.info. And I will look into this -further. After mending lilypond.info issue, it compiled and install -with no problems. - -I have 64 Meg of physical memory and 64 Meg of swap. Actually I need -to increase the swap space. If a memory problem is occuring it most -likely is during the link process of lilypond. There is a boat load -of objects to link. - -Jan the mount -b stuff is confussing to me. I have the entire system -mounted _without_ -b and only use -b on certain paths for programs -that create binary files that do not use O_BINARY open option. By the -way the midi file open is one of these cases, I need to look into -that. I have had no problems with this methodology. - - -The windows multiroot filesystem is an utterly broken concept. Please -do everything on one (urg) drive, C:. - -@example - -> configure -> creating cache ./config.cache -> [..] -> creating config.make -> creating config.hh -> cd: lstat /d failed - -@end example - -Ok, this looks like another stupid windows problem. -You're working on 'drive D:', right? - -I can think of some solutions, but i don't know if they work; -i just had to do some work in windows some time ago. If you -have problems with this, please ask @email{gnu-win32@@cygnus.com}. -I'll start with the simplest: -@itemize @bullet - @item do everything on drive C:, or - @item explicitely mount drive d:, work from there: - @example - - mkdir -p /mnt/d - mount d: /mnt/d - cd /mnt/d/lilypond-x.y.z/ - -@end example - - @item make d:/ the root of cygnus, in cmd.exe/command.exe do: - @example - - umount / - mount d: / - -@end example - -@end itemize - - -> - First I have installed Python (for win32) "Pyth151.exe" and "Configure -@* -> don't find it. I had to put it in the path for configure find it? -@* - -Yes, of course. It should be possible to have different versions of tools -installed (e.g. perl 4 and perl 5). The best way to tell people (or tools -like configure) which one to use is to put it in the path? - -Another small unix lesson: Where under dos each program installs itself -into a nice directory -@example - - c:\DosProgram\* - -@end example - -under unix, installation is handled centrally. Executables go in -@file{/usr/bin} (or @file{/usr/local/bin}), and are always in your path. - - -@example - -> 4. make -C lily don't work. I get an error (see below). I get several -> object files in the ./lily/out directory (34 files: 17 *.dep, 16 *.o, -> and 1 *.hh): -> [...] -> include/engraver-group.hh:35: virtual memory exhausted -> make: *** [out/bar-grav.o] Error 1 -> bash-2.01$ - - -@end example - -Ok, so everything works now, there's only some error with one of the -source files. Lets see which one (and now the cc's now why they're -reading this :-) - -It looks like you've run out of memory. You should compile without -optimisation, gcc/egcs need a lot of memory for optimising. -Reconfigure without optimisation: -@example - - configure --disable-optimise - -@end example - -or edit @file{config.make}: -@example - - ## USER_CXXFLAGS = -g # -O no optimise! - USER_CXXFLAGS = -g - -@end example - -There are some other things to look at: how much RAM do you have -(please say something > 8Mb :-)? Although it might be an egcs bug, -you should have a look at the size of your swap file. -For an US version of windows, you should find it here: -@example - - /start/settings/control-panel/system/performance/virtual-memory - -@end example - -you see, amongst others, these entries: -@example - - paging file size for selected drive: - - space-available: xx - initial-size: xx - maximum-size: xx - - total paging file size for all drives - - currently allocated: xx - -@end example - -Try to set: -@example - - initial-size: 64 - maximum-size: 128 - -@end example - -Make sure that: -@itemize @bullet -@item maximum-size >= 128 Mb -@item urrently-allocated + space-available >= 128 Mb -@end itemize - - -@bye diff --git a/Documentation/index.texi b/Documentation/index.texi index 394a2ab408..2b895d9379 100644 --- a/Documentation/index.texi +++ b/Documentation/index.texi @@ -13,6 +13,7 @@ @item @uref{../topdocs/out-www/AUTHORS.html, Authors} @item @uref{../topdocs/out-www/README.html, Readme file} @item @uref{../topdocs/out-www/INSTALL.html, Installation instructions} +@item @uref{../topdocs/out-www/WINDOWS.html, LilyPond for Windows} @item @uref{CHANGES.html, Things recently done} @item @uref{../topdocs/out-www/FAQ.html,Very Frequently Asked Questions}, with answers @item @uref{http://appel.lilypond.org/wiki?LilyPondFaqs,Full Frequently asked questions}, with answers diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index c133a75d4a..feaecbf0a3 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -44,8 +44,8 @@ on the FTP site. This document describes how to build LilyPond on Unix platforms. It is also known to run and compile on Windows NT/95/98 as well. More -information on this topic can be found at -@uref{http://appel.lilypond.org/lilypond/gnu-windows/, Jan's windows +information on this topic can be found at the +@uref{http://appel.lilypond.org/lilypond/gnu-windows/, LilyPond on Windows page}. You need the following packages to compile Lilypond. diff --git a/Documentation/topdocs/WINDOWS.texi b/Documentation/topdocs/WINDOWS.texi new file mode 100644 index 0000000000..1a17d08fe6 --- /dev/null +++ b/Documentation/topdocs/WINDOWS.texi @@ -0,0 +1,118 @@ +\input texinfo @c -*-texinfo-*- +@setfilename WINDOWS.info +@settitle WINDOWS - compiling and installing GNU LilyPond on Windows + +@node Top +@top + +@chapter WINDOWS - compiling and installing GNU LilyPond on Windows + +This document is a supplement to INSTALL.txt, you may want to read +that too. + +@section Obtaining LilyPond + +You can get the latest version of LilyPond at +@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/, +ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/}. + +@section Windows build requirements +You need the following packages to compile Lilypond on Windows. + +@table @code +@item The GNU + Cygnus tools, 1.1.7 or newer. +Check out the @uref{http://sources.redhat.com/cygwin,Cygwin webpage}. +@item GUILE 1.4, or newer. +Check out the @uref{http://www.gnu.org/software/guile.html,GUILE webpage} +@end table + +You can get the latest version of the GNU + Cygnus tools from cygnus +@uref{http://sources.redhat.com/cygwin/mirrors.html,mirror site}. + +@section Windows precompiled binaries + +@table @code +@item LilyPond +Click @uref{http://appel.lilypond.org/lilypond/gnu-windows/setup.exe, +here} to install LilyPond, or visit @uref{http://appel.lilypond.org/lilypond/gnu-windows, +LilyPond on Windows}. + +This will install the minimal set of cygwin tools needed to run +LilyPond. If you already have cygwin installed, don't worry: nothing +will be installed twice. + +@end table + +Note that none of the developers uses Windows, of course. In fact, we +recommend you to use GNU/Linux for running LilyPond. We provide these +binaries anyway, because it saves us the trouble of helping Windows +users trying to compile LilyPond themselves. + +These binaries are cross compiled for Windows on a GNU/Linux box. You +may want to check out the +@uref{http://appel.lilypond.org/lilypond/gnu-windows/cross.tar.gz,cross +compilation scripts}. + +@section Windows running requirements + +GNU LilyPond does use a lot of resources. For operation you need the +following software + +@table @code +@item GUILE +Included in binary installation. +@item TeX +A full TeX installation. See /usr/share/doc/tetex-beta for details. +@item GSView +Click @uref{ftp://ftp.cs.wisc.edu/ghost/ghostgum/gsv36w32.exe,here} to +install GSView (GhostView for Windows), or visit +@uref{ftp://ftp.cs.wisc.edu/ghost/ghostgum,ftp.cs.wisc.edu}. +@item Python +Click @uref{http://www.python.org/ftp/python/win32/py152.exe,here} to +install Python-1.5.2, or visit @uref{http://www.python.org,www.python.org}. +@end table + + +@section Windows running setup + +If you're lucky, after running @file{setup.exe} you're all set up. + +Open a LilyPond shell (or any bash shell), and type +@example +lilypond --help +@end example + +If you don't see something similar to +@example +Usage: lilypond [OPTION]... [FILE]... + +Typeset music and or play MIDI from FILE + +LilyPond is a music typesetter. It produces beautiful sheet music +using a high level description file as input. LilyPond is part of +the GNU Project. + +Options: + -h,--help this help +[..] +@end example + +you should try adding @file{/usr/lilypond-x.y.z/bin} to your path, do: +@example +PATH=/usr/lilypond-1.3.147/bin:$PATH +@end example + +and try again. + +[TODO: + +* talk about /etc/profile.d/lilypond-profile.sh + +* GUILE errors + +* TEX errors + +] + + + diff --git a/Documentation/windows/GNUmakefile b/Documentation/windows/GNUmakefile new file mode 100644 index 0000000000..9e7b37ea23 --- /dev/null +++ b/Documentation/windows/GNUmakefile @@ -0,0 +1,10 @@ + +depth=../.. + +EXTRA_DIST_FILES = LilyPond.ico $(wildcard *.sh *.patch) + +STEPMAKE_TEMPLATES=documentation + +include $(depth)/make/stepmake.make + +default: diff --git a/Documentation/windows/cygwin-installer.patch b/Documentation/windows/cygwin-installer.patch new file mode 100644 index 0000000000..a1cc83c86b --- /dev/null +++ b/Documentation/windows/cygwin-installer.patch @@ -0,0 +1,352 @@ +Binary files ../cinstall/LilyPond.ico and ./LilyPond.ico differ +diff -urN ../cinstall/Makefile.in ./Makefile.in +--- ../cinstall/Makefile.in Thu Feb 8 05:55:22 2001 ++++ ./Makefile.in Sun Apr 8 19:54:54 2001 +@@ -130,11 +130,15 @@ + @chmod a-x $@ + + clean: +- rm -f *.o *.rc $(PROGS) ++ rm -f *.o $(PROGS) + $(MAKE) -C zlib clean + + realclean: clean + rm -f Makefile config.cache ++ rm -f inilex.c iniparse.c iniparse.h version.c config.log config.status *.d ++ ++ ++distclean: realclean + + install: all + $(SHELL) $(updir1)/mkinstalldirs $(bindir) $(etcdir) +diff -urN ../cinstall/desktop.cc ./desktop.cc +--- ../cinstall/desktop.cc Sat Nov 11 05:55:16 2000 ++++ ./desktop.cc Sun Apr 8 21:52:48 2001 +@@ -85,6 +85,11 @@ + "", + "cd \"$HOME\"", + "", ++ "PATH=\"/usr/lilypond/bin:$PATH\"", ++ "if [ ! -e \"/usr/lilypond\" ]; then", ++ " ln -s `tail -1 /usr/lilypond-*` /usr/lilypond", ++ "fi", ++ "", + "test -f ./.bashrc && . ./.bashrc", + 0 + }; +@@ -197,6 +202,30 @@ + } + + static void ++make_lily_bat () ++{ ++ batname = backslash (concat (root_dir, "/lilypond.bat", 0)); ++ ++ /* if the batch file exists, don't overwrite it */ ++ if (_access (batname, 0) == 0) ++ return; ++ ++ FILE *bat = fopen (batname, "wt"); ++ if (!bat) ++ return; ++ ++ fprintf (bat, "@echo off\n\n"); ++ ++ fprintf (bat, "%.2s\n", root_dir); ++ fprintf (bat, "chdir %s\n\n", backslash (concat (root_dir+2, "/bin", 0))); ++ ++ /* fprintf (bat, "bash --rcfile /bin/lilypond-profile\n"); */ ++ fprintf (bat, "bash --login -i\n"); ++ ++ fclose (bat); ++} ++ ++static void + make_etc_profile () + { + char *fname = concat (root_dir, "/etc/profile", 0); +@@ -299,11 +328,11 @@ + } + + static void +-save_icon () ++save_icon (char* iconfile, char* iconres) + { +- iconname = backslash (concat (root_dir, "/cygwin.ico", 0)); ++ iconname = backslash (concat (root_dir, iconfile, 0)); + +- HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE"); ++ HRSRC rsrc = FindResource (NULL, iconres, "FILE"); + if (rsrc == NULL) + { + fatal ("FindResource failed"); +@@ -323,7 +352,7 @@ + static void + do_desktop_setup() + { +- save_icon (); ++ save_icon ("/cygwin.ico", "CYGWIN.ICON"); + + make_cygwin_bat (); + make_etc_profile (); +@@ -335,6 +364,17 @@ + + if (root_desktop) { + desktop_icon ("Cygwin", batname); ++ } ++ ++ 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); + } + } + +diff -urN ../cinstall/ini.cc ./ini.cc +--- ../cinstall/ini.cc Thu Oct 5 05:55:27 2000 ++++ ./ini.cc Sun Apr 8 21:52:03 2001 +@@ -174,7 +174,7 @@ + { + *nl = 0; + /*OutputDebugString (stderrbuf);*/ +- MessageBox (0, buf, "Cygwin Setup", 0); ++ MessageBox (0, buf, "GNU LilyPond Cygwin Setup", 0); + stderrbuf[0] = 0; + } + +diff -urN ../cinstall/msg.cc ./msg.cc +--- ../cinstall/msg.cc Sat Aug 26 05:55:14 2000 ++++ ./msg.cc Sun Apr 8 21:51:56 2001 +@@ -44,7 +44,7 @@ + + vsprintf (buf, fmt, args); + log (0, "mbox %s: %s", name, buf); +- return MessageBox (0, buf, "Cygwin Setup", type | MB_TOPMOST); ++ return MessageBox (0, buf, "GNU LilyPond Cygwin Setup", type | MB_TOPMOST); + } + + void +diff -urN ../cinstall/res.rc ./res.rc +--- ../cinstall/res.rc Wed Mar 7 18:13:31 2001 ++++ ./res.rc Sun Apr 8 19:48:40 2001 +@@ -30,10 +30,10 @@ + + IDD_SOURCE DIALOG DISCARDABLE 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,-1,5,5,20,20 ++ ICON IDI_LILYPOND,-1,5,5,20,20 + CONTROL "&Download from Internet",IDC_SOURCE_DOWNLOAD,"Button", + BS_AUTORADIOBUTTON,55,15,152,10 + CONTROL "&Install from Internet",IDC_SOURCE_NETINST,"Button", +@@ -49,7 +49,7 @@ + CAPTION "Local package directory" + FONT 8, "MS Sans Serif" + BEGIN +- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20 ++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 + PUSHBUTTON "B&rowse...",IDC_LOCAL_DIR_BROWSE,150,10,34,14 + LTEXT "Local Package &Directory",IDC_STATIC,55,15,85,11 + EDITTEXT IDC_LOCAL_DIR,55,25,127,12,ES_AUTOHSCROLL +@@ -60,10 +60,10 @@ + + IDD_ROOT DIALOG DISCARDABLE 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 ++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 + PUSHBUTTON "B&rowse...",IDC_ROOT_BROWSE,150,10,34,14 + LTEXT "Select install root &directory",IDC_STATIC,55,15,85,11 + EDITTEXT IDC_ROOT_DIR,55,25,127,12,ES_AUTOHSCROLL +@@ -84,10 +84,10 @@ + + IDD_SITE DIALOG DISCARDABLE 0, 0, 222, 206 + 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 ++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 + LTEXT "Select Download &Site",IDC_STATIC,55,5,135,11 + LISTBOX IDC_URL_LIST,55,20,160,155,LBS_NOINTEGRALHEIGHT | + WS_VSCROLL | WS_HSCROLL | WS_TABSTOP +@@ -98,10 +98,10 @@ + + IDD_OTHER_URL DIALOG DISCARDABLE 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 ++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 + LTEXT "Select &URL to download from",IDC_STATIC,55,15,135,11 + EDITTEXT IDC_OTHER_URL,55,25,127,12,ES_AUTOHSCROLL + DEFPUSHBUTTON "&Next -->",IDOK,100,75,45,15 +@@ -111,10 +111,10 @@ + + IDD_NET DIALOG DISCARDABLE 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 ++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 + CONTROL "Use &IE5 Settings",IDC_NET_IE5,"Button", + BS_AUTORADIOBUTTON,55,10,69,10 + CONTROL "&Direct Connection",IDC_NET_DIRECT,"Button", +@@ -135,10 +135,10 @@ + IDD_DLSTATUS DIALOG DISCARDABLE 0, 0, 215, 95 + STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + 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 ++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 + PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15 + LTEXT "Downloading...",IDC_STATIC,55,5,135,8 + LTEXT "(URL)",IDC_DLS_URL,55,15,150,8 +@@ -157,10 +157,10 @@ + IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 215, 95 + STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | + 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 ++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 + PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15 + LTEXT "Installing...",IDC_INS_ACTION,55,5,135,8 + LTEXT "(PKG)",IDC_INS_PKG,55,15,150,8 +@@ -178,10 +178,10 @@ + + IDD_PROXY_AUTH DIALOG DISCARDABLE 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 ++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 + LTEXT "Proxy &User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE, + WS_EX_RIGHT + EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL +@@ -195,10 +195,10 @@ + + IDD_NET_AUTH DIALOG DISCARDABLE 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 ++ ICON IDI_LILYPOND,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 +@@ -212,26 +212,25 @@ + + IDD_SPLASH DIALOG DISCARDABLE 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 "Cygwin Net Release Setup Program",IDC_STATIC,55,10,114, ++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 ++ LTEXT "GNU LilyPond GNU LilyPond Setup Program",IDC_STATIC,55,10,114, + 8 +- LTEXT "Version (unknown)",IDC_VERSION,55,25,120,10 +- LTEXT "Copyright (C) 2000 Red Hat Inc",IDC_STATIC,55,35,135,8 +- LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,55,50,150, +- 10 ++ LTEXT "Version (1.4pre)",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 ",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, 292, 206 + 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 ++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 + LTEXT "Select packages to install",IDC_STATIC,55,5,85,8 + CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT + WS_VISIBLE,55,15,230,155 +@@ -249,10 +248,10 @@ + + IDD_DESKTOP DIALOG DISCARDABLE 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 ++ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20 + CONTROL "Create Desktop &Icon",IDC_ROOT_DESKTOP,"Button", + BS_AUTOCHECKBOX,55,25,100,8 + CONTROL "Add to &Start Menu",IDC_ROOT_MENU,"Button", +@@ -298,6 +297,7 @@ + + // Icon with lowest ID value placed first to ensure application icon + // remains consistent on all systems. ++IDI_LILYPOND ICON DISCARDABLE "LilyPond.ico" + IDI_CYGWIN ICON DISCARDABLE "cygwin.ico" + + ///////////////////////////////////////////////////////////////////////////// +@@ -305,6 +305,7 @@ + // FILE + // + ++LILYPOND.ICON FILE DISCARDABLE "LilyPond.ico" + CYGWIN.ICON FILE DISCARDABLE "cygwin.ico" + + ///////////////////////////////////////////////////////////////////////////// +@@ -354,7 +355,7 @@ + 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_MIRROR_LST "http://sources.redhat.com/cygwin/mirrors.lst" ++ IDS_MIRROR_LST "http://appel.lilypond.org/lilypond/gnu-windows/mirrors.lst" + 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 -urN ../cinstall/resource.h ./resource.h +--- ../cinstall/resource.h Thu Mar 1 05:55:20 2001 ++++ ./resource.h Sun Apr 8 16:38:11 2001 +@@ -47,11 +47,12 @@ + #define IDB_SPIN 118 + #define IDB_RTARROW 119 + #define IDI_SPIN 120 +-#define IDI_CYGWIN 121 ++#define IDI_LILYPOND 121 + #define IDD_LOCAL_DIR 122 + #define IDB_CHECK_YES 123 + #define IDB_CHECK_NO 124 + #define IDB_CHECK_NA 125 ++#define IDI_CYGWIN 126 + #define IDC_SOURCE_DOWNLOAD 1000 + #define IDC_SOURCE_NETINST 1001 + #define IDC_SOURCE_CWD 1002 diff --git a/Documentation/windows/guile-1.4-gnu-windows.patch b/Documentation/windows/guile-1.4-gnu-windows.patch new file mode 100644 index 0000000000..994091f740 --- /dev/null +++ b/Documentation/windows/guile-1.4-gnu-windows.patch @@ -0,0 +1,85 @@ +diff -urN ../guile-1.4/ChangeLog ./ChangeLog +--- ../guile-1.4/ChangeLog Fri Jun 2 15:17:01 2000 ++++ ./ChangeLog Mon Jun 5 15:18:32 2000 +@@ -1,3 +1,12 @@ ++2000-06-05 ++ ++ * guile-config/cross-guile-config.in: Simple shell script to ++ take over guile-config's functionality for cross-compilation. ++ It will be installed as ${target}-guile-config. ++ ++ * guile-config/Makefile.am: Provide for cross-guile-config.in ++ and its targets. ++ + 2000-06-21 Mikael Djurfeldt + + * Guile 1.4 released. +diff -urN ../guile-1.4/configure.in ./configure.in +--- ../guile-1.4/configure.in Fri Jun 2 08:44:27 2000 ++++ ./configure.in Mon Jun 5 15:13:58 2000 +@@ -21,6 +21,7 @@ + dnl Boston, MA 02111-1307, USA. + + AC_INIT(Makefile.in) ++AC_CANONICAL_SYSTEM + . $srcdir/GUILE-VERSION + AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) + AM_MAINTAINER_MODE +diff -urN ../guile-1.4/guile-config/Makefile.am ./guile-config/Makefile.am +--- ../guile-1.4/guile-config/Makefile.am Wed Jan 12 22:42:41 2000 ++++ ./guile-config/Makefile.am Mon Jun 5 15:17:37 2000 +@@ -20,9 +20,9 @@ + ## to the Free Software Foundation, Inc., 59 Temple Place, Suite + ## 330, Boston, MA 02111-1307 USA + +-bin_SCRIPTS=guile-config +-CLEANFILES=guile-config +-EXTRA_DIST=guile-config.in guile.m4 ++bin_SCRIPTS=guile-config @target@-guile-config ++CLEANFILES=guile-config @target@-guile-config ++EXTRA_DIST=guile-config.in guile.m4 cross-guile-config.in + + ## FIXME: in the future there will be direct automake support for + ## doing this. When that happens, switch over. +@@ -39,6 +39,21 @@ + -e s:@-GUILE_VERSION-@:${GUILE_VERSION}: + chmod +x guile-config.tmp + mv guile-config.tmp guile-config ++ ++LDFLAGS=@LDFLAGS@ ++CFLAGS=@CFLAGS@ ++CPPFLAGS=@CPPFLAGS@ ++ ++@target@-guile-config: cross-guile-config.in ++ rm -f $<.tmp ++ sed < ${srcdir}/$< > $<.tmp \ ++ -e s:@-SHELL-@:${SHELL}: \ ++ -e s:@-GUILE_VERSION-@:${GUILE_VERSION}:\ ++ -e s:@-PREFIX-@:${prefix}: \ ++ -e "s:@-CPPFLAGS-@:${CPPFLAGS}:" \ ++ -e "s:@-LDFLAGS-@:${LDFLAGS}:" ++ chmod +x $<.tmp ++ mv $<.tmp $@ + + ## Get rid of any copies of the configuration script under the old + ## name, so people don't end up running ancient copies of it. +diff -urN ../guile-1.4/guile-config/cross-guile-config.in ./guile-config/cross-guile-config.in +--- ../guile-1.4/guile-config/cross-guile-config.in Thu Jan 1 01:00:00 1970 ++++ ./guile-config/cross-guile-config.in Mon Jun 5 15:13:58 2000 +@@ -0,0 +1,16 @@ ++#!@-SHELL-@ ++# target-guile-config.in ++case $1 in ++ --version) ++ echo "@-GUILE_VERSION-@" ++ exit 0 ++ ;; ++ compile) ++ echo "@-CPPFLAGS-@" ++ exit 0 ++ ;; ++ link) ++ echo "-lguile @-LDFLAGS-@" ++ exit 0 ++ ;; ++esac diff --git a/Documentation/windows/gv.sh b/Documentation/windows/gv.sh new file mode 100644 index 0000000000..8346a38e8e --- /dev/null +++ b/Documentation/windows/gv.sh @@ -0,0 +1,9 @@ +#!/bin/bash +if echo | gsview32 -; then + cat <