Mercurial > gub

changeset 5873:337dde8d3a01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use LILYPOND_BRANCH for test and docs. Fixes eg stable build.
author Jan Nieuwenhuizen <janneke@gnu.org>
date Thu, 31 Dec 2009 15:48:29 +0100
parents 922a6617a34f
children 10de3d9b3e98
files lilypond.make
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lilypond.make	Tue Dec 15 13:36:30 2009 +0000
+++ b/lilypond.make	Thu Dec 31 15:48:29 2009 +0100
@@ -47,6 +47,9 @@
 BUILD_PACKAGE='$(LILYPOND_SOURCE_URL)'
 INSTALL_PACKAGE = lilypond
 
+DOC_PACKAGE=$(subst lilypond,lilypond-doc,$(BUILD_PACKAGE))
+TEST_PACKAGE=$(subst lilypond,lilypond-test,$(BUILD_PACKAGE))
+
 MAKE += -f lilypond.make
 
 # FIXME: this is duplicated and must match actual info in guile.py
@@ -133,10 +136,10 @@
 test: dist-check test-output test-export
 
 doc:
-	$(call INVOKE_GUB,$(BUILD_PLATFORM) --offline) lilypond-doc
+	$(call INVOKE_GUB,$(BUILD_PLATFORM) --offline) $(DOC_PACKAGE)
 
 test-output:
-	$(call INVOKE_GUB,$(BUILD_PLATFORM) --offline) lilypond-test
+	$(call INVOKE_GUB,$(BUILD_PLATFORM) --offline) $(TEST_PACKAGE)
 
 print-success:
 	python test-lily/upload.py --branch=$(LILYPOND_BRANCH) --url $(LILYPOND_REPO_URL)
@@ -202,6 +205,9 @@
 print:
 	@echo LDB $(LILYPOND_DIRRED_BRANCH)
 	@echo LFB  $(LILYPOND_FLATTENED_BRANCH)
+	@echo $(BUILD_PACKAGE)
+	@echo $(DOC_PACKAGE)
+	@echo $(TEST_PACKAGE)
 
 DIST_VERSION=$(shell cat $(NATIVE_LILY_BUILD)/out/VERSION)
 DOC_BUILDNUMBER=$(shell $(PYTHON) gub/versiondb.py --platforms=$(PLATFORMS) --build-for=$(DIST_VERSION))