-1.5.9.jcn2
+1.5.9.jcn3
==========
+* add-html-footer.py: use html <title> as fallback title for pages
+where @WEB-TITLE@ is not defined.
+
+* Bugfix: stepmake: don't go building executables all over the place,
+if NAME is set in environment. Some cleanups.
+
* add-html-footer.py: remove href to self. Substitute @at-variables@
defined in html comments. Any occurrence of
MAJOR_VERSION=1
MINOR_VERSION=5
PATCH_LEVEL=9
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
-# title makefile for lilypond
-# file lily/Makefile
depth = ..
--- /dev/null
+
+$(outdir)/%.afm: %.af
+ grep '[[:cntrl:]]' $< | sed 's/^[[:cntrl:]] *//' > $@
+# grep '[[:cntrl:]]' $< | sed 's/^. *//' > $@
--- /dev/null
+AF_FILES := $(wildcard *.af)
+EXTRA_DIST_FILES += $(AF_FILES)
-# mf/Makefile
-
depth = ..
-STEPMAKE_TEMPLATES=metafont metapost asciifont install install-out
+STEPMAKE_TEMPLATES=metafont metapost install install-out
+LOCALSTEPMAKE_TEMPLATES=asciifont
include $(depth)/make/stepmake.make
AF_FILES = $(wildcard *.af)
-# bin/Makefile
-
depth = ..
SEXECUTABLES=convert-ly lilypond-book ly2dvi abc2ly as2text etf2ly musedata2ly pmx2ly mup2ly
m = re.match ('.*?(<a href="[\./]*' + self_url + '#?[^"]*">)([^<]*)(</a>)',
s, re.DOTALL)
while m:
- sys.stderr.write ('self: %s\n' % m.group (2))
+ #sys.stderr.write ('self: %s\n' % m.group (2))
s = s[:m.start (1)] + m.group (2) + s[m.end (3):]
m = re.match ('.*?(<a href="[\./]*' + self_url + '#?[^"]*">)([^<]*)(</a>)',
s, re.DOTALL)
m = re.match ('.*?<!-- (@[a-zA-Z0-9_-]*@)=(.*?) -->', s, re.DOTALL)
# urg
- s = re.sub ('@WEB-TITLE@', '-- --', s)
+ # maybe find first node?
+ fallback_web_title = '-- --'
+ m = re.match ('.*?<title>\(.*?\)</title>', s, re.DOTALL)
+ if m:
+ fallback_web_title = m.group (1)
+ s = re.sub ('@WEB-TITLE@', fallback_web_title, s)
s = remove_self_ref (s)
-# WHAT THE FUCK IS THIS DOING IN STEPMAKE???
-
-$(outdir)/%.afm: %.af
- grep '[[:cntrl:]]' $< | sed 's/^[[:cntrl:]] *//' > $@
-# grep '[[:cntrl:]]' $< | sed 's/^. *//' > $@
-AF_FILES := $(wildcard *.af)
-EXTRA_DIST_FILES += $(AF_FILES)
-# title C++ rules
-# file make/C++_rules.make
-
.SUFFIXES: .cc .o .hh .yy .ll .dep
# compile rules:
-# stepmake/C_rules.make
-
.SUFFIXES: .c .o .h .y .l .dep
$(outdir)/%.o: %.c
-
# header files:
H_FILES := $(wildcard *.h)
C_FILES := $(wildcard *.c)
-# Docrules.make
-
# special rules for the documentation section.
# There are too many to add to the general rules
-# Documentation files
AT_FILES = $(BLURBS) #
at-dir = $(doc-dir)/
at-ext = .in
-# Executable.make
-
-# dependency list of executable:
-#
-
default: $(EXECUTABLE)
$(EXECUTABLE): $(outdir)/config.h $(O_FILES) $(outdir)/version.hh
$(foreach a, $(SEXECUTABLES), rm -f $(bindir)/$(a) &&) true
-# Piss off. Use MODULE_LIBS
-#
-# UGH. fucks up if $(outdir) not created.
-#
-#%/$(outdir)/library.a:
-# $(MAKE) -C $(dir $@)/.. default
-# empty
LDFLAGS = $(ILDFLAGS) $(EXTRA_LDFLAGS) $(MODULE_LDFLAGS) $($(PACKAGE)_LDFLAGS)
## urg, silly name: library.a
MODULE_LIBES =$(addprefix $(outdir)/../, $(addsuffix /$(outbase)/library.a, $(MODULE_LIBS)))
LOADLIBES = $(MODULE_LIBES) $($(PACKAGE)_LIBES) $(EXTRA_LIBES)
+
+EXECUTABLE = $(outdir)/$(NAME)
+EXECUTABLES = $(notdir $(EXECUTABLE))
+
+
-# Files.make
-
-
-
-DEP_FILES := $(wildcard $(outdir)/*.dep)
-
-# (Why not Makefile too?)
-#
-#
-
-IN_FILES := $(wildcard *.in)
-SOURCE_FILES += $(IN_FILES)
-
-# Preprocessed .in documentation _FILES:
-#
-OUTIN_FILES = $(addprefix $(outdir)/, $(IN_FILES:%.in=%))
-#
-
-ALL_SOURCES = $(SOURCE_FILES)
-
-# title generic make rules
-# file make/Rules.make
-
-# this is supposed to clear all suffixes:
-.SUFFIXES:
-
-
-
$(outdir)/%: %.m4
$(M4) $< > $@
-# title generic make targets
-# file make/Targets.make
-
.PHONY : all clean config default diff dist doc exe help html lib TAGS\
po
Note that all commands recurse into SUBDIRS;\n\
prepend \`local-' to do only cwd, eg: local-clean\n\
"\
-#
local-help:
$(foreach i, $(EXTRA_DOC_FILES),\
cp -r $(i) $(prefix)/doc/$(package) &&) true
-include $(stepdir)/package.make
-
include $(outdir)/dummy.dep $(DEP_FILES)
$(outdir)/dummy.dep:
@echo "************************************************************"
(cd $(depth); ./config.status)
touch $@ # do something for multiple simultaneous configs.
+
+
+deb:
+ $(MAKE) -C $(depth)/debian
+ cd $(depth) && debuild
+
+diff:
+ $(PYTHON) $(step-bindir)/package-diff.py --outdir=$(topdir)/$(outdir) --package=$(topdir) $(makeflags)
+ -ln -f $(depth)/$(outdir)/$(distname).diff.gz $(patch-dir)
+
+release:
+ $(PYTHON) $(step-bindir)/release.py --outdir=$(topdir)/$(outdir) --package=$(topdir)
+
+rpm: $(depth)/$(package-icon) dist
+ @echo "Assuming Red Hat system" #FIXME: check distro, then issue rpm
+ $(MAKE) -C $(depth)/make
+ cd $(depth) && rmp -bb make/$(outdir)/lilypond.redhat.spec
+# su -c 'rpm -tb $(depth)/$(outdir)/$(distname).tar.gz'
+
-# title generic variables
-# file make/Variables.make
-#
-# do not change this file for site-wide extensions; please use
-# make/$(outdir)/Site.make;
-#
-# Any change in files in this directory (make/) would be distributed, if
-# you do make dist
-
# directory names:
# depth from group-dir
DODEP=rm -f $(depfile); DEPENDENCIES_OUTPUT="$(depfile) $(outdir)/$(notdir $@)"
#
-
-# generic target names:
-#
-ifdef NAME
-EXECUTABLE = $(outdir)/$(NAME)
-else
-EXECUTABLE =
-endif
-
-EXECUTABLES = $(notdir $(EXECUTABLE))
-
-
#
#replace to do stripping of certain objects
ETAGS_FLAGS= # -CT
CTAGS_FLAGS=-h
-include $(stepdir)/files.make
+makeflags=$(patsubst %==, %, $(patsubst ---%,,$(patsubst ----%,,$(MAKEFLAGS:%=--%))))
+
+DEP_FILES := $(wildcard $(outdir)/*.dep)
+
+IN_FILES := $(wildcard *.in)
+SOURCE_FILES += $(IN_FILES)
+
+# Preprocessed .in documentation _FILES:
+OUTIN_FILES = $(addprefix $(outdir)/, $(IN_FILES:%.in=%))
+
+ALL_SOURCES = $(SOURCE_FILES)
+
-# Include.make
-
-
-
-
-
-# install-out-targets.make
local-install: local-install-files local-install-outfiles
-# install-out.sub.make
include $(depth)/make/stepmake.make
include $(stepdir)/install-out-targets.make
-# install-targets.make
local-install: local-install-files local-install-outfiles
-# install.sub.make
include $(depth)/make/stepmake.make
include $(stepdir)/install-targets.make
-# dependency list of library:
-#
-
default: $(LIBRARY)
-
spec: $(OUTSPEC_FILES)
$(OUTSPEC_FILES): $(depth)/VERSION
-
-# stepmake/makedir.shared.make
-# urg: stuff shared between yodl/lily/stepmake
-
MAKE_FILES := $(wildcard *.make)
LSM_FILES:= $(wildcard *.lsm.in)
OUTLSM_FILES=$(addprefix $(outdir)/,$(basename $(LSM_FILES)))
-# Manual.make
-
-MANGROFF = $(addprefix $(outdir)/, $(addsuffix .$(SECTION)))
-
-local-install: $(MANGROFFS)
- -$(INSTALL) -d $(mandir)/man$(SECTION)
- $(INSTALL) -m 644 $(MANGROFFS) $(mandir)/man$(SECTION)
-
-
-local-uninstall:
- (cd $(mandir)/man$(SECTION)/; rm -f $(MANGROFF))
-
-
-
-
-
tfm: $(TFM_FILES)
dvi: $(DVI_FILES)
-
# Don't remove $(outdir)/.log's. Logs are a target!
$(outdir)/%.0: %.mf $(outdir)/mfplain.mem
-# stepmake/Package.make
-
-deb:
-# $(MAKE) -C $(depth)/debian
- @echo The \"deb\" target is deprecated.
- @echo Please install the appropriate Debian packages:
- @echo
- @echo " apt-get install task-debian-devel"
- @echo
- @echo and then run \"debuild\" in the lilypond directory.
-
-# urg
-#(cd $(depth)/../debian/$(distname); \
-# ln -sf debian DEBIAN; )
-# su -c 'dpkg-deb -b $(depth)/../debian/$(distname)'
-# urg, why aren't there any decent manual pages for dpkg or rpm?
-# (cd $(depth)/../debian; \
-# rm -rf $(distname) $(distname).deb;\
-# tar xz -C $(depth)/../debian -f $(release-dir)/$(distname).tar.gz; \
-# cd $(distname);\
-# dpkg-buildpackage -b -rfakeroot; \
-# )
-
-makeflags=$(patsubst %==, %, $(patsubst ---%,,$(patsubst ----%,,$(MAKEFLAGS:%=--%))))
-
-diff:
- $(PYTHON) $(step-bindir)/package-diff.py --outdir=$(topdir)/$(outdir) --package=$(topdir) $(makeflags)
- -ln -f $(depth)/$(outdir)/$(distname).diff.gz $(patch-dir)
-
-release:
- $(PYTHON) $(step-bindir)/release.py --outdir=$(topdir)/$(outdir) --package=$(topdir)
-
-# rpm: $(depth)/$(package-icon) dist
-rpm:
- @echo The \"rpm\" target is deprecated.
- @echo Please select the .spec appropriate for your distribution and run
- @echo
- @echo " rpm -bb SPEC-FILE"
- @echo
- @echo different SPEC-FILEs may be found in $(depth)/make/out/
-
-# su -c 'rpm -tb $(depth)/$(outdir)/$(distname).tar.gz'
-
$(MAKE) -C $(po-dir) po-changes
po-replace: po
- $(MAKE) -C $(po-dir) po-replace
\ No newline at end of file
+ $(MAKE) -C $(po-dir) po-replace
-# Pod_rules.make
.SUFFIXES: .1 .5 .html .pod .txt
-# Porules.make
.SUFFIXES: .po .pot .mo
-# stepmake/prolog-rules.make
-
-.SUFFIXES: .pl .s
-
-
-# prolog files:
-PL_FILES := $(wildcard *.pl)
-
-SOURCE_FILES += $(PL_FILES)
-
-TAGS_FILES += $(PL_FILES)
-
-
PERL_SCRIPTS_IN := $(wildcard *.pl)
PERL_SCRIPTS = $(addprefix $(outdir)/, $(PERL_SCRIPTS_IN:.pl=))
BASH_SCRIPTS_IN := $(wildcard *.bash)
-# Substitute.make
sed-endline = sed 's!$$!\\!'
sed-newline = sed 's!$$!\n!'
-# THIS IS A TEMPLATE FOR SUB-PROJECT MAKEFILES
-# /Makefile
-
-# subdir level:
-#
-depth = ..
-#
-
-# identify module:
-#
-NAME =
-#
-
-# descent order into subdirectories:
-#
-SUBDIRS =
-#
-
-# dependencies and linkage of custom libraries:
-#
-
-MODULE_LIBES = # $(depth)/lib $(depth)/flower
-#
-
-# list of extra distribution files:
-# Makefile, C++ and pod are dist'ed automatically
-EXTRA_DIST_FILES =
-#
-
-# bootstrap stepmake:
-#
-include $(depth)/make/stepmake.make
-#
-
-# module compile settings: (not generally needed!)
-#
-EXTRA_CFLAGS =
-EXTRA_CXXFLAGS =
-EXTRA_LDFLAGS =
-#
-
-# main target of this module:
-#
-default: $(EXECUTABLE)
-# default: $(LIBRARY)
-#
-
-# EXECUTABLES=
-# include $(stepmake)/Executable.make
-
-#empty
export TEXPICTS:=$(outdir)$(PATHSEP)$(TEXPICTS)
-# Texinfo_rules.make
.SUFFIXES: .html .info .texi .texinfo
-#epmty
\ No newline at end of file
+# empty
-# -*-Makefile-*-
-# title Toplevel_targets.make
-
include $(stepdir)/www-targets.make
local-dist: configure
local-clean:
-###check-top-web:
-### $(MAKE) -C Documentation/topdocs WWW
-#####
-
-####index.html: check-top-web NEWS
-
local-dist: do-top-doc
dist:
distclean cleaner than clean (duh)\n\
doc update all documentation\n\
release roll tarball and generate patch\n\
- rpm build Red Hat package\n\
+ rpm build rpm (Red Hat) package\n\
po make new translation Portable Object database\n\
po-replace do po-update and replace catalogs with msgmerged versions\n\
po-update update translation Portable Object database\n\
-#empty
\ No newline at end of file
+# empty
-#empty
\ No newline at end of file
+# empty
-# Yodl_rules.make
-
-.SUFFIXES: .1 .5 .7 .dvi .html .latex .ps .texinfo .txt .yo
-
-$(outdir)/%.1: %.yo
- $(YODL2MAN) -doutdir=$(outdir) --live-data=3 -o $@ $<
-
-$(outdir)/%.5: %.yo
- $(YODL2MAN) -doutdir=$(outdir) --live-data=3 -o $@ $<
-
-$(outdir)/%.7: %.yo
- $(YODL2MAN) -doutdir=$(outdir) --live-data=3 -o $@ $<
-
-$(outdir)/%.html: %.yo
- $(YODL2HTML) -doutdir=$(outdir) --live-data=3 -o $@ $<
-
-$(outdir)/%.latex: %.yo
- $(YODL2LATEX) -doutdir=$(outdir) --live-data=3 -o $@ $<
-
-$(outdir)/%.texinfo: %.yo
- $(YODL2TEXINFO) -doutdir=$(outdir) --live-data=3 -o $@ $<
-
-$(outdir)/%.txt: %.yo
-# $(YODL2TXT) -doutdir=$(outdir) --live-data=3 -o $@ $<
- $(YODL2MSLESS) -doutdir=$(outdir) --live-data=3 $< > $@
- rm -f $(basename $<).ms
-
-YO_FILES := $(wildcard *.yo)
-OUTYO_FILES = $(addprefix $(outdir)/,$(YO_FILES))
-
-OUTTXT_FILES = $(OUTYO_FILES:.yo=.txt) $(OUTIN_FILES:.yo=.txt)
-OUTHTML_FILES = $(OUTYO_FILES:.yo=.html) $(OUTIN_FILES:.yo=.html)
-
-ALL_SOURCES += $(YO_FILES)
projects / lilypond.git / commitdiff