From 74d1cd49cf0bfdd9f78cd7f4d7ac763b11ac541b Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Mon, 22 Sep 2003 20:08:12 +0000 Subject: [PATCH] * 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. --- ChangeLog | 11 +++++++++-- buildscripts/make-font-dir.py | 1 - cygwin/mknetrel | 24 ++++++------------------ lily/beam.cc | 2 +- make/lilypond-vars.make | 4 ++-- stepmake/bin/make-version.py | 13 ++++++++++--- stepmake/stepmake/generic-targets.make | 9 ++------- 7 files changed, 30 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52ae0efd06..5bda96224b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,15 @@ 2003-09-22 Jan Nieuwenhuizen - * 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 diff --git a/buildscripts/make-font-dir.py b/buildscripts/make-font-dir.py index 4397bdba8c..21da1906ea 100644 --- 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 d4b49c9598..03529b8b28 100644 --- 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 27e604856a..3ab8587d7a 100644 --- 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 c967da8063..0b8613180d 100644 --- 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 7888a7d0c1..3c7089db81 100644 --- 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 f24d3a0182..603ffa1375 100644 --- 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 $< $@ -- 2.39.5