Change the locks to allow builds for different branches to run concurrently

on Laurent's slave.

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

diff --git a/build/buildbot/config/common.xml b/build/buildbot/config/common.xml
index b99af4c17786ab43cafd09c3383b5d7b99e67493..32c4b821ecc186a0bd5a22fb2d8d5db14fcb5f23 100644 (file)
--- a/build/buildbot/config/common.xml
+++ b/build/buildbot/config/common.xml
@@ -60,13 +60,21 @@
 <nightly-schedulers name="daily"/>
 
 <!--
-    General purpose slave lock.
+    A general purpose slave lock and ones for the trunk and stable branches.
 -->
 
 <slavelock>
     <name>slave</name>
 </slavelock>
 
+<slavelock>
+    <name>trunk</name>
+</slavelock>
+
+<slavelock>
+    <name><STABLE_BRANCH/></name>
+</slavelock>
+
 <!--
     Map SVN user ids to email addresses.
 -->

diff --git a/build/buildbot/config/include/xp_vc.xml b/build/buildbot/config/include/xp_vc.xml
index d37ad948dcdcfdcf12fd965932ca46ae6a75d0fc..e46cbe381472a334fe05a10fc341e9de8c1b686d 100644 (file)
--- a/build/buildbot/config/include/xp_vc.xml
+++ b/build/buildbot/config/include/xp_vc.xml
@@ -16,12 +16,17 @@
 
 <!--
     build - Override <build> to add a slave lock. This has the effect of
-            serialising all the builds on this machine
+            serialising builds for the same branch on this machine.
 -->
 <xsl:template name="build">
     <xsl:param name="content"/>
+    <xsl:variable name="checkout">
+        <xsl:apply-templates select="get:step('checkout')"/>
+    </xsl:variable>
     <build>
-        <lock>slave</lock>
+        <lock>
+            <xsl:value-of select="exsl:node-set($checkout)/svn/defaultBranch"/>
+        </lock>
         <xsl:copy-of select="$content"/>
     </build>
 </xsl:template>