From: Jan Nieuwenhuizen <janneke@gnu.org> Date: Tue, 14 Aug 2001 15:47:31 +0000 (+0200) Subject: patch::: 1.5.6.jcn2 X-Git-Tag: release/1.5.7~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8140ce8ca971b24fc8d4a287406f694da2b29e8c;p=lilypond.git patch::: 1.5.6.jcn2 1.5.6.jcn2 --- diff --git a/CHANGES b/CHANGES index 3a965fee61..c31ac0c088 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ -1.5.6.jcn1 +1.5.6.jcn2 ========= + +* Use Cygwin included Python; drop Windows Python and workarounds. * Include make/lilypond.mandrake.spec (unchecked!) and README.mandrake. diff --git a/Documentation/windows/compiling.texi b/Documentation/windows/compiling.texi index 8332a24e1d..d7eefd8d7d 100644 --- a/Documentation/windows/compiling.texi +++ b/Documentation/windows/compiling.texi @@ -71,9 +71,7 @@ We think it's silly, but do this is on special request of Windows users. @item @file{fix-suffixes.sh} Add @file{.exe} to binary executables, add @file{.py} to Python scripts. @item @file{python-wrapper.sh} -All python scripts get a wrapper script to make direct invocation easier -and to change file paths to DOS style, which is needed by non-Cygwin -Python, that's currently used. +All python scripts get a wrapper script to make direct invocation easier. @item @file{latex-wrapper.sh} TeX and LaTeX get a wrapper script that changes the TEX path variables to DOS style, which is needed by non-Cygwin TeX, that's currently used. diff --git a/Documentation/windows/installing.texi b/Documentation/windows/installing.texi index a06bc0e476..18f9949792 100644 --- a/Documentation/windows/installing.texi +++ b/Documentation/windows/installing.texi @@ -18,7 +18,7 @@ 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 +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 @@ -32,9 +32,9 @@ 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, -Python and GSView from this installer, which is recommended. If you -choose to install these by hand (see below), make sure to install them +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. @@ -138,13 +138,6 @@ Click @uref{ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs650/gs650w32.exe or visit the @uref{http://www.cs.wisc.edu/~ghost/,Ghostscript, Ghostview and GSview site}. -@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}. - -We have not tried using newer versions than 1.5.2. - @end table diff --git a/Documentation/windows/python-wrapper.sh b/Documentation/windows/python-wrapper.sh index 57bff4ea1d..2b49c87e84 100644 --- a/Documentation/windows/python-wrapper.sh +++ b/Documentation/windows/python-wrapper.sh @@ -5,9 +5,9 @@ if echo | python - >/dev/null 2>&1; then echo else cat <<EOF -Python not found. Install python-1.5.2 from www.python.org. +Python not found. Install python-2.1-1 from http://cygwin.com Make sure python.exe in in your PATH EOF exit 1 fi -python "$(cygpath -w ""@prefix@/bin/@name@.py"")" $* +python "@prefix@/bin/@name@.py" $* diff --git a/VERSION b/VERSION index bf480a3bcb..af67bd19bc 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=6 -MY_PATCH_LEVEL=jcn1 +MY_PATCH_LEVEL=jcn2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 63ded478b5..702c961171 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -179,10 +179,7 @@ Distributed under terms of the GNU General Public License. It comes with NO WARRANTY.''')) sys.stdout.write ('\n') -if ( os.name == 'posix' ): - errorport=sys.stderr -else: - errorport=sys.stdout +errorport=sys.stderr def progress (s): errorport.write (s + '\n') @@ -297,11 +294,6 @@ def system (cmd, ignore_error = 0): Exit status of CMD """ - if ( os.name != 'posix' ): - cmd = re.sub (r'''\\''', r'''\\\\\\''', cmd) - cmd = "sh -c \'%s\'" % cmd - - if verbose_p: progress (_ ("Invoking `%s\'") % cmd) st = os.system (cmd) @@ -577,7 +569,7 @@ None cmd = 'latex \\\\nonstopmode \\\\input %s' % latex_fn - if not verbose_p and os.name == 'posix': + if not verbose_p: progress ( _("Running %s...") % 'LaTeX') cmd = cmd + ' 1> /dev/null 2> /dev/null' @@ -602,7 +594,7 @@ None. cmd = 'dvips %s -o%s %s' % (opts, outbase + '.ps', outbase + '.dvi') - if not verbose_p and os.name == 'posix': + if not verbose_p: progress ( _("Running %s...") % 'dvips') cmd = cmd + ' 1> /dev/null 2> /dev/null'