Correct compilation breakage of r63832.

[wxWidgets.git] / build / buildbot / config / common.xml

diff --git a/build/buildbot/config/common.xml b/build/buildbot/config/common.xml
index caa25a326cdd96aac5502793d49b9e879adca3f7..b1c6c63e294c2d216fab6fe2fd232412edfc1e8a 100644 (file)
--- a/build/buildbot/config/common.xml
+++ b/build/buildbot/config/common.xml
@@ -28,7 +28,14 @@
     <name>trunk_quick</name>
     <branch>trunk</branch>
     <treeStableTimer>900</treeStableTimer>
     <name>trunk_quick</name>
     <branch>trunk</branch>
     <treeStableTimer>900</treeStableTimer>

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

 </scheduler>
 
 <scheduler>
 </scheduler>
 
 <scheduler>


@@ -59,12 +66,42 @@
 
 <nightly-schedulers name="daily"/>
 
 
 <nightly-schedulers name="daily"/>
 

+<!--
+    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>
+
+<slavelock>
+    <name><RELEASE_BRANCH/></name>
+</slavelock>
+

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

+
+    The email address in wx-devs.xml can be overridden by adding a line like
+    this after the xi:include:
+
+        <email id="JMS">jaakko.salli -at- dnainternet.net</email>
+
+    or disabled using an empty tag:
+
+        <email id="JMS"/>

 -->
 
 <emaillookup name="wx-devs">
 -->
 
 <emaillookup name="wx-devs">

-    <xi:include href="include/wx-devs.xml" xpointer="xpointer(//*[@id='MW'])"/>
+    <xi:include href="include/wx-devs.xml"/>
+    <!-- Overrides... -->

 </emaillookup>
 
 <!--
 </emaillookup>
 
 <!--


@@ -81,7 +118,7 @@
 -->
 
 <mailnotifier>
 -->
 
 <mailnotifier>

-    <extraRecipient>mike.wetherell -at- ntlworld.com</extraRecipient>
+    <extraRecipient>wx-buildbot -at- googlegroups.com</extraRecipient>

 </mailnotifier>
 
 <!--
 </mailnotifier>
 
 <!--