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 3a8c77787fc84a7d6b223cd8c8f2f6e87c53f24c..b1c6c63e294c2d216fab6fe2fd232412edfc1e8a 100644 (file)
--- a/build/buildbot/config/common.xml
+++ b/build/buildbot/config/common.xml
@@ -9,12 +9,9 @@
     Licence:    wxWidgets licence
 -->
 
     Licence:    wxWidgets licence
 -->
 

-<bot xmlns:xi="http://www.w3.org/2001/XInclude"
-     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-     xmlns:exsl="http://exslt.org/common"
-     xsl:version="1.0">
+<bot xmlns:xi="http://www.w3.org/2001/XInclude">

 
 

-<xi:include href="include.xml" xpointer="xpointer(*/*)"/>
+<xi:include href="include/defs.xml"/>

 
 <!--
     Quick schedulers. Builds using these are triggered after each change to
 
 <!--
     Quick schedulers. Builds using these are triggered after each change to


@@ -31,14 +28,21 @@
     <name>trunk_quick</name>
     <branch>trunk</branch>
     <treeStableTimer>900</treeStableTimer>
     <name>trunk_quick</name>
     <branch>trunk</branch>
     <treeStableTimer>900</treeStableTimer>

-    <fileNotImportant>doc/*</fileNotImportant>
+    <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>
     <treeStableTimer>900</treeStableTimer>
 </scheduler>
 
 <scheduler>
     <name>stable_quick</name>
     <branch><STABLE_BRANCH/></branch>
     <treeStableTimer>900</treeStableTimer>

-    <fileNotImportant>doc/*</fileNotImportant>
+    <fileNotImportant>docs/*</fileNotImportant>

 </scheduler>
 
 <!--
 </scheduler>
 
 <!--


@@ -48,56 +52,74 @@
     one if it should run several times a week on particular days.
 -->
 
     one if it should run several times a week on particular days.
 -->
 

-<nightly>
-    <name>sunday_6am</name>
-    <hour>6</hour>
-    <dayOfWeek>0</dayOfWeek>
-</nightly>
-
-<nightly>
-    <name>monday_6am</name>
-    <hour>6</hour>
-    <dayOfWeek>1</dayOfWeek>
-</nightly>
-
-<nightly>
-    <name>tuesday_6am</name>
-    <hour>6</hour>
-    <dayOfWeek>2</dayOfWeek>
-</nightly>
-
-<nightly>
-    <name>wednesday_6am</name>
-    <hour>6</hour>
-    <dayOfWeek>3</dayOfWeek>
-</nightly>
-
-<nightly>
-    <name>thursday_6am</name>
-    <hour>6</hour>
-    <dayOfWeek>4</dayOfWeek>
-</nightly>
-
-<nightly>
-    <name>friday_6am</name>
-    <hour>6</hour>
-    <dayOfWeek>5</dayOfWeek>
-</nightly>
-
-<nightly>
-    <name>saturday_6am</name>
-    <hour>6</hour>
-    <dayOfWeek>6</dayOfWeek>
-</nightly>
+<nightly-schedulers name="sunday"/>
+<nightly-schedulers name="monday"/>
+<nightly-schedulers name="tuesday"/>
+<nightly-schedulers name="wednesday"/>
+<nightly-schedulers name="thursday"/>
+<nightly-schedulers name="friday"/>
+<nightly-schedulers name="saturday"/>

 
 <!--
     Schedulers for daily builds.
 -->
 
 
 <!--
     Schedulers for daily builds.
 -->
 

-<nightly>
-    <name>daily_6am</name>
-    <hour>6</hour>
-</nightly>
+<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"/>
+    <!-- Overrides... -->
+</emaillookup>
+
+<!--
+    Notify people on the blame list when a build goes from good to bad.
+-->
+
+<mailnotifier>
+    <mode>problem</mode>
+    <lookup>wx-devs</lookup>
+</mailnotifier>
+
+<!--
+    Log every build to a mailing list.
+-->
+
+<mailnotifier>
+    <extraRecipient>wx-buildbot -at- googlegroups.com</extraRecipient>
+</mailnotifier>

 
 <!--
     Track SVN changes using the wx-cvs mailing list.
 
 <!--
     Track SVN changes using the wx-cvs mailing list.