[Scummvm-cvs-logs] SF.net SVN: scummvm:[48947] buildbot/config

[dhewg at users.sourceforge.net]

Revision: 48947
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48947&view=rev
Author:   dhewg
Date:     2010-05-04 21:36:13 +0000 (Tue, 04 May 2010)

Log Message:
-----------
Remove workarounds for older buildbot versions.

Modified Paths:
--------------
    buildbot/config/master.cfg
    buildbot/config/scumm.py

Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg	2010-05-04 21:01:29 UTC (rev 48946)
+++ buildbot/config/master.cfg	2010-05-04 21:36:13 UTC (rev 48947)
@@ -473,7 +473,7 @@
 
 # Only fetch changes from SVN, these checkouts are used by all compile runs.
 
-from buildbot.scheduler import Scheduler, Triggerable
+from buildbot.scheduler import Scheduler, Nightly, Triggerable
 
 s_trunk = Scheduler(name = "fetch-trunk",
 					branch = None,
@@ -500,19 +500,19 @@
 s_build_branch = Triggerable(name = "branch", builderNames = builders_branch)
 
 # The nightly schedulers.
-s_nightly_trunk = scumm.Nightly(name = "nightly_trunk",
-								branch = None,
-								builderNames = [ "nightly-trunk" ],
-								hour = 4,
-								minute = 0,
-								onlyIfChanged = True)
+s_nightly_trunk = Nightly(name = "nightly_trunk",
+							branch = None,
+							builderNames = [ "nightly-trunk" ],
+							hour = 4,
+							minute = 0,
+							onlyIfChanged = True)
 
-s_nightly_branch = scumm.Nightly(name = "nightly_branch",
-								branch = scumm_branch,
-								builderNames = [ "nightly-branch" ],
-								hour = 5,
-								minute = 0,
-								onlyIfChanged = True)
+s_nightly_branch = Nightly(name = "nightly_branch",
+							branch = scumm_branch,
+							builderNames = [ "nightly-branch" ],
+							hour = 5,
+							minute = 0,
+							onlyIfChanged = True)
 
 c["schedulers"] = [
 	s_trunk,
@@ -628,7 +628,7 @@
 	f.addStep(Compile(command = [
 							"make",
 							"-j2",
-							WithProperties("VER_SVNREV=%(got_revision)s")
+							WithProperties("VER_SVNREV=%(revision)s")
 						],
 						env = config["env"]))
 
@@ -667,7 +667,7 @@
 	f.addStep(Compile(command = [
 							"make",
 							"-j2",
-							WithProperties("VER_SVNREV=%(got_revision)s")
+							WithProperties("VER_SVNREV=%(revision)s")
 						],
 						env = config["env"]))
 

Modified: buildbot/config/scumm.py
===================================================================
--- buildbot/config/scumm.py	2010-05-04 21:01:29 UTC (rev 48946)
+++ buildbot/config/scumm.py	2010-05-04 21:36:13 UTC (rev 48947)
@@ -21,14 +21,6 @@
 
 from string import join, capitalize, lower
 
-# Nightly scheduler helper class. It stores the SVN revision of the latest change,
-# so it can be used for the builds it is issuing.
-class Nightly(scheduler.Nightly):
-	def addChange(self, change):
-		if change.branch == self.branch:
-			self.properties.setProperty("got_revision", change.revision, "Scheduler")
-		scheduler.Nightly.addChange(self, change)
-
 # Buildstep class for our build system. A ./configure run is forced on nightly builds,
 # which results in a full rebuild. For incremental builds, its only run when no
 # Makefile exists (which is generated by the script itself).
@@ -44,11 +36,6 @@
 	def start(self):
 		properties = self.build.getProperties()
 
-		# buildbot workaround, pass on the revision.
-		if properties.has_key("revision"):
-			if not properties.has_key("got_revision") or properties["got_revision"] == None:
-				self.setProperty("got_revision", properties["revision"])
-
 		self.command = "[ -f Makefile ] || " + " ".join(self.command)
 
 		ShellCommand.start(self)
@@ -115,6 +102,9 @@
 	def start(self):
 		properties = self.build.getProperties()
 
+		if not properties.has_key("revision"):
+			return SKIPPED
+
 		if not properties.has_key("package"):
 			return SKIPPED
 
@@ -123,7 +113,7 @@
 		if len(self.disttarget) > 0:
 			disttarget = True
 
-		name = "%s-r%s" % (self.buildname, properties["got_revision"])
+		name = "%s-r%s" % (self.buildname, properties["revision"])
 		file = "%s.tar.bz2" % name
 		symlink = "%s-latest.tar.bz2" % self.buildname
 
@@ -138,7 +128,7 @@
 		self.command = ""
 
 		if disttarget:
-			self.command += "make %s && " % self.disttarget
+			self.command += "make VER_SVNREV=%s %s && " % (properties["revision"], self.disttarget)
 
 		self.command += "mkdir %s && " % name
 		self.command += "cp -r %s %s/ && " % (" ".join(files), name)
@@ -285,7 +275,7 @@
 
 		self.timer = reactor.callLater(self.stableTimer,
 										self.reportBuildStatus,
-										build.getProperty("got_revision"))
+										build.getProperty("revision"))
 
 	def reportBuildStatus(self, revision):
 		self.timer = None


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.