From: Jan Nieuwenhuizen Date: Mon, 11 Apr 2005 08:49:44 +0000 (+0000) Subject: * lily/main.cc (setup_paths): Update. X-Git-Tag: release/2.5.19~22 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=aa95034142df28e67d4b9b90bac9f308cdb99d31;hp=090125fa1a03c1d72835450deb120ee4223177e0;p=lilypond.git * lily/main.cc (setup_paths): Update. * stepmake/bin/make-version.py (defs): Add TOPLEVEL_VERSION define.. * config.hh.in (LILYPOND_DATADIR): Remove TOPLEVEL_VERSION. * scripts/convert-ly.py (\markup): Fix too simplistic regexps. Add \line for some simplistic cases. --- diff --git a/ChangeLog b/ChangeLog index 110f261e92..c3d6805f5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2005-04-11 Jan Nieuwenhuizen + + Fix ./VERSION dependency, and without need to reconfigure. + + * lily/main.cc (setup_paths): Update. + + * stepmake/bin/make-version.py (defs): Add TOPLEVEL_VERSION define.. + + * config.hh.in (LILYPOND_DATADIR): Remove TOPLEVEL_VERSION. + + * scripts/convert-ly.py (\markup): Fix too simplistic regexps. + Add \line for some simplistic cases. + + * lily/GNUmakefile (main.o): Add missing dependency on version.hh. + 2005-04-10 Nicolas Sceaux * elisp/lilypond-mode.el (LilyPond-lilypond-command): command used diff --git a/GNUmakefile.in b/GNUmakefile.in index 48dd4f1e3d..ebd654aeb7 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -18,8 +18,8 @@ SUBDIRS = buildscripts python scripts \ vim # -include VERSION -package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` +#include VERSION +#package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh Doxyfile README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING @@ -154,7 +154,7 @@ local-clean: builddir-setup-clean builddir-setup-clean: cd $(builddir) && rm -rf share -$(config_h): config.hh.in +$(config_h): config.hh.in # # this is to prevent people from getting # undefined symbols when we add them to config.h.in, diff --git a/config.hh.in b/config.hh.in index 77abe5c57e..2e453ad989 100644 --- a/config.hh.in +++ b/config.hh.in @@ -5,12 +5,7 @@ /* datadir */ #define DATADIR "@DATADIR@" -#define TOPLEVEL_VERSION "@TOPLEVEL_VERSION@" - -/* LilyPond init and input base directory */ - -#define PACKAGE_DATADIR DATADIR "/" PACKAGE "/" TOPLEVEL_VERSION -#define LILYPOND_DATADIR PACKAGE_DATADIR +#define PACKAGE_DATADIR DATADIR "/" PACKAGE /* default lilypond locale dir */ #define LOCALEDIR "@LOCALEDIR@" diff --git a/config.make.in b/config.make.in index b8705376af..35653f50de 100644 --- a/config.make.in +++ b/config.make.in @@ -42,28 +42,31 @@ elispdir = $(datadir)/emacs/site-lisp # forced instead of $(datadir)/vim # move out of config.make.in? + +# FIXME: naming scheme has been broken +# package_ is supposed to be '.../lilypond', while +# local_ means: .../lilypond-x.y.z or .../lilypond/x.y.z + package_suffix = $(package)/$(TOPLEVEL_VERSION) package_datadir = $(datadir)/$(package_suffix) package_infodir = $(infodir)/$(package_suffix) package_libdir = $(libdir)/$(package_suffix) + +# FIXME: docdir using /version/? package_docdir = $(docdir)/$(package_suffix) package_omfdir = $(omfdir)/$(package_suffix) - -local_package_datadir = $(lilypond_datadir) +local_package_datadir = $(package_datadir)/$(TOPLEVEL_VERSION) local_package_libdir = $(lilypond_libdir) local_package_docdir = $(lilypond_docdir) local_package_omfdir = $(lilypond_omfdir) -vimdir = $(local_package_datadir)/vim - -lilypond_datadir = $(package_datadir) lilypond_libdir = $(package_libdir) lilypond_docdir = $(package_docdir) lilypond_omfdir = $(package_omfdir) -local_lilypond_datadir = $(local_package_datadir) -local_lilypond_libdir = $(local_package_libdir) +lilypond_datadir = $(package_datadir)/$(TOPLEVEL_VERSION) +vimdir = $(lilypond_datadir)/vim BASH = @BASH@ BISON = @BISON@ diff --git a/lily/main.cc b/lily/main.cc index ef8f60679f..1c07a79828 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -156,6 +156,8 @@ static Long_option_init options_static[] {0, 0, 0, 0} }; +#define LILYPOND_DATADIR PACKAGE_DATADIR "/" TOPLEVEL_VERSION + static void dir_info (FILE *out) { diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 2063ba26db..023f4573f2 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -2354,12 +2354,17 @@ conversions.append (((2, 5, 1), 'ly:import-module -> ly:module-copy')) def conv (str): - str = re.sub (r'\\(column|fill-line|dir-column|center-align|right-align|left-align|bracketed-y-column)\s*<([^<]*)>', + str = re.sub (r'\\(column|fill-line|dir-column|center-align|right-align|left-align|bracketed-y-column)\s*<(([^>]|<[^>]*>)*)>', r'\\\1 {\2}', str) - str = re.sub (r'\\(column|fill-line|dir-column|center-align|right-align|left-align|bracketed-y-column)\s*<([^<]*)>', + str = re.sub (r'\\(column|fill-line|dir-column|center-align|right-align|left-align|bracketed-y-column)\s*<(([^>]|<[^>]*>)*)>', r'\\\1 {\2}', str) - str = re.sub (r'\\(column|fill-line|dir-column|center-align|right-align|left-align|bracketed-y-column)\s*<([^<]*)>', + str = re.sub (r'\\(column|fill-line|dir-column|center-align|right-align|left-align|bracketed-y-column)\s*<(([^>]|<[^>]*>)*)>', r'\\\1 {\2}', str) + def get_markup (m): + s = m.group (0) + s = re.sub (r'''((\\"|})\s*){''', '\2 \\line {', s) + return s + str = re.sub (r'\\markup\s*{([^}]|{[^}]*})*}', get_markup, str) return str conversions.append (((2, 5, 2), diff --git a/stepmake/bin/make-version.py b/stepmake/bin/make-version.py index 3c7089db81..f5fc59afac 100644 --- a/stepmake/bin/make-version.py +++ b/stepmake/bin/make-version.py @@ -2,43 +2,44 @@ import re import sys - -vf = 'VERSION' -if sys.argv[1:]: - vf = sys.argv[1] - -f = open (vf) -ls = f.readlines () -mypatch = 0 +PROGRAM = sys.argv[0] +VERSION = sys.argv[1] defs = [] -for l in ls: - l = re.sub ('#.*','', l) - m = re.search ('([^ =]*)[\t ]*=[ \t]*([^ \t]*)[ \t]*\n', l) +for i in open (VERSION).readlines (): + i = re.sub ('#.*','', i) + m = re.search ('([^ =]*)[\t ]*=[ \t]*([^ \t]*)[ \t]*\n', i) if m: - defs.append ((m.group(1), m.group(2))) - + defs.append ((m.group (1), m.group (2))) sys.stdout.write (r''' +/* + Automatically generated from %(VERSION)s + by %(PROGRAM)s. +*/ #ifndef VERSION_HH #define VERSION_HH -/* automatically generated */ - - -''') -for d in defs: +''' % vars ()) +for name, expansion in defs: # GUILE leaks autoconf data into userspace. - sys.stdout.write ('#ifdef %s\n' % d[0]) - sys.stdout.write ('#undef %s\n' % d[0]) - sys.stdout.write ('#endif /* %s */\n' % d[0]) - - sys.stdout.write ('#define %s "%s"\n' % d) + sys.stdout.write (r''' +#ifdef %(name)s +#undef %(name)s +#endif /* %(name)s */ +#define %(name)s "%(expansion)s" +''' % vars ()) - if ('MY_PATCH_LEVEL', '') in defs: - sys.stdout.write ('#define NO_MY_PATCHLEVEL') + sys.stdout.write (r''' +#define NO_MY_PATCHLEVEL +#define TOPLEVEL_VERSION MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL +''') +else: + sys.stdout.write (r''' +#define TOPLEVEL_VERSION MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL "." MY_PATCH_LEVEL +''') sys.stdout.write(r''' -#endif +#endif /* VERSION_HH */ ''') diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make index 272fa15392..7f72066955 100644 --- a/stepmake/stepmake/generic-targets.make +++ b/stepmake/stepmake/generic-targets.make @@ -100,7 +100,7 @@ local-tags: $(ERROR_LOG) ; \ fi -$(outdir)/version.hh: $(depth)/VERSION $(config_make) +$(outdir)/version.hh: $(depth)/VERSION $(config_make) $(step-bindir)/make-version.py $(PYTHON) $(step-bindir)/make-version.py $< > $@ $(outdir)/config.hh: $(config_h)