From: Han-Wen Nienhuys Date: Wed, 17 May 2006 18:09:56 +0000 (+0000) Subject: * config.make.in: add TARGET_PYTHON X-Git-Tag: release/2.8.3~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9c032caa63773d4edefc9d977c7a4d80ca977e8e;p=lilypond.git * config.make.in: add TARGET_PYTHON * lily/key-engraver.cc (create_key): use explicitKeySignatureVisibility on cancellation too. * lily/font-config.cc (init_fontconfig): only close nonNULL file. --- diff --git a/ChangeLog b/ChangeLog index a33ef2fc39..e77b15c750 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-05-17 Han-Wen Nienhuys + + * config.make.in: add TARGET_PYTHON + + * lily/key-engraver.cc (create_key): use + explicitKeySignatureVisibility on cancellation too. + + * lily/font-config.cc (init_fontconfig): only close nonNULL file. + + * scripts/*.py: use TARGET_PYTHON iso PYTHON + 2006-05-09 Graham Percival * Documentation/user/tweaking.itely, advanced-notation.itely: diff --git a/config.make.in b/config.make.in index 8ecbc70b98..55dfaefda3 100644 --- a/config.make.in +++ b/config.make.in @@ -135,6 +135,7 @@ PATHSEP = @PATHSEP@ PERL = @PERL@ PLATFORM_WINDOWS = @PLATFORM_WINDOWS@ PYTHON = @PYTHON@ +TARGET_PYTHON = @PYTHON@ RANLIB = @RANLIB@ ROOTSEP = @ROOTSEP@ SHELL = @SHELL@ diff --git a/lily/font-config.cc b/lily/font-config.cc index 393feb2b6c..b59325f55a 100644 --- a/lily/font-config.cc +++ b/lily/font-config.cc @@ -62,7 +62,8 @@ init_fontconfig () { /* inhibit future messages. */ FILE *f = fopen ((char*)cache_file, "w"); - fclose (f); + if (f) + fclose (f); } } diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index f46717fb91..5e7f2a5980 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -106,6 +106,8 @@ Key_engraver::create_key (bool is_default) { SCM visibility = get_property ("explicitKeySignatureVisibility"); item_->set_property ("break-visibility", visibility); + if (cancellation_) + cancellation_->set_property ("break-visibility", visibility); } } @@ -204,7 +206,19 @@ ADD_TRANSLATOR (Key_engraver, /* doc */ "", /* create */ "KeySignature", /* accept */ "key-change-event", - /* read */ "keySignature printKeyCancellation lastKeySignature " - "explicitKeySignatureVisibility createKeyOnClefChange " - "keyAlterationOrder keySignature", - /* write */ "lastKeySignature tonic keySignature"); + /* read */ + + "createKeyOnClefChange " + "explicitKeySignatureVisibility " + "keyAlterationOrder " + "keySignature " + "keySignature " + "lastKeySignature " + "printKeyCancellation " + , + + /* write */ + "keySignature " + "lastKeySignature " + "tonic " + ); diff --git a/make/substitute.make b/make/substitute.make index 1fe34a194f..fc175ece72 100644 --- a/make/substitute.make +++ b/make/substitute.make @@ -19,6 +19,7 @@ ATVARIABLES = \ PERL\ PYTHON\ SHELL\ + TARGET_PYTHON \ TOPLEVEL_VERSION\ bindir\ datadir\ diff --git a/python/lilylib.py b/python/lilylib.py index 5ce5b29848..9c4591b617 100644 --- a/python/lilylib.py +++ b/python/lilylib.py @@ -14,15 +14,7 @@ import shutil import string import sys import optparse -import subprocess -## windows mingw cross compile doesn't have selectmodule.so -have_fcntl = True -try: - import fcntl -except ImportError: - have_fcntl = False - ################################################################ # Users of python modules should include this snippet # and customize variables below. @@ -46,8 +38,6 @@ if os.environ.has_key ('LILYPONDPREFIX') : sys.path.insert (0, os.path.join (datadir, 'python')) - - localedir = '@localedir@' try: import gettext @@ -68,10 +58,12 @@ def command_name (cmd): return os.path.basename (cmd) def system (cmd, - ignore_error=False, - progress_p=True, - be_verbose=False, - log_file=None): + ignore_error=False, + progress_p=True, + be_verbose=False, + log_file=None): + + import subprocess show_progress= progress_p name = command_name (cmd) diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index 1257182f71..ebcfad98bc 100644 --- a/scripts/abc2ly.py +++ b/scripts/abc2ly.py @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@TARGET_PYTHON@ # -*- coding: utf-8 -*- # once upon a rainy monday afternoon. # diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 5393ea3c76..c4c1e74082 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@TARGET_PYTHON@ # # convert-ly.py -- Update old LilyPond input files (fix name?) # diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py index 18a33a4324..6bbc78ada5 100644 --- a/scripts/etf2ly.py +++ b/scripts/etf2ly.py @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@TARGET_PYTHON@ # info mostly taken from looking at files. See also # http://lilypond.org/wiki/?EnigmaTransportFormat diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 24b5d0384a..f8579a8a71 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@TARGET_PYTHON@ ''' Example usage: diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py index c61cce84ed..e1dedcdde6 100644 --- a/scripts/midi2ly.py +++ b/scripts/midi2ly.py @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@TARGET_PYTHON@ # # msdi2ly.py -- LilyPond midi import script # diff --git a/scripts/musicxml2ly.py b/scripts/musicxml2ly.py index b3a1ccb46d..65ebd3c55a 100644 --- a/scripts/musicxml2ly.py +++ b/scripts/musicxml2ly.py @@ -1,4 +1,4 @@ -#!@PYTHON@ +#!@TARGET_PYTHON@ import optparse import sys