add release branch (currently WX_2_9_BRANCH) definitions and reenable VC build slaves...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@60384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/buildbot/config/common.xml b/build/buildbot/config/common.xml
index 32c4b821ecc186a0bd5a22fb2d8d5db14fcb5f23..b276b77e5223f299d2af9d20550d709ec3f0de33 100644 (file)
--- a/build/buildbot/config/common.xml
+++ b/build/buildbot/config/common.xml
@@ -31,6 +31,13 @@
     <fileNotImportant>docs/* interface/*</fileNotImportant>
 </scheduler>
 
     <fileNotImportant>docs/* interface/*</fileNotImportant>
 </scheduler>
 

+<scheduler>
+    <name>release_quick</name>
+    <branch><RELEASE_BRANCH/></branch>
+    <treeStableTimer>900</treeStableTimer>
+    <fileNotImportant>docs/* interface/*</fileNotImportant>
+</scheduler>
+

 <scheduler>
     <name>stable_quick</name>
     <branch><STABLE_BRANCH/></branch>
 <scheduler>
     <name>stable_quick</name>
     <branch><STABLE_BRANCH/></branch>


@@ -75,6 +82,10 @@
     <name><STABLE_BRANCH/></name>
 </slavelock>
 
     <name><STABLE_BRANCH/></name>
 </slavelock>
 

+<slavelock>
+    <name><RELEASE_BRANCH/></name>
+</slavelock>
+

 <!--
     Map SVN user ids to email addresses.
 -->
 <!--
     Map SVN user ids to email addresses.
 -->

diff --git a/build/buildbot/config/include/defs.xml b/build/buildbot/config/include/defs.xml
index 544b5366abefa1873d92c45e8d6c7742839316d9..e805c3dbc323dd7c08fe194cf91579a48afe56dc 100644 (file)
--- a/build/buildbot/config/include/defs.xml
+++ b/build/buildbot/config/include/defs.xml
@@ -22,6 +22,8 @@
 <xsl:template name="SVN_URL">http://svn.wxwidgets.org/svn/wx/wxWidgets/</xsl:template>
 <xsl:template name="STABLE_BRANCH">branches/WX_2_8_BRANCH</xsl:template>
 <xsl:variable name="STABLE_BRANCH"><STABLE_BRANCH/></xsl:variable>
 <xsl:template name="SVN_URL">http://svn.wxwidgets.org/svn/wx/wxWidgets/</xsl:template>
 <xsl:template name="STABLE_BRANCH">branches/WX_2_8_BRANCH</xsl:template>
 <xsl:variable name="STABLE_BRANCH"><STABLE_BRANCH/></xsl:variable>

+<xsl:template name="RELEASE_BRANCH">branches/WX_2_9_BRANCH</xsl:template>
+<xsl:variable name="RELEASE_BRANCH"><RELEASE_BRANCH/></xsl:variable>

 <xsl:template name="SNAPSHOT_URL">http://biolpc22.york.ac.uk/pub</xsl:template>
 
 <!--
 <xsl:template name="SNAPSHOT_URL">http://biolpc22.york.ac.uk/pub</xsl:template>
 
 <!--

diff --git a/build/buildbot/config/xp_vc.xml b/build/buildbot/config/xp_vc.xml
index 31cdb3521ee5617254720b5e3cfff07f68cb103c..89e967f4352ce7db5ad0a82ba8eb7ef28109e840 100644 (file)
--- a/build/buildbot/config/xp_vc.xml
+++ b/build/buildbot/config/xp_vc.xml
@@ -106,7 +106,6 @@
         </steps>
     </build>
 
         </steps>
     </build>
 

-    <!-- VZ: disable because this results in buildbot configuration error

     <build>
         <name>XPSP2 VC9 wxMSW 2.9.x debug</name>
         <builddir>XPSP2_VC9_wxMSW_29x_debug</builddir>
     <build>
         <name>XPSP2 VC9 wxMSW 2.9.x debug</name>
         <builddir>XPSP2_VC9_wxMSW_29x_debug</builddir>


@@ -114,7 +113,7 @@
         <sandbox>VC9</sandbox>
         <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunitd.lib</make>
         <steps>
         <sandbox>VC9</sandbox>
         <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunitd.lib</make>
         <steps>

-            <checkout branch="branches/WX_2_9_0_BRANCH"/>
+            <checkout branch="{$RELEASE_BRANCH}"/>

             <compile-all tests="true"/>
             <run-tests/>
         </steps>
             <compile-all tests="true"/>
             <run-tests/>
         </steps>


@@ -127,10 +126,9 @@
         <sandbox>VC6</sandbox>
         <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunitd.lib</make>
         <steps>
         <sandbox>VC6</sandbox>
         <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunitd.lib</make>
         <steps>

-            <checkout branch="branches/WX_2_9_0_BRANCH"/>
+            <checkout branch="{$RELEASE_BRANCH}"/>

             <compile-all tests="true"/>
             <run-tests/>
         </steps>
     </build>
             <compile-all tests="true"/>
             <run-tests/>
         </steps>
     </build>

-    -->

 </bot>
 </bot>