X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e27d75daae7efd15ac06be78c00c2de58686747..4d833b7b7f86cc7a182a07b52e96705ca7c4c49f:/build/buildbot/config/xp_vc.xml

diff --git a/build/buildbot/config/xp_vc.xml b/build/buildbot/config/xp_vc.xml
index eeae29c78b..906bda0b99 100644
--- a/build/buildbot/config/xp_vc.xml
+++ b/build/buildbot/config/xp_vc.xml
@@ -8,31 +8,93 @@
     Licence:    wxWidgets licence
 -->
 <bot xmlns:xi="http://www.w3.org/2001/XInclude">
-    <xi:include href="include/defs.xml"/>
+    <xi:include href="include/xp_vc.xml"/>
     <build>
-        <name>XPSP2 VC9 wxMSW trunk</name>
-        <builddir>XPSP2_VC9_wxMSW_trunk</builddir>
-        <lock>slave</lock>
-        <!--<scheduler>trunk_quick</scheduler>-->
+        <name>XPSP2 VC9 wxMSW trunk release</name>
+        <builddir>XPSP2_VC9_wxMSW_trunk_release</builddir>
+        <scheduler>trunk_quick</scheduler>
         <sandbox>VC9</sandbox>
-        <make>nmake -f makefile.vc SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunit.lib</make>
+        <make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunit.lib</make>
         <steps>
             <checkout/>
-            <compile-all/>
-            <run-tests/>
+            <compile-all tests="true"/>
         </steps>
     </build>
     <build>
-        <name>XPSP2 VC9 wxMSW stable</name>
-        <builddir>XPSP2_VC9_wxMSW_stable</builddir>
-        <lock>slave</lock>
-        <!--<scheduler>stable_quick</scheduler>-->
+        <name>XPSP2 VC9 wxMSW stable release</name>
+        <builddir>XPSP2_VC9_wxMSW_stable_release</builddir>
+        <scheduler>stable_quick</scheduler>
         <sandbox>VC9</sandbox>
-        <make>nmake -f makefile.vc SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunit.lib</make>
+        <make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunit.lib</make>
         <steps>
             <checkout branch="{$STABLE_BRANCH}"/>
-            <compile-all/>
-            <run-tests/>
+            <compile-all contrib="false" tests="true"/>
+        </steps>
+    </build>
+    <build>
+        <name>XPSP2 VC9 wxMSW trunk debug</name>
+        <builddir>XPSP2_VC9_wxMSW_trunk_debug</builddir>
+        <scheduler>daily_0400</scheduler>
+        <sandbox>VC9</sandbox>
+        <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunitd.lib</make>
+        <steps>
+            <checkout/>
+            <compile-all tests="true"/>
+        </steps>
+    </build>
+    <build>
+        <name>XPSP2 VC9 wxMSW stable debug</name>
+        <builddir>XPSP2_VC9_wxMSW_stable_debug</builddir>
+        <scheduler>daily_0500</scheduler>
+        <sandbox>VC9</sandbox>
+        <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC9libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC9libs/cppunit-1.12.1/lib/cppunitd.lib</make>
+        <steps>
+            <checkout branch="{$STABLE_BRANCH}"/>
+            <compile-all contrib="false" tests="true"/>
+        </steps>
+    </build>
+    <build>
+        <name>XPSP2 VC6 wxMSW trunk release</name>
+        <builddir>XPSP2_VC6_wxMSW_trunk_release</builddir>
+        <scheduler>trunk_quick</scheduler>
+        <sandbox>VC6</sandbox>
+        <make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunit.lib</make>
+        <steps>
+            <checkout/>
+            <compile-all tests="true"/>
+        </steps>
+    </build>
+    <build>
+        <name>XPSP2 VC6 wxMSW stable release</name>
+        <builddir>XPSP2_VC6_wxMSW_stable_release</builddir>
+        <scheduler>stable_quick</scheduler>
+        <sandbox>VC6</sandbox>
+        <make>nmake /nologo /f makefile.vc BUILD=release SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunit.lib</make>
+        <steps>
+            <checkout branch="{$STABLE_BRANCH}"/>
+            <compile-all contrib="false" tests="true"/>
+        </steps>
+    </build>
+    <build>
+        <name>XPSP2 VC6 wxMSW trunk debug</name>
+        <builddir>XPSP2_VC6_wxMSW_trunk_debug</builddir>
+        <scheduler>daily_0600</scheduler>
+        <sandbox>VC6</sandbox>
+        <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunitd.lib</make>
+        <steps>
+            <checkout/>
+            <compile-all tests="true"/>
+        </steps>
+    </build>
+    <build>
+        <name>XPSP2 VC6 wxMSW stable debug</name>
+        <builddir>XPSP2_VC6_wxMSW_stable_debug</builddir>
+        <scheduler>daily_0700</scheduler>
+        <sandbox>VC6</sandbox>
+        <make>nmake /nologo /f makefile.vc BUILD=debug SHARED=1 CPPUNIT_CFLAGS=-Ik:/buildbot/VC6libs/cppunit-1.12.1/include CPPUNIT_LIBS=k:/buildbot/VC6libs/cppunit-1.12.1/lib/cppunitd.lib</make>
+        <steps>
+            <checkout branch="{$STABLE_BRANCH}"/>
+            <compile-all contrib="false" tests="true"/>
         </steps>
     </build>
 </bot>