X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=512b8ef598bfc8d2e645df21415501fc2da5010f;hb=007ecffe0dbc2d5dbb033664e6a1e1d2b03756d8;hp=0ad3c6e30b409ecd6647e2ff91392399cf196d39;hpb=9a73c67a79a21b889d67f8d28f2c106de830d936;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 0ad3c6e30b..512b8ef598 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -60,6 +60,7 @@ refresh-release-files: $(MAKE) $(RELEASE_OUT_FILES) python-modules: + $(MAKE) -C scripts/build $(MAKE) -C python top-doc: python-modules @@ -102,7 +103,7 @@ ifeq ($(out),www) # 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) + rsync -rl --exclude='*.signature' $(outdir)/offline-root/ $(DESTDIR)$(webdir) $(MAKE) -C Documentation omf-local-install install-info-WWW: @@ -284,9 +285,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 @@ -295,13 +319,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'