X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=36527e2f42fa3ebd4b36312d1c79065ac23f4359;hb=1fe86c7a5655efb505579e3e22ce88306456fd12;hp=97e44e642a24c4ac77286eb5220d4bc958deecab;hpb=53ae05c0d5993676c674d043c1ca47f20982d711;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 97e44e642a..36527e2f42 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -18,7 +18,7 @@ documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation) SCRIPTS = configure autogen.sh README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING -TOPDOC_FILES = AUTHORS README INSTALL NEWS +TOPDOC_FILES = AUTHORS INSTALL README NEWS TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES))) IN_FILES := $(call src-wildcard,*.in) @@ -33,18 +33,13 @@ STEPMAKE_TEMPLATES=toplevel po install include $(depth)/make/stepmake.make # -# Set -# CHECK_SOURCE= --include local.make - -local-dist: dist-toplevel-txt-files dist-changelog +# suggested settings +# +# LILYPOND_JOBS= -djob-count=X ## for SMP/Multicore machine +# +include local.make -dist-changelog: - if test -d $(top-src-dir)/.git ; then \ - cd $(top-src-dir) && git-whatchanged gub-2.9.29-2.. > $(distdir)/ChangeLog ; \ - else \ - cp $(top-src-dir)/ChangeLog $(distdir) ; \ - fi +local-dist: dist-toplevel-txt-files all: $(outdir)/VERSION @@ -96,16 +91,20 @@ local-WWW-post: $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/ rm -rf $(outdir)/online-root rm -rf $(outdir)/offline-root - $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(outdir) "$(WEB_TARGETS)" + $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(outdir) "$(WEB_TARGETS)" + find $(outdir)/offline-root -type l -delete + tree-prefix = $(outdir) tree-bin = $(tree-prefix)/bin tree-lib = $(tree-prefix)/lib tree-share = $(tree-prefix)/share -tree-share-prefix = $(tree-share)/lilypond/$(TOPLEVEL_VERSION) -tree-share-prefix-current = $(tree-share)/lilypond/current -tree-lib-prefix = $(tree-lib)/lilypond/$(TOPLEVEL_VERSION) -tree-lib-prefix-current = $(tree-lib)/lilypond/current + +# Don't put version numbers here. During development +# they make no sense, and cause EPS files to become invalid. + +tree-share-prefix = $(tree-share)/lilypond/current +tree-lib-prefix = $(tree-lib)/lilypond/current C_DIRS = flower lily c-clean: @@ -130,9 +129,7 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION cd $(top-build-dir)/$(outbase) && rm -rf bin lib share mkdir -p $(tree-bin) mkdir -p $(tree-share-prefix) - ln -s $(TOPLEVEL_VERSION) $(tree-share-prefix-current) mkdir -p $(tree-lib-prefix) - ln -s $(TOPLEVEL_VERSION) $(tree-lib-prefix-current) mkdir -p $(tree-share-prefix)/elisp mkdir -p $(tree-share-prefix)/fonts mkdir -p $(tree-share-prefix)/fonts/otf @@ -158,13 +155,12 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION cd $(tree-share-prefix)/tex && \ ln -s $(top-src-dir)/tex source && \ ln -s ../../../../../tex/$(outconfbase) tex-out && \ - ln -s ../../../../../mf/$(outconfbase) mf-out - + true cd $(tree-share-prefix)/fonts && \ ln -s $(top-src-dir)/mf source && \ true -cd $(tree-share-prefix)/elisp && \ - ln -sf ../../../../../../elisp/$(outconfbase)/lilypond-words.el . && \ + ln -sf ../../../../../elisp/$(outconfbase)/lilypond-words.el . && \ ln -s $(top-src-dir)/elisp/*.el . $(foreach i,$(CATALOGS), \ (mkdir -p $(tree-share)/locale/$i/LC_MESSAGES && \ @@ -175,10 +171,13 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-force -rm -f $(tree-share-prefix)/fonts/otf/* && \ rm -f $(tree-share-prefix)/fonts/svg/* && \ + rm -f $(tree-share-prefix)/fonts/fonts.conf && \ rm -f $(tree-share-prefix)/fonts/tfm/* && \ rm -f $(tree-share-prefix)/fonts/type1/* && \ cd $(tree-share-prefix)/fonts/otf && \ ln -s ../../../../../../mf/$(outconfbase)/*.otf . + -cd $(tree-share-prefix)/fonts/ && \ + ln -s ../../../../../mf/$(outconfbase)/fonts.conf . -cd $(tree-share-prefix)/fonts/svg && \ ln -s ../../../../../../mf/$(outconfbase)/*.svg . -cd $(tree-share-prefix)/fonts/tfm && \ @@ -203,14 +202,41 @@ $(config_h): config.hh.in @false +################################################################ +# testing + +RESULT_DIR=$(top-build-dir)/out/test-results + + test: - $(MAKE) -C input/regression/ out=test clean - $(MAKE) -C input/regression/ out=test WWW ANTI_ALIAS_FACTOR=1 + @echo -en 'For tracking crashes: use\n\n\t' + @echo 'grep sourcefilename `grep -L systems.texi input/regression/out-test/*log|sed s/log/ly/g`' + @echo + $(MAKE) -C input/regression/ out=test local-test + $(MAKE) -C input/regression/musicxml out=test local-test +test-baseline: + @if test -d .git ; then \ + $(if $(shell git diff), echo "commit before base lining" && false,true) ; \ + fi + $(MAKE) + $(MAKE) test + $(MAKE) -C input/regression/ local-test-baseline + $(MAKE) -C input/regression/musicxml local-test-baseline -CHECK_SOURCE=$(HOME)/vc/gub/target/linux-x86/build/lilypond-master-git.sv.gnu.org-lilypond.git/input/regression/out-test/ -RESULT_DIR=$(top-build-dir)/out/test-results/ -check: test +local-check: test rm -rf $(RESULT_DIR) mkdir -p $(RESULT_DIR) - $(PYTHON) $(buildscript-dir)/output-distance.py --output-dir $(RESULT_DIR) $(CHECK_SOURCE) input/regression/out-test/ + $(PYTHON) $(buildscript-dir)/output-distance.py --create-images --output-dir $(RESULT_DIR) input/regression/out-test-baseline input/regression/out-test/ + @find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' + + +test-redo: + for a in `cat $(RESULT_DIR)/changed.txt` ; do \ + echo removing $$a* ; \ + rm -f $$a* ;\ + done + $(MAKE) check + +test-clean: + $(MAKE) -C input/regression/ out=test clean