Mercurial > gub
changeset 6195:5b5865d521c6
lilypond.make: do not use TOOLS. Adds /usr/bin/makeinfo dep.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Sun, 26 Aug 2012 11:39:49 +0200 |
| parents | 60305a4352ff |
| children | a20b5d52d48d |
| files | README lilypond.make |
| diffstat | 2 files changed, 15 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/README Sun Aug 26 11:38:36 2012 +0200 +++ b/README Sun Aug 26 11:39:49 2012 +0200 @@ -114,7 +114,7 @@ - standard unix shell utilities: cat, cp, install, mv, rm, sed, ... - a standard unix development environment with GCC and G++ - Python 2.4 or newer (2.5, 2.6, 3.0 are known to work) - - the libmpfr library (and development headers) + - /usr/bin/makeinfo [from the texinfo package] * Try bin/gub --help
--- a/lilypond.make Sun Aug 26 11:38:36 2012 +0200 +++ b/lilypond.make Sun Aug 26 11:39:49 2012 +0200 @@ -70,8 +70,10 @@ NATIVE_TARGET_DIR=$(CWD)/target/$(BUILD_PLATFORM) TOOLS_BIN_DIR=$(CWD)/target/tools/root/usr/bin/ -#FIXME: yet another copy of gub/settings.py -SET_LOCAL_PATH=PATH=$(CWD)/target/local/root/usr/bin:$(PATH) +#FIXME: we cannot use python from tools, because of the gub/logging.py +# name clash. Todo: rename gub/logging.py -- triggers full +# rebuild. Not using tools means: we depend on /usr/bin/makeinfo +#SET_TOOLS_PATH=PATH=$(CWD)/target/tools/root/usr/bin:$(PATH) LILYPOND_VERSIONS = versiondb/lilypond.versions @@ -237,6 +239,7 @@ cached-dist-check cached-doc-export cached-test-export: -mkdir -p uploads/signatures if test ! -f $(call SIGNATURE_FUNCTION,$@) ; then \ + $(SET_TOOLS_PATH) \ $(MAKE) $(subst cached,unlocked,$@) \ && touch $(call SIGNATURE_FUNCTION,$@) ; fi @@ -253,19 +256,22 @@ unlocked-test-export: mkdir -p uploads/webtest PYTHONPATH=$(NATIVE_LILY_BUILD)/python/out \ - PATH=$(TOOLS_BIN_DIR):$(PATH) $(PYTHON) test-lily/rsync-test.py \ + $(SET_TOOLS_PATH) \ + $(PYTHON) test-lily/rsync-test.py \ --version-file=$(NATIVE_LILY_BUILD)/out/VERSION \ --output-distance=$(NATIVE_LILY_SRC)/$(BUILDSCRIPTS)/output-distance.py \ --test-dir=uploads/webtest doc-export: - $(PYTHON) gub/with-lock.py --skip $(DOC_LOCK) $(MAKE) cached-doc-export + $(SET_TOOLS_PATH) \ + $(PYTHON) gub/with-lock.py --skip $(DOC_LOCK) $(MAKE) cached-doc-export test-export: - $(PYTHON) gub/with-lock.py --skip $(DOC_LOCK) $(MAKE) cached-test-export + $(SET_TOOLS_PATH) \ + $(PYTHON) gub/with-lock.py --skip $(DOC_LOCK) $(MAKE) cached-test-export unlocked-dist-check: - $(SET_LOCAL_PATH)\ + $(SET_TOOLS_PATH) \ $(PYTHON) test-lily/dist-check.py\ --branch=$(LILYPOND_BRANCH) \ --url=$(LILYPOND_REPO_URL) \ @@ -273,7 +279,8 @@ cp $(NATIVE_LILY_BUILD)/out/lilypond-$(DIST_VERSION).tar.gz uploads dist-check: - $(PYTHON) gub/with-lock.py --skip $(NATIVE_LILY_BUILD).lock \ + $(SET_TOOLS_PATH) \ + $(PYTHON) gub/with-lock.py --skip $(NATIVE_LILY_BUILD).lock \ $(MAKE) cached-dist-check print-branches: