From: Michael Wetherell <mike.wetherell@ntlworld.com>
Date: Fri, 26 Sep 2008 00:19:56 +0000 (+0000)
Subject: Configure a second Windows build and give the slave a new name.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/6e27d75daae7efd15ac06be78c00c2de58686747

Configure a second Windows build and give the slave a new name.


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

diff --git a/build/buildbot/config/XP_VC9_trunk.xml b/build/buildbot/config/XP_VC9_trunk.xml
deleted file mode 100644
index f99dfce23a..0000000000
--- a/build/buildbot/config/XP_VC9_trunk.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Name:       XP_VC9_trunk.xml
-    Purpose:    Buildbot XP_VC9_trunk configuration.
-    Author:     Laurent Humbertclaude
-    RCS-ID:     $Id$
-    Copyright:  (c) 2008 Laurent Humbertclaude
-    Licence:    wxWidgets licence
--->
-<bot xmlns:xi="http://www.w3.org/2001/XInclude">
-    <xi:include href="include/defs.xml"/>
-    <build>
-        <name>XPSP2 VC9 wxMSW trunk</name>
-        <builddir>XPSP2_VC9_wxMSW_trunk</builddir>
-        <lock>one_per_slave</lock>
-        <!--<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>
-        <steps>
-            <checkout/>
-            <compile-all/>
-            <run-tests/>
-        </steps>
-    </build>
-    <build>
-        <name>XPSP2 VC9 wxMSW stable</name>
-        <builddir>XPSP2_VC9_wxMSW_stable</builddir>
-        <lock>one_per_slave</lock>
-        <!--<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>
-        <steps>
-            <checkout branch="{$STABLE_BRANCH}"/>
-            <compile-all/>
-            <run-tests/>
-        </steps>
-    </build>
-</bot>
diff --git a/build/buildbot/config/xp_vc.xml b/build/buildbot/config/xp_vc.xml
new file mode 100644
index 0000000000..eeae29c78b
--- /dev/null
+++ b/build/buildbot/config/xp_vc.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Name:       xp_vc.xml
+    Purpose:    Buildbot xp_vc configuration.
+    Author:     Laurent Humbertclaude
+    RCS-ID:     $Id$
+    Copyright:  (c) 2008 Laurent Humbertclaude
+    Licence:    wxWidgets licence
+-->
+<bot xmlns:xi="http://www.w3.org/2001/XInclude">
+    <xi:include href="include/defs.xml"/>
+    <build>
+        <name>XPSP2 VC9 wxMSW trunk</name>
+        <builddir>XPSP2_VC9_wxMSW_trunk</builddir>
+        <lock>slave</lock>
+        <!--<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>
+        <steps>
+            <checkout/>
+            <compile-all/>
+            <run-tests/>
+        </steps>
+    </build>
+    <build>
+        <name>XPSP2 VC9 wxMSW stable</name>
+        <builddir>XPSP2_VC9_wxMSW_stable</builddir>
+        <lock>slave</lock>
+        <!--<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>
+        <steps>
+            <checkout branch="{$STABLE_BRANCH}"/>
+            <compile-all/>
+            <run-tests/>
+        </steps>
+    </build>
+</bot>