[cig-commits] r12638 - cs/buildbot/trunk/buildbot

[leif at geodynamics.org]

Author: leif
Date: 2008-08-14 16:40:23 -0700 (Thu, 14 Aug 2008)
New Revision: 12638

Modified:
   cs/buildbot/trunk/buildbot/bs.py
Log:
Changed the SPECFEM build steps so that it simply runs the shell
script hidden in the SVN property buildbot:script.


Modified: cs/buildbot/trunk/buildbot/bs.py
===================================================================
--- cs/buildbot/trunk/buildbot/bs.py	2008-08-14 22:15:36 UTC (rev 12637)
+++ cs/buildbot/trunk/buildbot/bs.py	2008-08-14 23:40:23 UTC (rev 12638)
@@ -54,25 +54,19 @@
     def buildSteps(self, buildEnv, buildConfig, env, desc, workdir, configureArgs, line):
         
         configureArgs = self.configureArgs(buildEnv, buildConfig, env, configureArgs, line)
+
+        command = WithProperties("svn propget buildbot:script > buildbot.sh; sh buildbot.sh %(buildnumber)d")
         
         steps = [
             s(step.ShellCommand,
-              description=["configure"] + desc,
-              descriptionDone=desc + ["configuration"],
-              command=["./configure"], #+ configureArgs,
+              description=["scripting"] + desc,
+              descriptionDone=desc + ["scripting"],
+              command=["sh", "-c", command],
+              logfiles={"benchmarks.bbl": "benchmarks.bbl", "config.log": "config.log"},
               workdir=workdir,
               env=env,
               haltOnFailure=True,
-              logfiles={"config.log": "config.log"},
               ),
-
-            s(step.Compile,
-              description=["compiling"] + desc,
-              descriptionDone=desc + ["compile"],
-              command=["make"],
-              workdir=workdir,
-              env=env,
-              ),
             ]
         
         return steps
@@ -404,6 +398,7 @@
               env=env,
               ),
             ]
+
         return steps
 
 debug = DebugBuildSystem()