X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=4eea5f17918f5d9205affb259503424168f2bbbe;hb=a87a0e4fb3eab8f4b7997e4e2cead0723d9ec4cb;hp=2601bbaae4f2f937fe230c1c59eb47faf571deda;hpb=93d046c0e72b2d48c36472c6fc3dbaafd336eaa8;p=lilypond.git

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2601bbaae4..4eea5f1791 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -32,6 +32,13 @@ INSTALLATION_FILES=$(config_make) VERSION
 STEPMAKE_TEMPLATES=toplevel po install
 include $(depth)/make/stepmake.make
 
+#
+# suggested settings
+#
+# LILYPOND_JOBS= -djob-count=X   ## for SMP/Multicore machine
+# 
+include local.make
+
 local-dist: dist-toplevel-txt-files dist-changelog
 
 dist-changelog:
@@ -93,14 +100,17 @@ local-WWW-post:
 	rm -rf $(outdir)/offline-root
 	$(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(outdir) "$(WEB_TARGETS)"
 
+
 tree-prefix = $(outdir)
 tree-bin = $(tree-prefix)/bin
 tree-lib = $(tree-prefix)/lib
 tree-share = $(tree-prefix)/share
-tree-share-prefix = $(tree-share)/lilypond/$(TOPLEVEL_VERSION)
-tree-share-prefix-current = $(tree-share)/lilypond/current
-tree-lib-prefix = $(tree-lib)/lilypond/$(TOPLEVEL_VERSION)
-tree-lib-prefix-current = $(tree-lib)/lilypond/current
+
+# Don't put version numbers here. During development
+# they make no sense, and cause EPS files to become invalid.
+
+tree-share-prefix = $(tree-share)/lilypond/current
+tree-lib-prefix = $(tree-lib)/lilypond/current
 
 C_DIRS = flower lily
 c-clean:
@@ -125,9 +135,7 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile $(outdir)/VERSION
 	cd $(top-build-dir)/$(outbase) && rm -rf bin lib share
 	mkdir -p $(tree-bin)
 	mkdir -p $(tree-share-prefix)
-	ln -s $(TOPLEVEL_VERSION) $(tree-share-prefix-current)
 	mkdir -p $(tree-lib-prefix)
-	ln -s $(TOPLEVEL_VERSION) $(tree-lib-prefix-current)
 	mkdir -p $(tree-share-prefix)/elisp
 	mkdir -p $(tree-share-prefix)/fonts
 	mkdir -p $(tree-share-prefix)/fonts/otf
@@ -198,14 +206,44 @@ $(config_h): config.hh.in
 	@false
 
 
+################################################################
+# testing
+
+RESULT_DIR=$(top-build-dir)/out/test-results
+OUT_TEST=test
+
+
 test:
-	$(MAKE) -C input/regression/ out=test clean
-	$(MAKE) -C input/regression/ out=test WWW ANTI_ALIAS_FACTOR=1
+	rm -f input/regression/out-$(OUT_TEST)/collated-files.html
+	@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
+	if test -d .git  ; then \
+		echo -e 'HEAD is:\n\n\t' ; \
+		git log --max-count=1 --pretty=oneline ;\
+		echo -e '\n\n\n' ; \
+		git diff ; \
+	fi > input/regression/out-test/tree.gittxt
+	$(MAKE) -C input/regression/ out=$(OUT_TEST) LILYPOND_BOOK_LILYPOND_FLAGS="--backend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= out-$(OUT_TEST)/collated-files.html
+	@find input ly -name '*.ly' -print |grep -v 'out.*/' | xargs grep '\\version' -L | grep -v "standard input" |sed 's/^/**** Missing version: /g' 
+
 
+test-baseline: test
+	rm -rf input/regression/out-test-baseline
+	mv input/regression/out-test input/regression/out-test-baseline
 
-CHECK_SOURCE=$(HOME)/vc/gub/target/linux-x86/build/lilypond-master-git.sv.gnu.org-lilypond.git/input/regression/out-test/
-RESULT_DIR=$(top-build-dir)/out/test-results/
-check: test
+local-check: test
 	rm -rf $(RESULT_DIR)
 	mkdir -p $(RESULT_DIR)
-	$(PYTHON) $(buildscript-dir)/output-distance.py --output-dir $(RESULT_DIR) $(CHECK_SOURCE) input/regression/out-test/
+	$(PYTHON) $(buildscript-dir)/output-distance.py --create-images --output-dir $(RESULT_DIR) input/regression/out-test-baseline input/regression/out-test/
+
+
+test-redo:
+	for a in `cat $(RESULT_DIR)/changed.txt` ; do \
+		echo removing $$a* ; \
+		rm -f $$a* ;\
+	done
+	$(MAKE) check
+
+test-clean:
+	$(MAKE) -C input/regression/ out=$(OUT_TEST) clean