[jhbuild/external-deps] Allow buildbot to install external deps



commit f9bf289c1fc80d4efba503b2f556ae908d9ea61d
Author: John Carr <john carr unrouted co uk>
Date:   Wed Jun 3 11:57:39 2009 +0100

    Allow buildbot to install external deps
---
 jhbuild/buildbot/factory.py |    3 +++
 jhbuild/commands/bot.py     |    6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/jhbuild/buildbot/factory.py b/jhbuild/buildbot/factory.py
index 2e39e4d..6bc71cb 100644
--- a/jhbuild/buildbot/factory.py
+++ b/jhbuild/buildbot/factory.py
@@ -34,6 +34,9 @@ class JHBuildFactory(factory.BuildFactory):
         self.getSteps()
 
     def getSteps(self):
+        if self.slave.get_external_dependencies:
+            self.addStep(JHBuildCommand, stage='builddeps', moduleset=self.moduleset,
+                    module=self.module)
         self.addStep(JHBuildSource, moduleset=self.moduleset, module=self.module)
         self.addStep(JHBuildCommand, stage='build', moduleset=self.moduleset, module=self.module)
         if self.slave.run_checks:
diff --git a/jhbuild/commands/bot.py b/jhbuild/commands/bot.py
index dcdf99a..062d831 100644
--- a/jhbuild/commands/bot.py
+++ b/jhbuild/commands/bot.py
@@ -280,6 +280,7 @@ class cmd_bot(Command):
             run_checks = True
             run_coverage_report = False
             run_clean_afterwards = False
+            get_external_dependencies = False
 
             def load_extra_configuration(self, slaves_dir):
                 slave_xml_file = os.path.join(slaves_dir, self.slavename + '.xml')
@@ -292,7 +293,7 @@ class cmd_bot(Command):
 
                 for attribute in ('config/max_builds', 'config/missing_timeout',
                             'config/run_checks', 'config/run_coverage_report',
-                            'config/run_clean_afterwards',
+                            'config/run_clean_afterwards', 'config/get_external_dependencies',
                             'info/contact_name', 'info/contact_email',
                             'info/url', 'info/distribution', 'info/architecture',
                             'info/version'):
@@ -308,7 +309,8 @@ class cmd_bot(Command):
                         except ValueError:
                             continue
 
-                    if attr_name in ('run_checks', 'run_coverage_report', 'run_clean_afterwards'):
+                    if attr_name in ('run_checks', 'run_coverage_report', 'run_clean_afterwards',
+                                     'get_external_dependencies'):
                         value = (value == 'yes')
 
                     setattr(self, attr_name, value)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]