[Scummvm-cvs-logs] SF.net SVN: scummvm:[54096] buildbot
djwillis at users.sourceforge.net
djwillis at users.sourceforge.net
Fri Nov 5 14:19:22 CET 2010
Revision: 54096
http://scummvm.svn.sourceforge.net/scummvm/?rev=54096&view=rev
Author: djwillis
Date: 2010-11-05 13:19:21 +0000 (Fri, 05 Nov 2010)
Log Message:
-----------
BUILDBOT: Update web pages to add Caanoo nightly builds.
* Also add an image I forgot to commit ;).
Modified Paths:
--------------
buildbot/config/master.cfg
buildbot/web/builds.html
Added Paths:
-----------
buildbot/web/images/par-head.png
Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg 2010-11-05 12:36:20 UTC (rev 54095)
+++ buildbot/config/master.cfg 2010-11-05 13:19:21 UTC (rev 54096)
@@ -568,24 +568,55 @@
scumm_platforms_branch["dingux"] = p
# OpenPandora
-scumm_root_op = "/opt/toolchains/arm-angstrom-openpandora"
-scumm_env_op = copy.deepcopy(scumm_env)
-scumm_env_op["PATH"] = "%s/usr/bin:%s" % (scumm_root_op, os.environ["PATH"])
-scumm_env_op["CXX"] = "ccache arm-angstrom-linux-gnueabi-g++"
+# 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, os.environ["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" ]
+#}
+
+#scumm_platforms_trunk["op"] = p
+#scumm_platforms_branch["op"] = p
+
+# GPH Caanoo
+# SDK_PATH and TARGET_SYS are exported as they are used in the platforms SDL_CONFIG.
+
+scumm_root_caanoo = "/opt/toolchains/arm-caanoo"
+scumm_env_caanoo = copy.deepcopy(scumm_env)
+scumm_env_caanoo["SDK_PATH"] = "%s" % scumm_root_caanoo
+scumm_env_caanoo["TARGET_SYS"] = "arm-none-linux-gnueabi"
+scumm_env_caanoo["PATH"] = "%s/bin:%s" % (scumm_root_caanoo, os.environ["PATH"])
+scumm_env_caanoo["CXX"] = "ccache arm-none-linux-gnueabi-g++"
+scumm_env_caanoo["CXXFLAGS"] = "-isystem %s/arm-none-linux-gnueabi/usr/include" % scumm_root_caanoo
+scumm_env_caanoo["LDFLAGS"] = "-L%s/arm-none-linux-gnueabi/usr/lib" % scumm_root_caanoo
+
p = {
"configureargs": [
- "--host=openpandora",
+ "--host=caanoo",
+ "--enable-vkeybd",
"--enable-plugins",
- "--default-dynamic"
+ "--default-dynamic",
+ "--with-sdl-prefix=/opt/toolchains/arm-caanoo/arm-none-linux-gnueabi/usr/bin"
],
- "env": scumm_env_op,
- "disttarget": "op-bundle",
- "package": [ "release/scummvm-op-pnd.tar.bz2" ]
+ "env": scumm_env_caanoo,
+ "disttarget": "caanoo-bundle",
+ "package": [ "release/scummvm-caanoo.tar.bz2" ]
}
-scumm_platforms_trunk["op"] = p
-scumm_platforms_branch["op"] = p
+scumm_platforms_trunk["caanoo"] = p
+scumm_platforms_branch["caanoo"] = p
#######
####### buildbot setup
@@ -896,5 +927,5 @@
if scumm_testenv:
c["buildbotURL"] = "http://localhost:8010/"
else:
- c["buildbotURL"] = "http://buildbot.scummvm.org/buildbot/"
+ c["buildbotURL"] = "http://buildbot.scummvm.org/"
Modified: buildbot/web/builds.html
===================================================================
--- buildbot/web/builds.html 2010-11-05 12:36:20 UTC (rev 54095)
+++ buildbot/web/builds.html 2010-11-05 13:19:21 UTC (rev 54096)
@@ -174,6 +174,19 @@
<tr align="center">
<td style="text-align: left; width: 784px;" colspan="1" rowspan="1" class="row1"
valign="middle">
+ <img style="width: 24px; height: 24px;" alt="" src="http://www.scummvm.org/images/catpl-caanoo.png">GamePark
+ Caanoo
+ </td>
+ <td style="text-align: center; width: 114px;" class="row1" nowrap="nowrap">
+ <a href="/snapshots/trunk/caanoo-trunk-latest.tar.bz2">trunk</a>
+ </td>
+ <td style="text-align: center; width: 114px;" class="row1" nowrap="nowrap">
+ <a href="/snapshots/1.2.0/caanoo-1.2.0-latest.tar.bz2">1.2.x branch</a>
+ </td>
+ </tr>
+ <tr align="center">
+ <td style="text-align: left; width: 784px;" colspan="1" rowspan="1" class="row1"
+ valign="middle">
<img style="width: 24px; height: 24px;" alt="" src="http://www.scummvm.org/images/catpl-gp2x.png">GamePark
GP2X
</td>
Added: buildbot/web/images/par-head.png
===================================================================
(Binary files differ)
Property changes on: buildbot/web/images/par-head.png
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:mime-type
+ image/png
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