From 0010941b9a5ee2cedbbc71debf311919c184b627 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 1 Nov 2006 00:12:53 +0000 Subject: [PATCH] remove .eps rules bugfixes for git-update-changelog.py remove .deb/.rpm downloading. rm fontdir target. otf depends on otf-g?table. Fixes race condition in -j2 build.(cherry picked from b0628c40c47202bddac01e18cd4808b3c9d12faf commit) don't use ImageMagick, use GS directly. --- ChangeLog | 20 ++++++++++++++++++++ Documentation/user/GNUmakefile | 8 +------- buildscripts/git-update-changelog.py | 22 ++++++++++++---------- mf/GNUmakefile | 16 ++-------------- 4 files changed, 35 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1bf00206b7..9ab19c955f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2006-10-31 Han-Wen Nienhuys + + * Documentation/user/GNUmakefile: + don't use ImageMagick, use GS directly. + + * mf/GNUmakefile: + otf depends on otf-g?table. Fixes race condition in -j2 build.(cherry picked from b0628c40c47202bddac01e18cd4808b3c9d12faf commit) + + * mf/GNUmakefile: + rm fontdir target. + + * mf/GNUmakefile: + remove .deb/.rpm downloading. + + * buildscripts/git-update-changelog.py: + bugfixes for git-update-changelog.py + + * Documentation/user/GNUmakefile: + remove .eps rules + 2006-10-30 Han-Wen Nienhuys * input/regression/tie-semi-single.ly: diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index d58ce5c1bc..bab2506309 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -195,13 +195,7 @@ $(outdir)/%.png: %.png convert -geometry 50x50% $< $@ $(outdir)/%.png: %.eps - convert $< $@ - -$(outdir)/%.eps: %.png - convert $< $@ - -$(outdir)/%.eps: %.eps - cp $< $@ + gs -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=$@ -sDEVICE=png16m -dEPSCrop -dNOPAUSE -f $< -c quit $(outdir)/%.pdf: %.png convert $< $@ diff --git a/buildscripts/git-update-changelog.py b/buildscripts/git-update-changelog.py index fba7c65f23..a1cb3cf2f9 100644 --- a/buildscripts/git-update-changelog.py +++ b/buildscripts/git-update-changelog.py @@ -150,7 +150,9 @@ Run this file from the CVS directory, with --git-dir log = log[len (first):] file_adddel = [] - final_log = '' + + collated_log = '' + collated_message = '' for c in commits: print 'patch ', c.committish @@ -168,14 +170,13 @@ Run this file from the CVS directory, with --git-dir new_log += header (last_commit) - new_log = changelog_body (c) + new_log + collated_log = changelog_body (c) + collated_log last_commit = c -# FIXME: correct fix? -# final_log += self.message + '\n' - final_log += log - + collated_message += c.message + '\n' + + for (op, f) in file_adddel: if op == 'del': system ('cvs remove %(f)s' % locals ()) @@ -183,9 +184,9 @@ Run this file from the CVS directory, with --git-dir system ('cvs add %(f)s' % locals ()) if last_commit: - new_log = header (last_commit) + new_log + '\n' + collated_log = header (last_commit) + collated_log + '\n' - log = new_log + log + log = collated_log + log try: os.unlink ('ChangeLog~') @@ -195,8 +196,9 @@ Run this file from the CVS directory, with --git-dir os.rename ('ChangeLog', 'ChangeLog~') open ('ChangeLog', 'w').write (log) - open ('.msg','w').write (final_log) - print 'cvs commit -F .msg ' + open ('.msg','w').write (collated_message) + print '\nCommit message\n**\n%s\n**\n' % collated_message + print '\nRun:\n\n\tcvs commit -F .msg\n\n' main () diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 8a60b49630..0956ee36ef 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -60,10 +60,10 @@ $(outdir)/aybabtu.otf-gtable: $(BRACES:%=$(outdir)/feta-braces-%.otf-gtable) # -$(outdir)/emmentaler-%.otf $(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe $(outdir)/feta%.pfa $(outdir)/feta-alphabet%.pfa $(outdir)/parmesan%.pfa +$(outdir)/emmentaler-%.otf $(outdir)/emmentaler-%.svg: $(outdir)/emmentaler-%.pe $(outdir)/feta%.pfa $(outdir)/feta-alphabet%.pfa $(outdir)/parmesan%.pfa $(outdir)/feta%.otf-table $(outdir)/feta%.otf-gtable cd $(outdir) && $(FONTFORGE) -script $(notdir $(basename ,$@).pe) -$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfa) +$(outdir)/aybabtu.otf $(outdir)/aybabtu.svg: $(outdir)/aybabtu.pe $(foreach s,$(BRACES),$(outdir)/feta-braces-$(s).pfa) $(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable cd $(outdir) && $(FONTFORGE) -script aybabtu.pe -rm -f $(outdir)/*.scale.{pfa,afm} @@ -140,23 +140,11 @@ default: $(ALL_GEN_FILES) $(outdir)/emmentaler-20.otf tree-regen tree-regen: ${MAKE} -C $(top-build-dir) link-mf-tree -debian-mirror=http://ftp.us.debian.org -debian-package =lilypond_$(TOPLEVEL_VERSION)-1_i386.deb -$(outdir)/$(debian-package): - wget --passive-ftp -P $(outdir) $(debian-mirror)/debian/pool/main/l/lilypond/$(debian-package) - -redhat-package=lilypond-$(TOPLEVEL_VERSION)-1.i386.rpm -$(outdir)/$(redhat-package): - wget --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/Fedora-4/$(redhat-package) - ## ## todo: this also depends on .tfm, FIXME. $(outdir)/%.lisp $(outdir)/%.otf-gtable $(outdir)/%.enc $(outdir)/%.tex $(outdir)/%.dep: $(outdir)/%.log $(outdir)/%.tfm $(PYTHON) $(buildscript-dir)/mf-to-table.py --global-lisp=$(outdir)/$(