X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=8cce2c8f72171d4dbc3221777e58b6e36e49afb9;hb=067f6e7978add24a3367e564f1285139b0d01876;hp=bd2d0ce5a37156b2e4dfef095a64d15f9683ece1;hpb=17183f4a9696f2187128490a669895964959fa84;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index bd2d0ce5a3..8cce2c8f72 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -120,10 +120,6 @@ WEB_TARGETS = offline WEB_ROOT_FILES = $(WEB_TARGETS:%=$(outdir)/%-root/index.html) -WEB_EXAMPLE_FILES = $(wildcard input/$(outdir)/*.ly) \ - $(wildcard input/*/$(outdir)/*.ly) \ - $(wildcard input/*/*/$(outdir)/*.ly) - 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}") \ @@ -133,15 +129,12 @@ WEB_TRACKED_FILES = $(filter-out $(outdir)/index.html, \ $(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 $(outdir)/examples.html $(WEB_ROOT_FILES) +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 -$(outdir)/examples.html: $(WEB_EXAMPLE_FILES) - $(buildscript-dir)/mutopia-index -o $(outdir)/examples.html input/ - $(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 @@ -291,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 @@ -302,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'