From 674c3fffbb87b4a3c4ea7d0256f6055ece6fb0b2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 7 Dec 2013 12:30:46 +0000
Subject: [PATCH] Don't build wxOSX/Cocoa twice in wxOSX buildbot.

Both trunk builds were using Cocoa, change the one supposed to be Carbon to
use Carbon instead.

Also add Carbon stable branch build as this is probably even more important
than testing Carbon in the trunk.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@75358 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 build/buildbot/config/csleobuild.xml | 40 +++++++++++++++++-----------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/build/buildbot/config/csleobuild.xml b/build/buildbot/config/csleobuild.xml
index e94ef648be..463b06829e 100644
--- a/build/buildbot/config/csleobuild.xml
+++ b/build/buildbot/config/csleobuild.xml
@@ -12,16 +12,9 @@
 
 <xi:include href="include/csleobuild.xml"/>
 
-<scheduler>
-    <name>branch_2_9_0</name>
-    <branch>branches/WX_2_9_0_BRANCH</branch>
-    <treeStableTimer>900</treeStableTimer>
-    <fileNotImportant>docs/* interface/*</fileNotImportant>
-</scheduler>
-
 <build>
-    <name>OSX 10.5 Intel wxOSX Carbon trunk</name>
-    <builddir>csleo</builddir>
+    <name>OSX 10.5 Intel wxOSX Cocoa trunk</name>
+    <builddir>csleo_cocoa</builddir>
     <scheduler>trunk_quick</scheduler>
 
     <steps>
@@ -31,21 +24,23 @@
         <run-tests/>
     </steps>
 </build>
-  <build>
-    <name>OSX 10.5 Intel wxOSX Cocoa trunk</name>
-    <builddir>csleo_cocoa</builddir>
+
+<build>
+    <name>OSX 10.5 Intel wxOSX Carbon trunk</name>
+    <builddir>csleo_carbon</builddir>
     <scheduler>trunk_quick</scheduler>
 
     <steps>
         <checkout/>
-        <configure options="--with-osx_cocoa"/>
+        <configure options="--with-osx_carbon"/>
         <compile-all/>
         <run-tests/>
     </steps>
-  </build>
+</build>
+
 <build>
-    <name>OSX 10.5 Intel wxMac Stable</name>
-    <builddir>csleo_stable</builddir>
+    <name>OSX 10.5 Intel wxOSX Cocoa Stable</name>
+    <builddir>csleo_stable_cocoa</builddir>
     <scheduler>stable_quick</scheduler>
 
     <steps>
@@ -56,4 +51,17 @@
     </steps>
 </build>
 
+<build>
+    <name>OSX 10.5 Intel wxOSX Carbon Stable</name>
+    <builddir>csleo_stable_carbon</builddir>
+    <scheduler>stable_quick</scheduler>
+
+    <steps>
+    <checkout branch="{$STABLE_BRANCH}"/>
+    <configure options="--with-osx_carbon"/>
+    <compile-all/>
+    <run-tests/>
+    </steps>
+</build>
+
 </bot>