X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/99f7ee578ddd35dcdffee39db63c7e0288cb8924..a3ef8eb50346e04c080ed1711578390080baff8b:/build/buildbot/config/xp_vc.xml?ds=sidebyside

diff --git a/build/buildbot/config/xp_vc.xml b/build/buildbot/config/xp_vc.xml
index 7fe19c0fea..31cdb3521e 100644
--- a/build/buildbot/config/xp_vc.xml
+++ b/build/buildbot/config/xp_vc.xml
@@ -10,27 +10,127 @@
 <bot xmlns:xi="http://www.w3.org/2001/XInclude">
     <xi:include href="include/xp_vc.xml"/>
     <build>
-        <name>XPSP2 VC9 wxMSW trunk</name>
-        <builddir>XPSP2_VC9_wxMSW_trunk</builddir>
-        <!--<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/>
+            <compile-all tests="true"/>
             <run-tests/>
         </steps>
     </build>
     <build>
-        <name>XPSP2 VC9 wxMSW stable</name>
-        <builddir>XPSP2_VC9_wxMSW_stable</builddir>
-        <!--<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/>
+            <compile-all contrib="false" tests="true"/>
             <run-tests/>
         </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"/>
+            <run-tests/>
+        </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"/>
+            <run-tests/>
+        </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"/>
+            <run-tests/>
+        </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"/>
+            <run-tests/>
+        </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"/>
+            <run-tests/>
+        </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"/>
+            <run-tests/>
+        </steps>
+    </build>
+
+    <!-- VZ: disable because this results in buildbot configuration error
+    <build>
+        <name>XPSP2 VC9 wxMSW 2.9.x debug</name>
+        <builddir>XPSP2_VC9_wxMSW_29x_debug</builddir>
+        <scheduler>daily_0430</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="branches/WX_2_9_0_BRANCH"/>
+            <compile-all tests="true"/>
+            <run-tests/>
+        </steps>
+    </build>
+
+    <build>
+        <name>XPSP2 VC6 wxMSW 2.9.x debug</name>
+        <builddir>XPSP2_VC6_wxMSW_29x_debug</builddir>
+        <scheduler>daily_0330</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="branches/WX_2_9_0_BRANCH"/>
+            <compile-all tests="true"/>
+            <run-tests/>
+        </steps>
+    </build>
+    -->
 </bot>