Mercurial > gub

changeset 3382:9545aeebe79e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'gub' of git+ssh://git.sv.gnu.org/srv/git/lilypond into gub
author Jan Nieuwenhuizen <janneke@gnu.org>
date Tue, 01 May 2007 17:36:39 +0200
parents d5dcea53e366 (current diff) 0812ef3f08c8 (diff)
children fd3da3fa0275
files
diffstat 4 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/compilers.make	Tue May 01 17:36:09 2007 +0200
+++ b/compilers.make	Tue May 01 17:36:39 2007 +0200
@@ -39,13 +39,13 @@
 	mkdir -p $(DISTCC_DIRS)
 
 local-distcc:
-	chmod +x lib/distcc.py
+	chmod +x gub/distcc.py
 	rm -rf target/native-distcc/bin/ target/cross-distcc/bin/
 	mkdir -p target/cross-distcc/bin/ target/native-distcc/bin/
 	$(foreach binary,$(foreach p,$(PLATFORMS), $(filter-out %/python-config,$(wildcard target/$(p)/system/usr/cross/bin/*))), \
-		ln -s $(CWD)/lib/distcc.py target/cross-distcc/bin/$(notdir $(binary)) && ) true
+		ln -s $(CWD)/gub/distcc.py target/cross-distcc/bin/$(notdir $(binary)) && ) true
 	$(foreach binary, gcc g++, \
-		ln -s $(CWD)/lib/distcc.py target/native-distcc/bin/$(notdir $(binary)) && ) true
+		ln -s $(CWD)/gub/distcc.py target/native-distcc/bin/$(notdir $(binary)) && ) true
 
 # Find out if we need gcc or glibc as topmost cross compile target
 gcc_or_glibc = $(shell $(GUB_BUILDER) -p $(1) --inspect=version glibc > /dev/null 2>/dev/null && echo glibc || echo gcc) 
--- a/gub/with-lock.py	Tue May 01 17:36:09 2007 +0200
+++ b/gub/with-lock.py	Tue May 01 17:36:39 2007 +0200
@@ -26,7 +26,7 @@
 import os
 
 
-sys.path.insert (0, os.path.split (sys.argv[0])[0] + '/../lib/')
+sys.path.insert (0, os.path.split (sys.argv[0])[0] + '/..')
 
 from gub import locker
 
--- a/lilypond.make	Tue May 01 17:36:09 2007 +0200
+++ b/lilypond.make	Tue May 01 17:36:39 2007 +0200
@@ -59,13 +59,13 @@
 ################
 
 unlocked-update-versions:
-	python lib/versiondb.py --dbfile $(LILYPOND_VERSIONS) --download
-	python lib/versiondb.py --dbfile uploads/fontconfig.versions --download
-	python lib/versiondb.py --dbfile uploads/guile.versions --download
-	python lib/versiondb.py --dbfile uploads/libtool.versions --download
+	python gub/versiondb.py --dbfile $(LILYPOND_VERSIONS) --download
+	python gub/versiondb.py --dbfile uploads/fontconfig.versions --download
+	python gub/versiondb.py --dbfile uploads/guile.versions --download
+	python gub/versiondb.py --dbfile uploads/libtool.versions --download
 
 update-versions:
-	$(PYTHON) lib/with-lock.py --skip $(LILYPOND_VERSIONS).lock $(MAKE) unlocked-update-versions
+	$(PYTHON) gub/with-lock.py --skip $(LILYPOND_VERSIONS).lock $(MAKE) unlocked-update-versions
 
 download:
 	$(foreach p, $(PLATFORMS), $(call INVOKE_GUB_BUILDER,$(p)) --stage=download lilypond && ) true
@@ -239,7 +239,7 @@
 NATIVE_BUILD_COMMITTISH=$(shell cat downloads/lilypond.git/refs/heads/$(LILYPOND_LOCAL_BRANCH))
 
 DIST_VERSION=$(shell cat $(NATIVE_LILY_BUILD)/out/VERSION)
-DOC_BUILDNUMBER=$(shell $(PYTHON) lib/versiondb.py --build-for $(DIST_VERSION))
+DOC_BUILDNUMBER=$(shell $(PYTHON) gub/versiondb.py --build-for $(DIST_VERSION))
 
 DOC_RELOCATION = \
     LILYPOND_EXTERNAL_BINARY="$(NATIVE_ROOT)/usr/bin/lilypond" \
@@ -253,10 +253,10 @@
 doc: native doc-build
 
 doc-clean:
-	$(PYTHON) lib/with-lock.py --skip $(DOC_LOCK) $(MAKE) unlocked-doc-clean
+	$(PYTHON) gub/with-lock.py --skip $(DOC_LOCK) $(MAKE) unlocked-doc-clean
 
 doc-build:
-	$(PYTHON) lib/with-lock.py --skip $(DOC_LOCK) $(MAKE) cached-doc-build
+	$(PYTHON) gub/with-lock.py --skip $(DOC_LOCK) $(MAKE) cached-doc-build
 
 unlocked-doc-clean:
 	make -C $(NATIVE_TARGET_DIR)/gubfiles/build/lilypond-$(LILYPOND_LOCAL_BRANCH) \
@@ -327,7 +327,7 @@
 		$(NATIVE_LILY_SRC)/buildscripts/output-distance.py $(NATIVE_LILY_BUILD)/out-www/online-root
 
 doc-export:
-	$(PYTHON) lib/with-lock.py --skip $(DOC_LOCK) $(MAKE) cached-doc-export
+	$(PYTHON) gub/with-lock.py --skip $(DOC_LOCK) $(MAKE) cached-doc-export
 
 unlocked-dist-check:
 	$(SET_LOCAL_PATH) \
@@ -335,5 +335,5 @@
 	cp $(NATIVE_LILY_BUILD)/out/lilypond-$(DIST_VERSION).tar.gz uploads/
 
 dist-check:
-	$(PYTHON) lib/with-lock.py --skip $(NATIVE_LILY_BUILD).lock \
+	$(PYTHON) gub/with-lock.py --skip $(NATIVE_LILY_BUILD).lock \
 		$(MAKE) cached-dist-check
--- a/mingit.make	Tue May 01 17:36:09 2007 +0200
+++ b/mingit.make	Tue May 01 17:36:39 2007 +0200
@@ -41,4 +41,4 @@
 	$(call BUILD,$@,git)
 
 update-versions:
-	python lib/versiondb.py --no-sources --url http://lilypond.org/git --dbfile uploads/git.db --download
+	python gub/versiondb.py --no-sources --url http://lilypond.org/git --dbfile uploads/git.db --download