wxMessageBox off the main thread lost result code.

[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 d589ed387d03723d197906e5bc6a63fbb3bdb94a..3a3f7bf5d428043938d6824d286d33c8ea794578 100644 (file)
--- a/build/buildbot/config/include/defs.xml
+++ b/build/buildbot/config/include/defs.xml
@@ -4,7 +4,6 @@
     Name:       include/defs.xml
     Purpose:    Common declarations for buildbot
     Author:     Mike Wetherell
     Name:       include/defs.xml
     Purpose:    Common declarations for buildbot
     Author:     Mike Wetherell

-    RCS-ID:     $Id$

     Copyright:  (c) 2007 Mike Wetherell
     Licence:    wxWindows licence
 -->
     Copyright:  (c) 2007 Mike Wetherell
     Licence:    wxWindows licence
 -->


@@ -26,6 +25,18 @@
 <xsl:variable name="RELEASE_BRANCH"><RELEASE_BRANCH/></xsl:variable>
 <xsl:template name="SNAPSHOT_URL">http://biolpc22.york.ac.uk/pub</xsl:template>
 
 <xsl:variable name="RELEASE_BRANCH"><RELEASE_BRANCH/></xsl:variable>
 <xsl:template name="SNAPSHOT_URL">http://biolpc22.york.ac.uk/pub</xsl:template>
 

+<!--
+    disable - comment out a section.
+
+    Usage: <disable>
+                e.g. <build> ... etc.
+           </disable>
+
+    XML comments can't contain a double hyphen which tends to be used in
+    configure commands, so <disable> can be used instead. 
+-->
+<xsl:template name="disable"/>
+

 <!--
     checkout - build step for source checkout.
 
 <!--
     checkout - build step for source checkout.
 


@@ -213,13 +224,7 @@
         <xsl:text> </xsl:text>
     </xsl:if>
 
         <xsl:text> </xsl:text>
     </xsl:if>
 

-    <xsl:if test="$utils = 'true'">
-        <xsl:choose>
-            <xsl:when test="$gui = 'true'">utils</xsl:when>
-            <xsl:otherwise>utils/tex2rtf/src ../../HelpGen/src</xsl:otherwise>
-        </xsl:choose>
-        <xsl:text> </xsl:text>
-    </xsl:if>
+    <xsl:if test="$utils = 'true' and $gui = 'true'">utils </xsl:if>

 
     <xsl:if test="$demos = 'true' and $gui = 'true'">demos </xsl:if>
 
 
     <xsl:if test="$demos = 'true' and $gui = 'true'">demos </xsl:if>