Mercurial > gub
changeset 3428:caf93f6734c8
Merge branch 'gub' of git+ssh://git.sv.gnu.org/srv/git/lilypond into gub
Conflicts:
bin/gub
lilypond.make
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Fri, 04 May 2007 10:08:05 +0200 |
| parents | b6d7c063a4f9 (current diff) f2c1b80f4b6a (diff) |
| children | d03b487f0025 |
| files | bin/gub gub.make lilypond.make |
| diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/gub Fri May 04 10:02:18 2007 +0200 +++ b/bin/gub Fri May 04 10:08:05 2007 +0200 @@ -71,6 +71,10 @@ dest='offline', help='Do not attempt to download anything') + p.add_option ('--online', action='store_false', + dest='offline', + help='Download as part of the build') + p.add_option ('--stage', action='store', dest='stage', default=None, help='Force rebuild of stage') @@ -122,7 +126,6 @@ return p - #FIXME: move to Builder? def inspect (settings, files): (names, specs) = gup.get_source_packages (settings, files)
--- a/gub.make Fri May 04 10:02:18 2007 +0200 +++ b/gub.make Fri May 04 10:08:05 2007 +0200 @@ -18,6 +18,7 @@ INVOKE_GUB=$(GUB)\ --target-platform $(1)\ + $(GUB_ONLINE_OPTION) \ $(foreach h,$(GUB_NATIVE_DISTCC_HOSTS), --native-distcc-host $(h))\ $(foreach h,$(GUB_CROSS_DISTCC_HOSTS), --cross-distcc-host $(h))\ $(GUB_OPTIONS)\
--- a/lilypond.make Fri May 04 10:02:18 2007 +0200 +++ b/lilypond.make Fri May 04 10:08:05 2007 +0200 @@ -78,7 +78,7 @@ $(PYTHON) gub/with-lock.py --skip $(LILYPOND_VERSIONS).lock $(MAKE) unlocked-update-versions download: - $(foreach p, $(PLATFORMS), $(call INVOKE_GUB,$(p)) --stage=download lilypond && ) true + $(foreach p, $(PLATFORMS), $(call INVOKE_GUB,$(p)) --online --stage=download lilypond && ) true $(MAKE) downloads/genini rm -f target/*/status/lilypond* rm -f log/lilypond-$(LILYPOND_VERSION)*.*.test.pdf