-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.
@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.
@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
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.
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
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" $*
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.
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')
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)
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'
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'