* cygwin/mknetrel: Remove PYTHONPATH and manpage workarounds.

* stepmake/stepmake/generic-targets.make:
* stepmake/stepmake/bin/make-version.py:
* stepmake/aclocal.m4:
* make/stepmake.make:
* make/toplevel-version.make: Build fixes: remove last traces of
  VERSION/PACKAGE_NAME/LILYPONDPREFIX experiment.

* lily/beam.cc: Add gap-count property.

diff --git a/ChangeLog b/ChangeLog
index 52ae0efd06172f4d21eceb2c6b274edc58b4088f..5bda96224b6714e3305cbed3750916fd98d83d9e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
 2003-09-22  Jan Nieuwenhuizen  <janneke@gnu.org>
 
-       * stepmake/aclocal.m4: 
+       * cygwin/mknetrel: Remove PYTHONPATH and manpage workarounds.
+
+       * stepmake/stepmake/generic-targets.make:
+       * stepmake/stepmake/bin/make-version.py: 
+       * stepmake/aclocal.m4:
        * make/stepmake.make:
-       * make/toplevel-version.make: Revert/fix VERSION/PACKAGE stuff.
+       * make/toplevel-version.make: Build fixes: remove last traces of
+         VERSION/PACKAGE_NAME/LILYPONDPREFIX experiment.
+
+       * lily/beam.cc: Add gap-count property.
 
 2003-09-22  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 

