changeset 3423:f2c1b80f4b6a

Support offline workflow Add --online option to override --offline. Add GUB_ONLINE_OPTION Use for download target Fix thinkos with BaseException and spec_obj
author Han-Wen Nienhuys <hanwen@xs4all.nl>
date Thu, 03 May 2007 22:16:10 -0400
parents a38bed03e001
children 74517019ed26 caf93f6734c8
files bin/gub gub.make lilypond.make
diffstat 3 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/bin/gub	Fri May 04 00:01:24 2007 +0200
+++ b/bin/gub	Thu May 03 22:16:10 2007 -0400
@@ -75,6 +75,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')
@@ -174,8 +178,8 @@
 
     if options.fresh:
         try:
-            spec_obj.os_interface.action ('Removing status filex')
-            os.unlink (spec_obj.get_stamp_file ())
+            spec.os_interface.action ('Removing status filex')
+            os.unlink (spec.get_stamp_file ())
         except OSError:
             pass
 
--- a/gub.make	Fri May 04 00:01:24 2007 +0200
+++ b/gub.make	Thu May 03 22:16:10 2007 -0400
@@ -13,6 +13,7 @@
 
 INVOKE_GUB_BUILDER=$(GUB_BUILDER)\
  --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_BUILDER_OPTIONS)\
--- a/lilypond.make	Fri May 04 00:01:24 2007 +0200
+++ b/lilypond.make	Thu May 03 22:16:10 2007 -0400
@@ -76,7 +76,7 @@
 	$(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
+	$(foreach p, $(PLATFORMS), $(call INVOKE_GUB_BUILDER,$(p)) --online --stage=download lilypond && ) true
 	$(MAKE) downloads/genini
 	rm -f target/*/status/lilypond*
 	rm -f log/lilypond-$(LILYPOND_VERSION)*.*.test.pdf