MW speedups

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/build/buildbot/config/csleobuild.xml b/build/buildbot/config/csleobuild.xml
index eca64d3a8605263e604e7f494e0c470c2e7a5daf..9a2e363f4d5edaf1b24755ab683d7d28d314a7c5 100644 (file)
--- a/build/buildbot/config/csleobuild.xml
+++ b/build/buildbot/config/csleobuild.xml
@@ -11,7 +11,7 @@
 
 <bot xmlns:xi="http://www.w3.org/2001/XInclude">
 
 
 <bot xmlns:xi="http://www.w3.org/2001/XInclude">
 

-<xi:include href="include/defs.xml"/>
+<xi:include href="include/csleobuild.xml"/>

 
 <build>
     <name>OSX 10.5 Intel wxOSX Carbon trunk</name>
 
 <build>
     <name>OSX 10.5 Intel wxOSX Carbon trunk</name>

diff --git a/build/buildbot/config/include/csleobuild.xml b/build/buildbot/config/include/csleobuild.xml
new file mode 100644 (file)
index 0000000..efcabc3
--- /dev/null
+++ b/build/buildbot/config/include/csleobuild.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?>\r\r<!--\r    Name:       include/csleobuild.xml\r    Purpose:    Declarations for the csleobuild slave\r    Author:\r    RCS-ID:     $Id$\r    Copyright:\r    Licence:    wxWidgets licence\r-->\r\r<bot xmlns:xsl="http://www.w3.org/1999/XSL/Transform"\r     xmlns:xi="http://www.w3.org/2001/XInclude">\r\r<xi:include href="defs.xml"/>\r\r<!--\r    build - Override <build> to add a slave lock. This has the effect of\r            serialising all the builds on this machine\r-->\r\r<xsl:template name="build">\r    <xsl:param name="content"/>\r    <build>\r        <lock>slave</lock>\r        <xsl:copy-of select="$content"/>\r    </build>\r</xsl:template>\r\r<!--\r    checkout - checks out to a shared directory\r\r    Checks out to a directory '../$branch' shared between builds. Then creates\r    a directory 'build' for this job to build in, and 'src' which is a link to\r    the shared sources. This relies on all builds for the same branch being\r    serialised with lock so that one build doesn't update the sources while\r    another is building them.\r\r    Usage typically just:\r        <checkout/>\r    for the trunk, or:\r        <checkout branch="branches/WX_2_8_BRANCH"/>\r    to checkout a branch.\r-->\r<xsl:template name="checkout">\r    <xsl:param name="content"/>\r    <xsl:param name="branch" select="'trunk'"/>\r    <xsl:variable name="nodes" select="exsl:node-set($content)"/>\r    <svn>\r        <xsl:if test="not($nodes/svnurl)">\r            <xsl:if test="not($nodes/baseURL)">\r                <baseURL><SVN_URL/></baseURL>\r            </xsl:if>\r            <xsl:if test="not($nodes/defaultBranch)">\r                <defaultBranch><xsl:value-of select="$branch"/></defaultBranch>\r            </xsl:if>\r        </xsl:if>\r        <xsl:if test="not($nodes/workdir)">\r            <workdir>../<xsl:value-of select="$branch"/></workdir>\r        </xsl:if>\r        <xsl:copy-of select="$content"/>\r    </svn>\r    <sourcecommand>\r        <description>creating build directory</description>\r        <descriptionDone>create build directory</descriptionDone>\r        <command>\r            rm -rf build &amp;&amp;\r            mkdir build &amp;&amp;\r            ln -sf ../<xsl:value-of select="$branch"/> src\r        </command>\r    </sourcecommand>\r</xsl:template>\r\r<!--\r    configure - use '../src/configure' as the default configure command,\r                include disable-precomp-headers in the default options and\r                post process the Makefiles to use ccache.\r\r    Usage: <configure options="-with-foobar"/>\r-->\r<xsl:template name="configure">\r    <xsl:param name="content"/>\r    <xsl:param name="options"/>\r    <configure>\r        <copy-with-defaults content="{$content}">\r            <command>../src/configure --disable-precomp-headers <xsl:value-of select="normalize-space($options)"/></command>\r        </copy-with-defaults>\r        <command>find . -name Makefile | xargs perl -pi -e 's/^(?:CC|CXX) = /$&amp;ccache /'</command>\r    </configure>\r</xsl:template>\r\r</bot>\r
\ No newline at end of file