X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/91752030b7e75598646fb54a892cae7c5f4d916e..c4c885f043983662023cfe28fed9598f6b1e567d:/build/buildbot/config/common.xml

diff --git a/build/buildbot/config/common.xml b/build/buildbot/config/common.xml
index caa25a326c..1aea286c16 100644
--- a/build/buildbot/config/common.xml
+++ b/build/buildbot/config/common.xml
@@ -4,9 +4,8 @@
     Name:       common.xml
     Purpose:    Schedulers and locks common to all slaves.
     Author:     Mike Wetherell
-    RCS-ID:     $Id$
     Copyright:  (c) 2007 Mike Wetherell
-    Licence:    wxWidgets licence
+    Licence:    wxWindows licence
 -->
 
 <bot xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -28,7 +27,14 @@
     <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>
@@ -59,12 +65,42 @@
 
 <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.
+
+    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">
-    <xi:include href="include/wx-devs.xml" xpointer="xpointer(//*[@id='MW'])"/>
+    <xi:include href="include/wx-devs.xml"/>
+    <!-- Overrides... -->
 </emaillookup>
 
 <!--
@@ -81,7 +117,7 @@
 -->
 
 <mailnotifier>
-    <extraRecipient>mike.wetherell -at- ntlworld.com</extraRecipient>
+    <extraRecipient>wx-buildbot -at- googlegroups.com</extraRecipient>
 </mailnotifier>
 
 <!--