* 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 110f261e92974d7bada6f2d6f816be3f33a9c88f..c3d6805f5b59865d26978b42f7ac94dbd35c8978 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2005-04-11  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       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  <nicolas.sceaux@free.fr>
 
        * elisp/lilypond-mode.el (LilyPond-lilypond-command): command used

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 48dd4f1e3d5e7dc17f3f1572d06fc5ac9836e7fa..ebd654aeb769f67642c7fd609a51a77ad43112c0 100644 (file)
--- 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 77abe5c57e234fc5fcf49d60b98bc8c3af2f6ac9..2e453ad98980c67d6ba70f63dbd3c81bfd9c9739 100644 (file)
--- 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 b8705376afdb9a6386739b36b2a35579a4019d26..35653f50deb084d02f1fc49aa769d6500f04d950 100644 (file)
--- 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 ef8f60679f1a6ccdc635c41871f2d233933102cb..1c07a79828506fdf362fed9bb95618b449e3ccf2 100644 (file)
--- 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 2063ba26db269b4aeaa24d75308403b49a59dafb..023f4573f2547288919db6fae25259d0a2d5a4e0 100644 (file)
--- 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 3c7089db81f6fb0ccac8c409c8f5f2225b215616..f5fc59afacce0a14c2878e218afbf9b65563212a 100644 (file)
--- 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 272fa15392a6650743abc12171469f441cb72656..7f7206695529d0cf3c3a42b714b06718fa623c06 100644 (file)
--- 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)