[cig-commits] r7009 - in cs/buildbot/trunk/buildbot: . status

[leif at geodynamics.org]

Author: leif
Date: 2007-05-30 17:45:17 -0700 (Wed, 30 May 2007)
New Revision: 7009

Modified:
   cs/buildbot/trunk/buildbot/bs.py
   cs/buildbot/trunk/buildbot/lines.py
   cs/buildbot/trunk/buildbot/status/mail.py
Log:
Don't run 'autoreconf' for source packages.  Fixed mail notification.


Modified: cs/buildbot/trunk/buildbot/bs.py
===================================================================
--- cs/buildbot/trunk/buildbot/bs.py	2007-05-31 00:10:24 UTC (rev 7008)
+++ cs/buildbot/trunk/buildbot/bs.py	2007-05-31 00:45:17 UTC (rev 7009)
@@ -6,6 +6,9 @@
 
 class BuildSystem(object): # BuildFactory?
 
+    def generativeSteps(self, buildEnv, buildConfig, env, desc, workdir, configureArgs, line):
+        return []
+
     def buildSteps(self, buildEnv, buildConfig, env, desc, workdir, configureArgs, line):
         raise NotImplementedError()
 
@@ -37,10 +40,8 @@
 class GNUBuildSystem(BuildSystem): # a.k.a. Autotools
 
 
-    def buildSteps(self, buildEnv, buildConfig, env, desc, workdir, configureArgs, line):
+    def generativeSteps(self, buildEnv, buildConfig, env, desc, workdir, configureArgs, line):
         
-        configureArgs = self.configureArgs(buildEnv, buildConfig, env, configureArgs, line)
-        
         steps = [
             s(step.ShellCommand,
               description=["autoreconf"] + desc,
@@ -50,6 +51,16 @@
               env=env,
               haltOnFailure=True,
               ),
+            ]
+
+        return steps
+
+
+    def buildSteps(self, buildEnv, buildConfig, env, desc, workdir, configureArgs, line):
+        
+        configureArgs = self.configureArgs(buildEnv, buildConfig, env, configureArgs, line)
+        
+        steps = [
             s(step.ShellCommand,
               description=["configure"] + desc,
               descriptionDone=desc + ["configuration"],

Modified: cs/buildbot/trunk/buildbot/lines.py
===================================================================
--- cs/buildbot/trunk/buildbot/lines.py	2007-05-31 00:10:24 UTC (rev 7008)
+++ cs/buildbot/trunk/buildbot/lines.py	2007-05-31 00:45:17 UTC (rev 7009)
@@ -69,6 +69,8 @@
                     mode = 'copy', # 'clobber', 'copy', 'update'
                     )
                 )
+            steps += self.generativeSteps(buildEnv, buildConfig, env,
+                                          desc, workdir, configureArgs)
             steps += self.buildSteps(buildEnv, buildConfig, env,
                                      desc, workdir, configureArgs)
         
@@ -91,6 +93,15 @@
         self._buildSystem = bs
 
 
+    def generativeSteps(self, buildEnv, buildConfig, env, desc, workdir, configureArgs):
+        buildSystem = self.buildSystem()
+        genSteps = buildSystem.generativeSteps(
+            buildEnv, buildConfig, env,
+            desc, workdir, configureArgs, self
+            )
+        return genSteps
+
+
     def buildSteps(self, buildEnv, buildConfig, env, desc, workdir, configureArgs):
         buildSystem = self.buildSystem()
         buildSteps = buildSystem.buildSteps(
@@ -148,5 +159,8 @@
         self.scheduler = Nightly(self.fullName(), builderNames, hour=3, minute=0)
         return self.scheduler
 
+    def generativeSteps(self, buildEnv, buildConfig, env, desc, workdir, configureArgs):
+        return []
 
+
 # end of file

Modified: cs/buildbot/trunk/buildbot/status/mail.py
===================================================================
--- cs/buildbot/trunk/buildbot/status/mail.py	2007-05-31 00:10:24 UTC (rev 7008)
+++ cs/buildbot/trunk/buildbot/status/mail.py	2007-05-31 00:45:17 UTC (rev 7009)
@@ -247,7 +247,7 @@
         if ss is None:
             source = "unavailable"
         else:
-            branch, revision, patch = ss
+            root, branch, revision, patch = ss
             source = ""
             if branch:
                 source += "[branch %s] " % branch