X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=ac2329cf4fa68fd3d314a702cefd35682b7eed9e;hb=7bc7dbd80e0e7b3e16e58f56689d32e06d4af921;hp=054a2e0027427bf5531ad098027d927bae16067e;hpb=1d4b1a20061a2a3bc0cde643e3680527ed203223;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 054a2e0027..ac2329cf4f 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -16,13 +16,13 @@ SUBDIRS = buildscripts python scripts \ ## value of DOCUMENTATION here. documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation) -SCRIPTS = configure autogen.sh +SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.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) -EXTRA_DIST_FILES = VERSION .cvsignore .gitignore SConstruct \ +EXTRA_DIST_FILES = VERSION .gitignore SConstruct lilypond-texi2html.init \ $(README_FILES) $(SCRIPTS) $(IN_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) INSTALLATION_FILES=$(config_make) VERSION @@ -30,21 +30,12 @@ INSTALLATION_FILES=$(config_make) VERSION # bootstrap stepmake: # STEPMAKE_TEMPLATES=toplevel po install -include $(depth)/make/stepmake.make +LOCALSTEPMAKE_TEMPLATES=lilypond -# -# Set -# CHECK_SOURCE= --include local.make +include $(depth)/make/stepmake.make -local-dist: dist-toplevel-txt-files dist-changelog -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 @@ -60,21 +51,26 @@ dist-toplevel-txt-files: doc: $(MAKE) -C Documentation +install-help2man: + $(MAKE) -C scripts man install-help2man + $(MAKE) -C lily man install-help2man + +# All web targets, except info image symlinks and info docs are +# installed in non-recursing target from TOP-SRC-DIR install-WWW: -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir) rsync -rl $(outdir)/offline-root/ $(DESTDIR)$(webdir) - $(MAKE) -C Documentation/user local-install-WWW $(MAKE) -C Documentation/user install-info - -install-help2man: - $(MAKE) -C scripts man install-help2man - $(MAKE) -C lily man install-help2man + $(MAKE) -C input/lsr install-info web-install: $(MAKE) out=www install-WWW uninstall-WWW: - echo TODO + rm -rf $(DESTDIR)$(webdir) + -rmdir $(package_docdir) + $(MAKE) -C Documentation/user uninstall + $(MAKE) -C input/lsr uninstall web-uninstall: $(MAKE) out=www uninstall-WWW @@ -90,22 +86,25 @@ final-install: # For both online and offline docs, issue `make web WEB_TARGETS="offline online"' WEB_TARGETS = offline -local-WWW-post: +WWW-post: # need UTF8 setting in case this is hosted on a website. echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(top-build-dir)/.htaccess $(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)" + find $(outdir) -name '*-root' | xargs rm -rf + $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(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: @@ -113,11 +112,9 @@ c-clean: src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh -web-clean: - $(MAKE) out=www clean - $(MAKE) $(tree-share-prefix)/lilypond-force +web-clean: snippets-clean $(tree-share-prefix)/lilypond-force -default: $(config_h) build-dir-setup +default: $(config_h) build-dir-setup build-dir-setup: $(tree-share-prefix)/lilypond-force @@ -130,9 +127,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 @@ -144,7 +139,7 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION mkdir -p $(tree-share-prefix)/tex cd $(tree-bin) && \ ln -sf ../../lily/$(outconfbase)/lilypond . && \ - for i in abc2ly convert-ly etf2ly lilypond-book lilypond-invoke-editor midi2ly musicxml2ly; \ + for i in abc2ly convert-ly etf2ly lilymidi lilypond-book lilypond-invoke-editor midi2ly musicxml2ly; \ do ln -sf ../../scripts/$(outconfbase)/$$i . ; done cd $(tree-lib-prefix) && \ ln -s ../../../../python/$(outconfbase) python @@ -158,13 +153,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,16 +169,19 @@ $(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 && \ ln -s ../../../../../../mf/$(outconfbase)/*.tfm . -cd $(tree-share-prefix)/fonts/type1 && \ - ln -s ../../../../../../mf/$(outconfbase)/*.pfa . + ln -s ../../../../../../mf/$(outconfbase)/*.pf? . TAGS.make: dummy etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make') @@ -202,16 +199,52 @@ $(config_h): config.hh.in @echo @false +grand-replace: + PATH=$(buildscript-dir)/$(outbase):$(PATH) $(BASH) $(buildscript-dir)/grand-replace.sh + +################################################################ +# testing + +RESULT_DIR=$(top-build-dir)/out/test-results -test-clean: - $(MAKE) -C input/regression/ out=test clean test: -## no aa-scaling, no PDF - $(MAKE) -C input/regression/ out=test LILYPOND_BOOK_LILYPOND_FLAGS="--backend=eps --formats=ps,png $(LILYPOND_JOBS) -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= out-test/collated-files.html + @echo -en 'For tracking crashes: use\n\n\t' + @echo 'grep sourcefilename `grep -L systems.texi out/lybook-db/*/*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) out=test -C input/regression/ local-test-baseline + $(MAKE) out=test -C input/regression/musicxml local-test-baseline + $(MAKE) test-snippets-clean -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: test-snippets-clean + $(MAKE) -C input/regression/ out=test clean + +snippets-clean: + rm -rf out/lybook-db + +test-snippets-clean: + rm -rf out/lybook-testdb