X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=0684e47b3144d2bd0b53845b4c5e3017b35bc7bc;hb=b14ca8cd4fd50af455590377c4fab5c504506635;hp=40e50d542b5dc787b2b670dd2bdd837706501d44;hpb=a4992991028b90b7080ad53a942bdb6c268e9a3c;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 40e50d542b..0684e47b31 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -2,7 +2,7 @@ depth = . -SUBDIRS = buildscripts python scripts \ +SUBDIRS = python scripts \ flower lily \ mf ly \ tex ps scm \ @@ -16,37 +16,29 @@ 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 \ - $(README_FILES) $(SCRIPTS) $(IN_FILES) +RELEASE_FILES = ChangeLog RELEASE-COMMIT +RELEASE_OUT_FILES = $(RELEASE_FILES:%=$(outdir)/%) +OUT_DIST_FILES += $(RELEASE_OUT_FILES) +EXTRA_DIST_FILES = VERSION .gitignore \ + $(README_FILES) $(SCRIPTS) $(IN_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) INSTALLATION_FILES=$(config_make) VERSION # bootstrap stepmake: # STEPMAKE_TEMPLATES=toplevel po install -include $(depth)/make/stepmake.make +LOCALSTEPMAKE_TEMPLATES=lilypond -# -# suggested settings -# -# LILYPOND_JOBS= -djob-count=X ## for SMP/Multicore machine -# -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: refresh-release-files dist-toplevel-txt-files all: $(outdir)/VERSION @@ -54,31 +46,47 @@ $(outdir)/VERSION: $(config_make) VERSION -mkdir -p $(outdir) echo $(TOPLEVEL_VERSION) > $@ -dist-toplevel-txt-files: +$(outdir)/ChangeLog: $(outdir)/VERSION + @echo 'See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/$(TOPLEVEL_VERSION)-1' > $@ + +$(outdir)/RELEASE-COMMIT: # FIXME: any file in $(top-src-dir)/.git/ we can depend on and be sure RELEASE-COMMIT is up to date? + git --git-dir=$(top-src-dir)/.git show HEAD | head -100 > $@ + +# junk me as soon as RELEASE-COMMIT FIXME: has been addressed +refresh-release-files: + test -d $(top-src-dir)/.git && rm -f $(RELEASE_OUT_FILES) + $(MAKE) $(RELEASE_OUT_FILES) + +python-modules: + $(MAKE) -C python + +top-doc: python-modules + +local-clean: local-clean-ChangeLog + +local-clean-ChangeLog: + rm -f ChangeLog + +dist-toplevel-txt-files: top-doc -mkdir -p $(distdir) ln $(TOPDOC_TXT_FILES) $(distdir)/ ln $(top-src-dir)/stepmake/aclocal.m4 $(distdir)/ -doc: - $(MAKE) -C Documentation +info: + $(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) out=www info && ) true -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-info: info + $(MAKE) out=www COPY_INFO_IMAGES=1 install-info-WWW install-help2man: $(MAKE) -C scripts man install-help2man $(MAKE) -C lily man install-help2man -web-install: +install-doc: $(MAKE) out=www install-WWW + $(MAKE) out=www install-info-WWW -uninstall-WWW: - echo TODO - -web-uninstall: +uninstall-doc: $(MAKE) out=www uninstall-WWW local-install: @@ -87,18 +95,35 @@ local-install: final-install: @true +ifeq ($(out),www) +# 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 --exclude='*.signature' $(outdir)/offline-root/ $(DESTDIR)$(webdir) + +install-info-WWW: + $(foreach d, $(INFO_DIRECTORIES),$(MAKE) -C $(d) install-info && ) true -# 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"' +uninstall-WWW: + rm -rf $(DESTDIR)$(webdir) + -rmdir $(package_docdir) + $(MAKE) -C Documentation/user uninstall + $(MAKE) -C input/lsr uninstall + + +# For online docs with content negotiation, issue `make doc WEB_TARGETS=online' +# For both online and offline docs, issue `make doc WEB_TARGETS="offline online"' WEB_TARGETS = offline -local-WWW-post: -# need UTF8 setting in case this is hosted on a website. +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)" + $(buildscript-dir)/mutopia-index -o $(outdir)/examples.html input/ + find $(outdir) -name '*-root' | xargs rm -rf + $(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) "$(WEB_TARGETS)" + find $(outdir)/offline-root -type l -delete +endif tree-prefix = $(outdir) @@ -118,11 +143,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 +doc-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 @@ -147,7 +170,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 @@ -161,13 +184,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 && \ @@ -190,7 +212,7 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo -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') @@ -208,42 +230,39 @@ $(config_h): config.hh.in @echo @false +grand-replace: + $(MAKE) -C scripts/build + PATH=$(buildscript-dir):$(PATH) $(buildscript-dir)/grand-replace ################################################################ # testing RESULT_DIR=$(top-build-dir)/out/test-results -OUT_TEST=test test: - rm -f input/regression/out-$(OUT_TEST)/collated-files.html @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 'grep sourcefilename `grep -L systems.texi out/lybook-db/*/*log|sed s/log/ly/g`' @echo - if test -d .git ; then \ - echo -e 'HEAD is:\n\n\t' ; \ - git log --max-count=1 --pretty=oneline ;\ - echo -e '\n\n\n' ; \ - git diff ; \ - fi > input/regression/out-test/tree.gittxt - $(MAKE) -C input/regression/ out=$(OUT_TEST) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= out-$(OUT_TEST)/collated-files.html - @find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' - + $(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 test -d .git ; then \ $(if $(shell git diff), echo "commit before base lining" && false,true) ; \ fi $(MAKE) $(MAKE) test - rm -rf input/regression/out-test-baseline - mv input/regression/out-test input/regression/out-test-baseline + $(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/ + $(buildscript-dir)/output-distance --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: @@ -253,5 +272,11 @@ test-redo: done $(MAKE) check -test-clean: - $(MAKE) -C input/regression/ out=$(OUT_TEST) clean +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