diff --git a/buildscripts/make-font-dir.py b/buildscripts/make-font-dir.py
index 4397bdba8c34c00ae7f949509b4c3aa05d98d8bf..21da1906ead0bb2356e92f37b97e710b45d425c2 100644 (file)
--- a/buildscripts/make-font-dir.py
+++ b/buildscripts/make-font-dir.py
@@ -51,7 +51,6 @@ def read_afm_file (filename):
 
 class Font_info:
        cm = {
-               'ss' : ('regular', 'sans'),
                'bx': ('bold', 'roman'),
                'bxti' : ('bold', 'italic'),
                'csc' : ('smallcaps', 'roman'),

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index d4b49c9598349c867f2cc5a2920ebc304538c978..03529b8b286b3171333eff63ac077aaca2edebf8 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -97,16 +97,8 @@ prebuild () {
        cd $build || exit 1
 
        PATH=/bin:/usr/bin:$PATH \
-           PYTHONPATH=$build/python/out-for-build:$PYTHONPATH \
            make conf=for-build all doc web || exit 1
        
-        # as of 1.9.9, this should no longer be necessary:
-       for i in $(find . -path ".*out-for-build/*.1"); do
-           o=$(dirname $(dirname $i))/out
-           mkdir -p $o
-           cp -pv $i $o/$(basename $i)
-       done
-
        mkdir -p mf/out
        cp -pv mf/out-for-build/* mf/out
     fi
@@ -116,14 +108,6 @@ prebuild () {
 
 preinstall () {
 
-    # cross-compiling: fix manual pages
-    if ! iscygwin; then
-        # as of 1.9.9, this should no longer be necessary:
-       cd $build || exit 1
-       cp -v scripts/out-for-build/midi2ly.1 scripts/out
-       cp -v lily/out-for-build/lilypond.1 lily/out
-    fi
-    
     addmakeflags MAKE_PFA_FILES=1 ' ' LDFLAGS="$cygwin_root/usr/bin/libpython2.3.dll" ' ' 'target=i686-pc-cygwin'
 }
 
@@ -140,8 +124,12 @@ postinstall () {
     cd $src || exit 1
     install -d -m755 $inst/$packagedocdir
 
-    ## Generic READMEs
-    find . -maxdepth 1 -type f -exec cp -pv \{\} $inst/$packagedocdir \;
+    ## Generic READMEs -- too crude!
+    ## find . -maxdepth 1 -type f -exec install -m644 \{\} \
+    ##   $inst/$packagedocdir \;
+    
+    install -m644 AUTHORS.txt COPYING ChangeLog DEDICATION INSTALL.txt \
+       NEWS.txt README.txt THANKS VERSION $inst/$packagedocdir
 
     ## Cygwin readmes
     cygwin=cygwin

diff --git a/lily/beam.cc b/lily/beam.cc
index 27e604856a219f3a69d808d595f2ab964fa3380e..3ab8587d7a10e012c43200c71252ff593c654f15 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -1556,6 +1556,6 @@ ADD_INTERFACE (Beam, "beam-interface",
 "the ideal slope, how close the result is to the ideal stems, etc.). We "
 "take the best scoring combination. "
 ,
-  "knee position-callbacks concaveness-gap concaveness-threshold dir-function quant-score auto-knee-gap gap chord-tremolo beamed-stem-shorten shorten least-squares-dy damping flag-width-function neutral-direction positions space-function thickness");
+  "knee position-callbacks concaveness-gap concaveness-threshold dir-function quant-score auto-knee-gap gap gap-count chord-tremolo beamed-stem-shorten shorten least-squares-dy damping flag-width-function neutral-direction positions space-function thickness");
 
 

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index c967da8063949c8daa2c30105943f0579fad03a0..0b8613180dd30f8f369bcb343eab5bd151cb2cf2 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -6,12 +6,12 @@ export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfb
 
 # LilyPond is often run from within $(outdir), making a relative
 # PREFIX incorrect.
-export LILYPONDPREFIX:=$(build_lilypond_datadir)/lilypond
+export LILYPONDPREFIX:=$(build_lilypond_datadir)
 
 export PYTHONPATH:=$(builddir)/python/$(outconfbase):$(PYTHONPATH)
 
 ## arg, TEXINPUTS, TFMFONTS, MFINPUTS may still override and thus break this
-export TEXMF:={$(build_lilypond_datadir),$(shell kpsexpand \$$TEXMF)}
+export TEXMF:={$(LILYPONDPREFIX),$(shell kpsexpand \$$TEXMF)}
 
 export MFINPUTS:=
 export TEXINPUTS:=

diff --git a/stepmake/bin/make-version.py b/stepmake/bin/make-version.py
index 7888a7d0c1877f51c111d0e0305514efc2f65a9f..3c7089db81f6fb0ccac8c409c8f5f2225b215616 100644 (file)
--- a/stepmake/bin/make-version.py
+++ b/stepmake/bin/make-version.py
@@ -1,13 +1,19 @@
 
 import re
 import sys
-import getopt
 
 
+vf = 'VERSION'
+if sys.argv[1:]:
+       vf = sys.argv[1]
+
+f = open (vf)
+ls = f.readlines ()
 mypatch = 0
 defs = []
-for a in sys.argv[1:]:
-       m  = re.search ('([^ =]+)=([^ \t]*)', a)
+for l in ls:
+       l = re.sub ('#.*','', l)
+       m  = re.search ('([^ =]*)[\t ]*=[ \t]*([^ \t]*)[ \t]*\n', l)
        if m:
                defs.append ((m.group(1), m.group(2)))
 
@@ -28,6 +34,7 @@ for d in defs:
        
        sys.stdout.write ('#define %s "%s"\n' % d)
        
+
 if ('MY_PATCH_LEVEL', '') in defs:
        sys.stdout.write ('#define NO_MY_PATCHLEVEL')
 

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index f24d3a0182595f10f731db1fcb778297093c7bd1..603ffa13757e31ae139a60ebd6fc31e47d92b770 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -95,13 +95,8 @@ TAGS:
 
        $(LOOP)
 
-$(outdir)/version.hh: $(config_make) $(depth)/VERSION
-       $(PYTHON) $(step-bindir)/make-version.py PACKAGE_NAME=$(PACKAGE_NAME) \
-               MAJOR_VERSION=$(MAJOR_VERSION) \
-               MINOR_VERSION=$(MINOR_VERSION) \
-               PATCH_LEVEL=$(PATCH_LEVEL) \
-               MY_PATCH_LEVEL=$(MY_PATCH_LEVEL) \
-               > $@
+$(outdir)/version.hh: $(depth)/VERSION $(config_make)
+       $(PYTHON) $(step-bindir)/make-version.py $< > $@
 
 $(outdir)/config.h: $(config_h)
        cp -p $< $@