Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5e49a0c80387010a73f4ca73f96f4c38b49e374c..b0c8d23b76b4e5e935bef1e5806f2c2ba3598cb0 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -213,25 +213,14 @@ $(config_h): config.hh.in
 # testing
 
 RESULT_DIR=$(top-build-dir)/out/test-results
-OUT_TEST=test
 
 
 test:
-       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
-#FIXME: using out-test and out-$(OUT_TEST) alongside eachother?
-       mkdir -p input/regression/out-test
-       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="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-lily-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' 
-       rsync -L -a --exclude 'out-*' --exclude 'out' --exclude mf --exclude source --exclude mf $(outdir)/share input/regression/out-test/
+       $(MAKE) -C input/regression/ out=test local-test
+       $(MAKE) -C input/regression/musicxml out=test local-test
 
 test-baseline: 
        @if  test -d .git ; then \
@@ -239,13 +228,14 @@ test-baseline:
        fi
        $(MAKE) 
        $(MAKE) test
-       rm -rf input/regression/out-test-baseline
-       mv input/regression/out-test input/regression/out-test-baseline
+       $(MAKE) -C input/regression/ local-test-baseline
+       $(MAKE) -C input/regression/musicxml local-test-baseline
 
 local-check: test
        rm -rf $(RESULT_DIR)
        mkdir -p $(RESULT_DIR)
        $(PYTHON) $(buildscript-dir)/output-distance.py --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' 
 
 
 test-redo:
@@ -256,4 +246,4 @@ test-redo:
        $(MAKE) check
 
 test-clean:
-       $(MAKE) -C input/regression/ out=$(OUT_TEST) clean
+       $(MAKE) -C input/regression/ out=test clean

diff --git a/VERSION b/VERSION
index c1967420a80873d30cc69ad939ad439aa8cb2677..aa9f7e75c1cec7cb2c1ccb27a983a5f5cc2f0aa0 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=11
-PATCH_LEVEL=32
+PATCH_LEVEL=33
 MY_PATCH_LEVEL=
 

diff --git a/make/lysdoc-rules.make b/make/lysdoc-rules.make
index ad42cf0fa0fb82892710d135ba9afee84c527034..21c675e84897a447804608e801d9525a62092b23 100644 (file)
--- a/make/lysdoc-rules.make
+++ b/make/lysdoc-rules.make
@@ -1,6 +1,4 @@
 
-
-
-$(outdir)/collated-files.tely: $(LY_FILES)
-       $(PYTHON) $(buildscript-dir)/lys-to-tely.py --name=$(outdir)/collated-files --title="$(TITLE)" $(LY_FILES)
+$(outdir)/collated-files.tely: $(LY_FILES) $(OUT_LY_FILES)
+       $(PYTHON) $(buildscript-dir)/lys-to-tely.py --name=$(outdir)/collated-files --title="$(TITLE)" $^
 

diff --git a/make/lysdoc-targets.make b/make/lysdoc-targets.make
index cf5a9d2e677a324d1350581352dc5b6edd3ffdae..28b84beee2c6616260584b6fe3fbd222f2bc4f75 100644 (file)
--- a/make/lysdoc-targets.make
+++ b/make/lysdoc-targets.make
@@ -4,3 +4,18 @@ local-WWW: $(outdir)/collated-files.html $(outdir)/collated-files.pdf
 
 #.PRECIOUS: $(outdir)/$(NAME).texi
 
+local-test-baseline:
+       rm -rf $(outdir)-baseline
+       mv $(outdir) $(outdir)-baseline
+
+local-test:
+       rm -f $(outdir)/collated-files.html
+       if test -d $(top-src-dir)/.git  ; then \
+               echo -e 'HEAD is:\n\n\t' ; \
+               git log --max-count=1 --pretty=oneline ;\
+               echo -e '\n\n\n' ; \
+               git diff ; \
+       fi > $(outdir)/tree.gittxt
+       $(MAKE) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-lily-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= $(outdir)/collated-files.html
+       rsync -L -a --exclude 'out-*' --exclude 'out' --exclude mf --exclude source --exclude mf $(top-build-dir)/out/share $(outdir)
+

diff --git a/make/musicxml-targets.make b/make/musicxml-targets.make
index 7cefb8277e7ee5e0fb4fd2affc5abf7cc786d0d3..a0668ce825711a246965c8030774350235ebe615 100644 (file)
--- a/make/musicxml-targets.make
+++ b/make/musicxml-targets.make
@@ -1 +1 @@
-default: $(LY_FILES)
\ No newline at end of file
+default: $(OUT_LY_FILES)

diff --git a/make/musicxml-vars.make b/make/musicxml-vars.make
index ccf8c74ec2a36fab7d33ecbaf3e29b5f104012c6..0844fa730e8e27fdb128494413e67e170a7a4ee5 100644 (file)
--- a/make/musicxml-vars.make
+++ b/make/musicxml-vars.make
@@ -3,9 +3,8 @@
 MUSICXML_FILES := $(call src-wildcard,*.xml)
 # LY_FILES=$(addprefix $(outdir)/, $(addsuffix .ly, $(MUSICXML_FILE)))
 # LY_FILES = $(MUSICXML_FILES:%.xml=$(outdir)/%.ly)
-LY_FILES = $(MUSICXML_FILES:%.xml=$(outdir)/%.ly)
+OUT_LY_FILES = $(MUSICXML_FILES:%.xml=$(outdir)/%.ly)
 
+OUT_FILES = $(OUT_LY_FILES)
 
-OUT_FILES = $(LY_FILES)
-
-EXTRA_DIST_FILES +=$(MUSICXML_FILES)
+EXTRA_DIST_FILES += $(MUSICXML_FILES)