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

[fingolfin at users.sourceforge.net]

Revision: 48305
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48305&view=rev
Author:   fingolfin
Date:     2010-03-19 14:25:38 +0000 (Fri, 19 Mar 2010)

Log Message:
-----------
Switch buildbot from branch 1-0-0 to branch 1-1-0

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

Modified: buildbot/config/master.cfg
===================================================================
--- buildbot/config/master.cfg	2010-03-19 13:55:25 UTC (rev 48304)
+++ buildbot/config/master.cfg	2010-03-19 14:25:38 UTC (rev 48305)
@@ -17,15 +17,15 @@
 
 scumm_svnroot = "https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/"
 
-scumm_branch = "branches/branch-1-0-0"
-scumm_branch_desc = "1.0.0"
+scumm_branch = "branches/branch-1-1-0"
+scumm_branch_desc = "1.1.0"
 
 if scumm_testenv:
 	scumm_package_dst_trunk = "/tmp"
 	scumm_package_dst_branch = "/tmp"
 else:
 	scumm_package_dst_trunk = "/var/www/snapshots/trunk"
-	scumm_package_dst_branch = "/var/www/snapshots/1.0.0"
+	scumm_package_dst_branch = "/var/www/snapshots/1.1.0"
 
 # Files to package for branch snapshots (common to all ports).
 scumm_package_branch = [
@@ -287,9 +287,7 @@
 }
 
 scumm_platforms_trunk["ps2"] = p
-# TODO: The current active branch (1.0.0) does not support building the PS2 port
-# via configure/make. Re-enable this for the next release!
-#scumm_platforms_branch["ps2"] = p
+scumm_platforms_branch["ps2"] = p
 
 # GP2X
 scumm_root_gp2x = "/opt/toolchains/open2x-gcc-4.1.1"


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