X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=8e379eb6cd7312470f894dc6e98a3ec491bf17a3;hb=52f8d56f1353504194bebf63b5d5e645fa46b583;hp=6da515c15dcfea28f0acb83641ce100b54a124d2;hpb=5925ff9267ab47eeff2b8aac56c07a6f18c20f7e;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 6da515c15d..8e379eb6cd 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 \ @@ -22,8 +22,11 @@ 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 .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 lilypond-texi2html.init \ + $(README_FILES) $(SCRIPTS) $(IN_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) INSTALLATION_FILES=$(config_make) VERSION @@ -35,7 +38,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond include $(depth)/make/stepmake.make -local-dist: dist-toplevel-txt-files +local-dist: refresh-release-files dist-toplevel-txt-files all: $(outdir)/VERSION @@ -43,32 +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 - $(MAKE) -C input/lsr 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: @@ -77,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/ + $(buildscript-dir)/mutopia-index -o $(outdir)/examples.html input/ find $(outdir) -name '*-root' | xargs rm -rf - $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(outdir) "$(WEB_TARGETS)" + $(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) "$(WEB_TARGETS)" find $(outdir)/offline-root -type l -delete +endif tree-prefix = $(outdir) @@ -108,7 +143,7 @@ c-clean: src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh -web-clean: snippets-clean $(tree-share-prefix)/lilypond-force +doc-clean: snippets-clean $(tree-share-prefix)/lilypond-force default: $(config_h) build-dir-setup @@ -195,6 +230,9 @@ $(config_h): config.hh.in @echo @false +grand-replace: + $(MAKE) -C scripts/build + PATH=$(buildscript-dir):$(PATH) $(buildscript-dir)/grand-replace ################################################################ # testing @@ -204,7 +242,7 @@ 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 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 $(MAKE) -C input/regression/ out=test local-test $(MAKE) -C input/regression/musicxml out=test local-test @@ -217,13 +255,13 @@ test-baseline: $(MAKE) test $(MAKE) out=test -C input/regression/ local-test-baseline $(MAKE) out=test -C input/regression/musicxml local-test-baseline - rm -rf out/lybook-testdb/ + $(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' @@ -234,8 +272,11 @@ test-redo: done $(MAKE) check -test-clean: snippets-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