[Scummvm-cvs-logs] SF.net SVN: scummvm:[56232] buildbot/config/master.cfg

djwillis at users.sourceforge.net djwillis at users.sourceforge.net
Sat Jan 21 18:34:28 CET 2012


Revision: 56232
          http://scummvm.svn.sourceforge.net/scummvm/?rev=56232&view=rev
Author:   djwillis
Date:     2012-01-21 17:34:26 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
BUILDBOT: Re-enable OpenPandora toolchain support.

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

Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg	2012-01-21 01:44:06 UTC (rev 56231)
+++ buildbot/config/master.cfg	2012-01-21 17:34:26 UTC (rev 56232)
@@ -542,26 +542,24 @@
 
 # OpenPandora
 
-# Disabled at the moment as the build server has an ancient GLIBC on it ;).
+scumm_root_op = "/opt/toolchains/arm-angstrom-openpandora"
+scumm_env_op = copy.deepcopy(scumm_env)
+scumm_env_op["PATH"] = "%s/bin:%s" % (scumm_root_op, DEFAULT_PATH)
+scumm_env_op["CXX"] = "ccache arm-angstrom-linux-gnueabi-g++"
 
-#scumm_root_op = "/opt/toolchains/arm-angstrom-openpandora"
-#scumm_env_op = copy.deepcopy(scumm_env)
-#scumm_env_op["PATH"] = "%s/bin:%s" % (scumm_root_op, DEFAULT_PATH)
-#scumm_env_op["CXX"] = "ccache arm-angstrom-linux-gnueabi-g++"
-#
-#p = {
-#	"configureargs": [
-#		"--host=openpandora",
-#		"--enable-plugins",
-#		"--default-dynamic"
-#	],
-#	"env": scumm_env_op,
-#	"disttarget": "op-bundle",
-#	"package": [ "release/scummvm-op-pnd.tar.bz2" ]
-#}
+p = {
+	"configureargs": [
+		"--host=openpandora",
+		"--enable-plugins",
+		"--default-dynamic"
+	],
+	"env": scumm_env_op,
+	"disttarget": "op-bundle",
+	"package": [ "release/scummvm-op-pnd.tar.bz2" ]
+}
 
-#scumm_platforms_master["op"] = p
-#scumm_platforms_stable["op"] = p
+scumm_platforms_master["op"] = p
+scumm_platforms_stable["op"] = p
 
 # GPH Caanoo
 # SDK_PATH and TARGET_SYS are exported as they are used in the platforms SDL_CONFIG.

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





More information about the Scummvm-git-logs mailing list