X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=8cce2c8f72171d4dbc3221777e58b6e36e49afb9;hb=0d13da15da86d830bc2ae00da6cfc38b99653d6d;hp=d61620209294bf281741f8d81fcdd9239544dab9;hpb=2e8af646c57285dc4946205ddab0257bc4ef6270;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index d616202092..8cce2c8f72 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -38,6 +38,7 @@ LOCALSTEPMAKE_TEMPLATES=lilypond include $(depth)/make/stepmake.make +.PHONY: test info website local-dist: refresh-release-files dist-toplevel-txt-files @@ -117,13 +118,29 @@ uninstall-WWW: # For both online and offline docs, issue `make doc WEB_TARGETS="offline online"' WEB_TARGETS = offline -WWW-post: +WEB_ROOT_FILES = $(WEB_TARGETS:%=$(outdir)/%-root/index.html) + +WEB_TRACKED_FILES = $(filter-out $(outdir)/index.html, \ + $(shell bash -O nullglob -c "echo $(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}")) \ + $(shell bash -O nullglob -c "echo input/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \ + $(shell bash -O nullglob -c "echo input/*/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \ + $(shell bash -O nullglob -c "echo input/*/*/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \ + $(shell bash -O nullglob -c "echo input/regression/lilypond-book/$(outdir)/*.{info,tex}") \ + $(shell bash -O nullglob -c "echo Documentation/$(outdir)/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") \ + $(shell bash -O nullglob -c "echo Documentation/$(outdir)/*/*.{midi,html,pdf,png,jpg,jpeg,txt,ly,ily,signature,css,zip,js,idx,php}") + +WWW-post: $(top-build-dir)/.htaccess $(WEB_ROOT_FILES) + # need UTF8 setting in case this is hosted on a website. +$(top-build-dir)/.htaccess: 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 - $(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)" + +$(outdir)/offline-root/index.html: $(WEB_TRACKED_FILES) + $(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) offline find $(outdir)/offline-root -type l | xargs rm -f + +$(outdir)/online-root/index.html: $(WEB_TRACKED_FILES) + $(buildscript-dir)/www_post $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(outdir) online endif # ifeq ($(out),www) # For those who cannot for the life in them remember to type @@ -150,16 +167,21 @@ src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh doc-clean: snippets-clean $(tree-share-prefix)/lilypond-force -default: $(config_h) build-dir-setup +default: $(config_h) build-dir-setup build-scripts build-dir-setup: $(tree-share-prefix)/lilypond-force +build-scripts: + $(MAKE) -C scripts/build + 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 $(outdir)/VERSION # Preparing LilyPond tree for build-dir exec +link-tree: $(tree-share-prefix)/lilypond-force + +$(tree-share-prefix)/lilypond-force: GNUmakefile $(outdir)/VERSION cd $(top-build-dir)/$(outbase) && rm -rf bin lib share mkdir -p $(tree-bin) mkdir -p $(tree-share-prefix) @@ -202,7 +224,9 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION ln -sf ../../../../../po/$(outconfbase)/$i.mo lilypond.mo) &&) true touch $(tree-share-prefix)/lilypond-force -$(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-force +link-mf-tree: $(tree-share-prefix)/mf-link-tree + +$(tree-share-prefix)/mf-link-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 && \ @@ -220,6 +244,7 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo ln -s ../../../../../../mf/$(outconfbase)/*.tfm . -cd $(tree-share-prefix)/fonts/type1 && \ ln -s ../../../../../../mf/$(outconfbase)/*.pf? . + touch $(tree-share-prefix)/mf-link-tree TAGS.make: dummy etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make') @@ -259,9 +284,32 @@ test: $(MAKE) -C input/regression/abc2ly out=test local-test $(MAKE) -C input/regression/lilypond-book out=test local-test -test-baseline: +ifndef BASELINE_COMMIT +BASELINE_COMMIT:=HEAD +endif + +ifdef LILYPOND_BASELINES +BASELINE_ARCHIVE:=$(LILYPOND_BASELINES)/baseline-$(shell git rev-list -1 $(BASELINE_COMMIT)).tar.gz + +test-baseline: $(BASELINE_ARCHIVE) + tar xzf $(BASELINE_ARCHIVE) + $(MAKE) test-snippets-clean + +$(BASELINE_ARCHIVE): + $(MAKE) test-baseline-create + tar czf $(BASELINE_ARCHIVE) input/regression/out-test-baseline \ + input/regression/midi/out-test-baseline \ + input/regression/musicxml/out-test-baseline \ + input/regression/abc2ly/out-test-baseline \ + input/regression/lilypond-book/out-test-baseline +else +test-baseline: test-baseline-create + $(MAKE) test-snippets-clean +endif + +test-baseline-create: @if test -d .git ; then \ - $(if $(shell git diff), echo "commit before base lining" && false,true) ; \ + $(if $(shell git diff $(BASELINE_COMMIT)), echo "commit before base lining" && false,true) ; \ fi $(MAKE) $(MAKE) test @@ -270,13 +318,11 @@ 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) \ + $(buildscript-dir)/output-distance --local-datadir --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'