From f2a64a1f0774687d6ef6124323fc6099d94b6edb Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 30 May 2006 21:47:32 +0000 Subject: [PATCH] * lily/relocate.cc (read_relocation_dir): Do not blindly dereference DIR. --- ChangeLog | 11 +++++++++++ SConstruct | 1 - buildscripts/builder.py | 2 +- scripts/lilypond-book.py | 7 ++++--- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6305797133..03e4593581 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-30 Jan Nieuwenhuizen + + * lily/relocate.cc (read_relocation_dir): Do not blindly + dereference DIR. + 2006-05-30 Han-Wen Nienhuys * lily/parser.yy: replace THIS by PARSER @@ -52,6 +57,12 @@ 2006-05-30 Jan Nieuwenhuizen + * buildscripts/builder.py: Remove --ly option/target from mf-to-table. + + * scripts/lilypond-book.py: Bugfix: do not blindly attempt + .../current hack if LILYPONDPREFIX is fine. Fixes `scons doc' + build. + * Resurrect `scons lily' build. * SConstruct (symlink_tree): Bugfix: link diff --git a/SConstruct b/SConstruct index e113eda225..3f6f15007b 100644 --- a/SConstruct +++ b/SConstruct @@ -669,7 +669,6 @@ env.Append ( LILYPOND_BOOK = BUILD_LILYPOND_BOOK, LILYPOND_BOOK_FORMAT = 'texi-html', MAKEINFO_FLAGS = '--css-include=$srcdir/Documentation/texinfo.css', - # should not be necessary # PYTHONPATH = ['$absbuild/python/$out'], TEXI2DVI_PAPERSIZE = '@afourpaper', TEXI2DVI_FLAGS = [ '-t$TEXI2DVI_PAPERSIZE'], diff --git a/buildscripts/builder.py b/buildscripts/builder.py index b34877d88f..3caea45830 100644 --- a/buildscripts/builder.py +++ b/buildscripts/builder.py @@ -205,8 +205,8 @@ a = '$PYTHON $MF_TO_TABLE_PY \ --lisp=${TARGET.base}.lisp \ --enc=${TARGET.base}.enc \ --tex=${TARGET.base}.tex \ ---ly=${TARGET.base}list.ly \ ${TARGET.base}.log' +#--ly=${TARGET.base}list.ly \ gtable = Builder (action = a, suffix = '.otf-gtable', src_suffix = '.log', emitter = add_lisp_enc_tex_ly_target) env.Append (BUILDERS = {'GTABLE': gtable}) diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index e288335fbb..486d21fedb 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -58,9 +58,10 @@ sys.path.insert (0, os.path.join (datadir, 'python')) if os.environ.has_key ('LILYPONDPREFIX'): datadir = os.environ['LILYPONDPREFIX'] while datadir[-1] == os.sep: - datadir= datadir[:-1] - - datadir = os.path.join (datadir, "share/lilypond/current/") + datadir = datadir[:-1] + + if not os.path.exists (os.path.join (datadir, 'python/lilylib.py')): + datadir = os.path.join (datadir, 'share/lilypond/current/') sys.path.insert (0, os.path.join (datadir, 'python')) # dynamic relocation, for GUB binaries. -- 2.39.5