* 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.
2003-09-22 Jan Nieuwenhuizen <janneke@gnu.org>
2003-09-22 Jan Nieuwenhuizen <janneke@gnu.org>
+ * cygwin/mknetrel: Remove PYTHONPATH and manpage workarounds.
+
+ * stepmake/stepmake/generic-targets.make:
+ * stepmake/stepmake/bin/make-version.py:
+ * stepmake/aclocal.m4:
- * 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>
2003-09-22 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- 'ss' : ('regular', 'sans'),
'bx': ('bold', 'roman'),
'bxti' : ('bold', 'italic'),
'csc' : ('smallcaps', 'roman'),
'bx': ('bold', 'roman'),
'bxti' : ('bold', 'italic'),
'csc' : ('smallcaps', 'roman'),
cd $build || exit 1
PATH=/bin:/usr/bin:$PATH \
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
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
mkdir -p mf/out
cp -pv mf/out-for-build/* mf/out
fi
- # 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'
}
addmakeflags MAKE_PFA_FILES=1 ' ' LDFLAGS="$cygwin_root/usr/bin/libpython2.3.dll" ' ' 'target=i686-pc-cygwin'
}
cd $src || exit 1
install -d -m755 $inst/$packagedocdir
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
## Cygwin readmes
cygwin=cygwin
"the ideal slope, how close the result is to the ideal stems, etc.). We "
"take the best scoring combination. "
,
"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");
# LilyPond is often run from within $(outdir), making a relative
# PREFIX incorrect.
# 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 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:=
export MFINPUTS:=
export TEXINPUTS:=
+vf = 'VERSION'
+if sys.argv[1:]:
+ vf = sys.argv[1]
+
+f = open (vf)
+ls = f.readlines ()
-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)))
if m:
defs.append ((m.group(1), m.group(2)))
sys.stdout.write ('#define %s "%s"\n' % d)
sys.stdout.write ('#define %s "%s"\n' % d)
if ('MY_PATCH_LEVEL', '') in defs:
sys.stdout.write ('#define NO_MY_PATCHLEVEL')
if ('MY_PATCH_LEVEL', '') in defs:
sys.stdout.write ('#define NO_MY_PATCHLEVEL')
-$(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 $< $@
$(outdir)/config.h: $(config_h)
cp -p $< $@