Correct compilation breakage of r63832.

[wxWidgets.git] / build / buildbot / config / include / defs.xml

diff --git a/build/buildbot/config/include/defs.xml b/build/buildbot/config/include/defs.xml
index 98e14a9e025db40a7d8fe72fa88efb80b7df65c2..39605c89626afc609a33896ce1ef2e53ebc40f2f 100644 (file)
--- a/build/buildbot/config/include/defs.xml
+++ b/build/buildbot/config/include/defs.xml
@@ -22,6 +22,9 @@
 <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_0_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>
 
 <!--
     checkout - build step for source checkout.
@@ -332,6 +335,7 @@
 -->
 <xsl:template name="run-tests">
     <xsl:param name="content"/>
+    <xsl:param name="options"/>
     <xsl:param name="msw"><is-msw/></xsl:param>
     <test>
         <defaults content="{$content}">
@@ -343,10 +347,10 @@
             <command>
                 <xsl:choose>
                     <xsl:when test="$msw = 'true'">
-                        <run-tests-win/>
+                        <run-tests-win options="{$options}"/>
                     </xsl:when>
                     <xsl:otherwise>
-                        <run-tests-unix/>
+                        <run-tests-unix options="{$options}"/>
                     </xsl:otherwise>
                 </xsl:choose>
             </command>
@@ -354,24 +358,19 @@
     </test>
 </xsl:template>
 
-<!--
-    We need to add something to the wxWidgets sources to run the tests with a
-    simple command so that these aren't necessary.
--->
 <xsl:template name="run-tests-win">
+    <xsl:param name="options"/>
 <normalize-space>
-cd tests &amp;&amp;
-(for /d %x in (..\lib\*_dll) do @PATH=%x;%PATH%) &amp;&amp;
-(for /d %x in (*) do @if exist %x\test.exe %x\test) &amp;&amp;
-(for /d %x in (*) do @if exist %x\test_gui.exe %x\test_gui)
+cd tests &amp;&amp; runtests.bat
 </normalize-space>
 </xsl:template>
 
 <xsl:template name="run-tests-unix">
+    <xsl:param name="options"/>
 <normalize-space>
 cd tests &amp;&amp;
-./test &amp;&amp;
-if [ -x test_gui ]; then ./test_gui; fi
+./test <xsl:value-of select="normalize-space($options)"/> &amp;&amp;
+if [ -n "$DISPLAY" -a -x test_gui ]; then ./test_gui; fi
 </normalize-space>
 </xsl:template>
 
@@ -596,13 +595,13 @@ if [ -x test_gui ]; then ./test_gui; fi
     <xsl:param name="content"/>
     <xsl:param name="name"/>
     <xsl:choose>
-        <xsl:when test="$name = 'sunday'">0</xsl:when>
-        <xsl:when test="$name = 'monday'">1</xsl:when>
-        <xsl:when test="$name = 'tuesday'">2</xsl:when>
-        <xsl:when test="$name = 'wednesday'">3</xsl:when>
-        <xsl:when test="$name = 'thursday'">4</xsl:when>
-        <xsl:when test="$name = 'friday'">5</xsl:when>
-        <xsl:when test="$name = 'saturday'">6</xsl:when>
+        <xsl:when test="$name = 'monday'">0</xsl:when>
+        <xsl:when test="$name = 'tuesday'">1</xsl:when>
+        <xsl:when test="$name = 'wednesday'">2</xsl:when>
+        <xsl:when test="$name = 'thursday'">3</xsl:when>
+        <xsl:when test="$name = 'friday'">4</xsl:when>
+        <xsl:when test="$name = 'saturday'">5</xsl:when>
+        <xsl:when test="$name = 'sunday'">6</xsl:when>
     </xsl:choose>
 </xsl:template>
 
@@ -610,13 +609,13 @@ if [ -x test_gui ]; then ./test_gui; fi
     <xsl:param name="content"/>
     <xsl:param name="number"/>
     <xsl:choose>
-        <xsl:when test="$number = '0'">sunday</xsl:when>
-        <xsl:when test="$number = '1'">monday</xsl:when>
-        <xsl:when test="$number = '2'">tuesday</xsl:when>
-        <xsl:when test="$number = '3'">wednesday</xsl:when>
-        <xsl:when test="$number = '4'">thursday</xsl:when>
-        <xsl:when test="$number = '5'">friday</xsl:when>
-        <xsl:when test="$number = '6'">saturday</xsl:when>
+        <xsl:when test="$number = '0'">monday</xsl:when>
+        <xsl:when test="$number = '1'">tuesday</xsl:when>
+        <xsl:when test="$number = '2'">wednesday</xsl:when>
+        <xsl:when test="$number = '3'">thursday</xsl:when>
+        <xsl:when test="$number = '4'">friday</xsl:when>
+        <xsl:when test="$number = '5'">saturday</xsl:when>
+        <xsl:when test="$number = '6'">sunday</xsl:when>
     </xsl:choose>
 </xsl:template>
 
@@ -739,4 +738,52 @@ if [ -x test_gui ]; then ./test_gui; fi
     </xsl:choose>
 </xsl:template>
 
+<!--
+    email - substitute '@' for ' -at- ' in email addresses.
+-->
+<xsl:template name="emailfield">
+    <xsl:param name="content"/>
+    <xsl:param name="addr"/>
+    <xsl:variable name="at"> -at- </xsl:variable>
+    <xsl:choose>
+        <xsl:when test="contains($addr, $at)">
+            <xsl:value-of select="substring-before($addr, $at)"/>
+            <xsl:text>@</xsl:text>
+            <xsl:value-of select="substring-after($addr, $at)"/>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="$addr"/>
+        </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template name="email">
+    <xsl:param name="content"/>
+    <xsl:param name="id"/>
+    <email id="{$id}"><emailfield addr="{$content}"/></email>
+</xsl:template>
+
+<xsl:template name="fromaddr">
+    <xsl:param name="content"/>
+    <fromaddr><emailfield addr="{$content}"/></fromaddr>
+</xsl:template>
+
+<xsl:template name="extraRecipient">
+    <xsl:param name="content"/>
+    <extraRecipient><emailfield addr="{$content}"/></extraRecipient>
+</xsl:template>
+
+<!--
+    mailnotifier - add a default value for <fromaddr> to <mailnotifier>
+-->
+<xsl:template name="mailnotifier">
+    <xsl:param name="content"/>
+    <mailnotifier>
+        <defaults content="{$content}">
+            <fromaddr>noreply -at- wxsite.net</fromaddr>
+        </defaults>
+        <xsl:copy-of select="$content"/>
+    </mailnotifier>
+</xsl:template>
+
 </bot>