X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=69962c9b3273387f0f9b449de660e1ef6d681b9e;hb=974b5c76bc9606752de44d128c13a9f2adc0e322;hp=8ecc6f65bfc3993bbdfe0ea02ad2a9569a124cc8;hpb=eb81aa0cf80559fea62e433d298e5a0d669f27e9;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 8ecc6f65bf..69962c9b32 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -16,24 +16,32 @@ SUBDIRS = buildscripts python scripts \ ## value of DOCUMENTATION here. documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation) -SCRIPTS = configure autogen.sh -README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING -TOPDOC_FILES=AUTHORS README INSTALL NEWS +SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh +README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING +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) -PATCH_FILES = emacsclient.patch server.el.patch -EXTRA_DIST_FILES = VERSION .cvsignore SConstruct \ - $(README_FILES) $(SCRIPTS) $(IN_FILES) $(PATCH_FILES) +EXTRA_DIST_FILES = VERSION .gitignore SConstruct lilypond-texi2html.init \ + $(README_FILES) $(SCRIPTS) $(IN_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) INSTALLATION_FILES=$(config_make) VERSION # bootstrap stepmake: # STEPMAKE_TEMPLATES=toplevel po install +LOCALSTEPMAKE_TEMPLATES=lilypond + include $(depth)/make/stepmake.make -local-dist: dist-toplevel-txt-files + +local-dist: dist-toplevel-txt-files + +all: $(outdir)/VERSION + +$(outdir)/VERSION: $(config_make) VERSION + -mkdir -p $(outdir) + echo $(TOPLEVEL_VERSION) > $@ dist-toplevel-txt-files: -mkdir -p $(distdir) @@ -43,22 +51,26 @@ dist-toplevel-txt-files: doc: $(MAKE) -C Documentation -install-WWW: - -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir) - cp -a $(outdir)/web-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 +# 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 install-info + $(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 @@ -69,53 +81,30 @@ local-install: final-install: @true -web-ext = html midi pdf png txt ly signature - -footify = $(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) -footifymail = MAILADDRESS='http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs' +# For online docs with content negotiation, issue `make web WEB_TARGETS=online' +# 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/ - echo '' > $(outdir)/index.html - echo 'Redirecting to the documentation index...' >> $(outdir)/index.html - - cd $(top-build-dir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify) - - cd $(top-build-dir) && find Documentation input \ - $(web-ext:%=-path '*/out-www/*.%' -or) -type l \ - | grep -v 'lily-[0-9].*.pdf' \ - > $(outdir)/weblist - ls $(outdir)/*.html >> $(outdir)/weblist - -## urg: this is too hairy, should write a python script to do this. - -## rewrite file names so we lose out-www - rm -rf $(outdir)/web-root/ - mkdir $(outdir)/web-root/ -## urg slow. - cat $(outdir)/weblist | (cd $(top-build-dir); tar -cf- -T- ) | \ - tar -C $(outdir)/web-root/ -xf - - for dir in $(outdir)/web-root/ ; do \ - cd $$dir && \ - for a in `find . -name out-www`; do \ - rsync -a --link-dest $$a/ $$a/ $$a/.. ; \ - rm -rf $$a ; \ - done \ - done - echo $(TOPLEVEL_VERSION) > $(outdir)/web-root/VERSION + 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: @@ -123,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 @@ -135,15 +122,12 @@ PO_FILES = $(call src-wildcard,$(src-depth)/po/*.po) HELP_CATALOGS = $(PO_FILES:po/%.po=%) CATALOGS = $(HELP_CATALOGS:lilypond=) -$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile +$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION # Preparing LilyPond tree for build-dir exec 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)/dvips mkdir -p $(tree-share-prefix)/elisp mkdir -p $(tree-share-prefix)/fonts mkdir -p $(tree-share-prefix)/fonts/otf @@ -155,7 +139,7 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile 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 @@ -166,19 +150,15 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile ln -s ../../../../python/$(outconfbase) python && \ ln -s $(top-src-dir)/scm && \ ln -s $(top-src-dir)/scripts scripts - cd $(tree-share-prefix)/dvips && \ - ln -s ./../../../mf/$(outconfbase) mf-out && \ - ln -s $(top-src-dir)/ps 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 && \ @@ -189,29 +169,22 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(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 $(srcdir) -name 'GNUmakefile*' -o -name '*.make') - -local-clean: build-dir-setup-clean local-web-clean - -local-web-clean: - rm -rf $(outdir)/web-root/ - - - -build-dir-setup-clean: - cd $(top-build-dir) && rm -rf share + etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make') $(config_h): config.hh.in # @@ -225,3 +198,51 @@ $(config_h): config.hh.in @echo ' rm $(config_h); ./autogen.sh' @echo @false + + +################################################################ +# testing + +RESULT_DIR=$(top-build-dir)/out/test-results + + +test: + @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 + + +local-check: test + rm -rf $(RESULT_DIR) + mkdir -p $(RESULT_DIR) + $(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