X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=d61620209294bf281741f8d81fcdd9239544dab9;hb=refs%2Fheads%2Fbugs%2F567849;hp=0e363b1c965d4baeb1f2c30603c1edb741199203;hpb=b42c683e1ae3bf295f5e542eb0f0e384c9834ec8;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 0e363b1c96..d616202092 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -17,13 +17,17 @@ SUBDIRS = python scripts \ documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation) SCRIPTS = configure autogen.sh smart-autogen.sh smart-configure.sh -README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING +README_FILES = COPYING COPYING.FDL DEDICATION ROADMAP THANKS HACKING \ + LICENSE LICENSE.DOCUMENTATION 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 lilypond-texi2html.init \ - $(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 .mailmap \ + $(README_FILES) $(SCRIPTS) $(IN_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) INSTALLATION_FILES=$(config_make) VERSION @@ -35,7 +39,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,54 +47,47 @@ $(outdir)/VERSION: $(config_make) VERSION -mkdir -p $(outdir) echo $(TOPLEVEL_VERSION) > $@ -ChangeLog: $(outdir)/VERSION - @echo 'See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/$(TOPLEVEL_VERSION)-1' > ChangeLog +$(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 -do-top-doc: python-modules +top-doc: python-modules local-clean: local-clean-ChangeLog local-clean-ChangeLog: rm -f ChangeLog -dist-toplevel-txt-files: do-top-doc +dist-toplevel-txt-files: top-doc -mkdir -p $(distdir) - ln $(TOPDOC_TXT_FILES) $(distdir)/ - ln $(top-src-dir)/stepmake/aclocal.m4 $(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-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 -# 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: - $(MAKE) -C Documentation/user install-info - $(MAKE) -C input/lsr install-info - (cd $(DESTDIR)$(infodir) && rm -f lilypond && ln -sf $(shell $(PYTHON) $(buildscript-dir)/relative $(DESTDIR)$(webdir)/Documentation/user) lilypond) - (cd $(DESTDIR)$(infodir) && rm -f lilypond-snippets && ln -sf $(shell $(PYTHON) $(buildscript-dir)/relative $(DESTDIR)$(webdir)/input/lsr) lilypond-snippets) - -web-install: +install-doc: $(MAKE) out=www install-WWW $(MAKE) out=www install-info-WWW -uninstall-WWW: - rm -rf $(DESTDIR)$(webdir) - -rmdir $(package_docdir) - $(MAKE) -C Documentation/user uninstall - $(MAKE) -C input/lsr uninstall - -web-uninstall: +uninstall-doc: $(MAKE) out=www uninstall-WWW local-install: @@ -99,9 +96,25 @@ 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) + $(MAKE) -C Documentation omf-local-install + +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 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 WWW-post: @@ -110,8 +123,13 @@ WWW-post: $(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 + find $(outdir)/offline-root -type l | xargs rm -f +endif # ifeq ($(out),www) +# For those who cannot for the life in them remember to type +# WEB_TARGETS=..., just bloody make all doc stuff, already. +all-doc: + $(MAKE) WEB_TARGETS='online offline' doc tree-prefix = $(outdir) tree-bin = $(tree-prefix)/bin @@ -130,7 +148,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 @@ -138,9 +156,9 @@ build-dir-setup: $(tree-share-prefix)/lilypond-force PO_FILES = $(call src-wildcard,$(src-depth)/po/*.po) HELP_CATALOGS = $(PO_FILES:po/%.po=%) -CATALOGS = $(HELP_CATALOGS:lilypond=) +CATALOGS = $(HELP_CATALOGS:lilypond=) -$(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION +$(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) @@ -192,10 +210,12 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo rm -f $(tree-share-prefix)/fonts/type1/* && \ cd $(tree-share-prefix)/fonts/otf && \ ln -s ../../../../../../mf/$(outconfbase)/*.otf . - -cd $(tree-share-prefix)/fonts/ && \ + -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/svg && \ + ln -s ../../../../../../mf/$(outconfbase)/*.woff . -cd $(tree-share-prefix)/fonts/tfm && \ ln -s ../../../../../../mf/$(outconfbase)/*.tfm . -cd $(tree-share-prefix)/fonts/type1 && \ @@ -221,6 +241,7 @@ grand-replace: $(MAKE) -C scripts/build PATH=$(buildscript-dir):$(PATH) $(buildscript-dir)/grand-replace + ################################################################ # testing @@ -228,28 +249,37 @@ 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 'For tracking crashes: use' @echo - $(MAKE) -C input/regression/ out=test local-test + @echo ' grep sourcefilename `grep -L systems.texi out/lybook-testdb/*/*log|sed s/log/ly/g`' + @echo + $(MAKE) -C input/regression out=test local-test + $(MAKE) -C input/regression/midi out=test local-test $(MAKE) -C input/regression/musicxml out=test local-test + $(MAKE) -C input/regression/abc2ly out=test local-test + $(MAKE) -C input/regression/lilypond-book out=test local-test -test-baseline: +test-baseline: @if test -d .git ; then \ $(if $(shell git diff), echo "commit before base lining" && false,true) ; \ fi - $(MAKE) + $(MAKE) $(MAKE) test - $(MAKE) out=test -C input/regression/ local-test-baseline + $(MAKE) out=test -C input/regression local-test-baseline + $(MAKE) out=test -C input/regression/midi local-test-baseline $(MAKE) out=test -C input/regression/musicxml local-test-baseline + $(MAKE) out=test -C input/regression/abc2ly local-test-baseline + $(MAKE) out=test -C input/regression/lilypond-book local-test-baseline $(MAKE) test-snippets-clean local-check: test rm -rf $(RESULT_DIR) mkdir -p $(RESULT_DIR) - $(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' + $(buildscript-dir)/output-distance --create-images --output-dir $(RESULT_DIR) \ + input/regression/out-test-baseline input/regression/out-test \ + input/regression/midi/out-test-baseline input/regression/midi/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: @@ -260,10 +290,18 @@ test-redo: $(MAKE) check test-clean: test-snippets-clean - $(MAKE) -C input/regression/ out=test clean + $(MAKE) -C input/regression out=test clean snippets-clean: rm -rf out/lybook-db test-snippets-clean: rm -rf out/lybook-testdb + +# we want this separate for security; see CG 4.2. -gp +website: + $(MAKE) config_make=$(config_make) \ + top-src-dir=$(top-src-dir) \ + -f $(top-src-dir)/make/website.make \ + website +