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

[dhewg at users.sourceforge.net]

Revision: 41599
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41599&view=rev
Author:   dhewg
Date:     2009-06-16 22:35:35 +0000 (Tue, 16 Jun 2009)

Log Message:
-----------
Added support for port specific dist targets, now used for bundles for OSX Intel and PPC.

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

Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg	2009-06-16 21:59:20 UTC (rev 41598)
+++ buildbot/config/master.cfg	2009-06-16 22:35:35 UTC (rev 41599)
@@ -184,10 +184,12 @@
 		"--with-ogg-prefix=%s" % scumm_root_osx_intel,
 		"--with-flac-prefix=%s" % scumm_root_osx_intel,
 		"--with-zlib-prefix=%s" % scumm_root_osx_intel,
+		"--with-staticlib-prefix=%s" % scumm_root_osx_intel,
 	],
 	"env": scumm_env_osx_intel,
+	"disttarget": "bundle",
 	"strip": "%s/bin/i686-apple-darwin9-strip scummvm" % scumm_root_osx_intel,
-	"package": [ "scummvm" ]
+	"package": [ "ScummVM.app" ]
 }
 
 scumm_platforms_trunk["osx_intel"] = p
@@ -213,8 +215,9 @@
 		"--with-staticlib-prefix=%s" % scumm_root_osx_ppc,
 	],
 	"env": scumm_env_osx_ppc,
+	"disttarget": "bundle",
 	"strip": "%s/bin/ppc-apple-darwin8-strip scummvm" % scumm_root_osx_ppc,
-	"package": [ "scummvm" ]
+	"package": [ "ScummVM.app" ]
 }
 
 scumm_platforms_trunk["osx_ppc"] = p
@@ -522,12 +525,26 @@
 						],
 						env = config["env"]))
 
-	if config.has_key("strip"):
-		f.addStep(scumm.Strip(command = config["strip"]))
+	scumm_package = []
 
+	if config.has_key("disttarget"):
+		f.addStep(scumm.Dist(command = [
+								"make",
+								config["disttarget"],
+								WithProperties("SCUMMVM_SVN_REVISION=%(got_revision)s")
+							],
+							env = config["env"]))
+	else:
+		# platform has no configured dist target, strip the binary and package up the default files
+		scumm_package = scumm_package_trunk
+
+		if config.has_key("strip"):
+			f.addStep(scumm.Strip(command = config["strip"]))
+
+
 	f.addStep(scumm.Package(srcpath = "../../src-trunk/src/",
 							dstpath = scumm_package_dst_trunk,
-							package = scumm_package_trunk,
+							package = scumm_package,
 							buildname = name + "-trunk",
 							platform_package = config["package"]))
 

Modified: buildbot/config/scumm.py
===================================================================
--- buildbot/config/scumm.py	2009-06-16 21:59:20 UTC (rev 41598)
+++ buildbot/config/scumm.py	2009-06-16 22:35:35 UTC (rev 41599)
@@ -81,6 +81,22 @@
 
 		ShellCommand.start(self)
 
+# Small buildstep class to handle port specific jobs prior packaging, only done on nightly builds.
+class Dist(ShellCommand):
+	name = "dist"
+	haltOnFailure = 1
+	flunkOnFailure = 1
+	description = [ "dist" ]
+	descriptionDone = [ "dist" ]
+
+	def start(self):
+		properties = self.build.getProperties()
+
+		if not properties.has_key("package"):
+			return SKIPPED
+
+		ShellCommand.start(self)
+
 # Buildstep class to package binaries, only done on nightly builds.
 class Package(ShellCommand):
 	name = "package"
@@ -124,7 +140,7 @@
 		files += [ os.path.join("../build", i) for i in self.platform_package ]
 
 		self.command = "mkdir %s && " \
-						"cp %s %s/ && " \
+						"cp -r %s %s/ && " \
 						"tar cvjf %s %s/ && " \
 						"mv %s %s/ && " \
 						"ln -sf %s %s && " \


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