From bf615edd39f0629fae93c0d373ae05060f7897e8 Mon Sep 17 00:00:00 2001
From: Cinders <cinder.roxley@phoenixviewer.com>
Date: Sat, 3 Aug 2013 12:36:42 -0600
Subject: [PATCH] Make RelWithDebugFS the default configuration and general
 cleanup in autobuild.xml

---
 autobuild.xml | 69 +++++++++++++--------------------------------------
 1 file changed, 17 insertions(+), 52 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 9c928fb9f0..31bef74858 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -805,9 +805,9 @@
           <map>
             <key>archive</key>
             <map>
-           <key>hash</key>
-	      <string>aff5566e04003de0383941981198e04e</string>
-          <key>url</key>
+              <key>hash</key>
+              <string>aff5566e04003de0383941981198e04e</string>
+              <key>url</key>
               <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273073/arch/Darwin/installer/google_breakpad-0.0.0-rev1099-darwin-20130329.tar.bz2</string>
             </map>
             <key>name</key>
@@ -817,9 +817,9 @@
           <map>
             <key>archive</key>
             <map>
-             <key>hash</key>
-	         <string>52257e5eb166a0b69c9c0c38f6e1920e</string>
-             <key>url</key>
+              <key>hash</key>
+              <string>52257e5eb166a0b69c9c0c38f6e1920e</string>
+              <key>url</key>
               <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273079/arch/Linux/installer/google_breakpad-0.0.0-rev1099-linux-20130329.tar.bz2</string>
             </map>
             <key>name</key>
@@ -830,7 +830,7 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-	          <string>d812a6dfcabe6528198a3191068dac09</string>
+              <string>d812a6dfcabe6528198a3191068dac09</string>
               <key>url</key>
               <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273073/arch/CYGWIN/installer/google_breakpad-0.0.0-rev1099-windows-20130329.tar.bz2</string>
             </map>
@@ -923,42 +923,6 @@
           </map>
         </map>
       </map>
-      <key>gperftools</key>
-      <map>
-        <key>license</key>
-        <string>bsd</string>
-        <key>license_file</key>
-        <string>LICENSES/gperftools.txt</string>
-        <key>name</key>
-        <string>gperftools</string>
-        <key>platforms</key>
-        <map>
-          <key>linux</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>8aedfdcf670348c18a9991ae1b384a61</string>
-              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/262672/arch/Linux/installer/gperftools-2.0-linux-20120727.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>linux</string>
-          </map>
-          <key>windows</key>
-          <map>
-            <key>archive</key>
-            <map>
-              <key>hash</key>
-              <string>f62841804acb91e1309603a84f3f0ce8</string>
-              <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-perftools/rev/262672/arch/CYGWIN/installer/gperftools-2.0-windows-20120727.tar.bz2</string>
-            </map>
-            <key>name</key>
-            <string>windows</string>
-          </map>
-        </map>
-      </map>
       <key>gstreamer</key>
       <map>
         <key>license</key>
@@ -2172,6 +2136,7 @@
                   <string>--btype RelWithDebInfo</string>
                   <string>--config</string>
                   <string>--version</string>
+                  <string>--opensim</string>
                 </array>
               </map>
               <key>name</key>
@@ -2399,8 +2364,6 @@
                   <string>'Xcode'</string>
                 </array>
               </map>
-              <key>default</key>
-              <string>True</string>
               <key>name</key>
               <string>RelWithDebInfo</string>
             </map>
@@ -2431,6 +2394,8 @@
                   <string>--kdu</string>
                 </array>
               </map>
+              <key>default</key>
+              <string>True</string>
               <key>name</key>
               <string>RelWithDebInfoFS</string>
             </map>
@@ -2700,8 +2665,6 @@
                   <string>'Unix Makefiles'</string>
                 </array>
               </map>
-              <key>default</key>
-              <string>True</string>
               <key>name</key>
               <string>RelWithDebInfo</string>
             </map>
@@ -2730,6 +2693,8 @@
                   <string>--btype RelWithDebInfo</string>
                 </array>
               </map>
+              <key>default</key>
+              <string>True</string>
               <key>name</key>
               <string>RelWithDebInfoFS</string>
             </map>
@@ -3002,7 +2967,7 @@
                   <string>-DUNATTENDED:BOOL=OFF</string>
                   <string>-DUSE_KDU=FALSE</string>
                   <string>-DFMODEX:BOOL=OFF</string>
-                  </array>
+                </array>
               </map>
               <key>name</key>
               <string>DebugOS</string>
@@ -3043,8 +3008,6 @@
                   <string>"Visual Studio 10"</string>
                 </array>
               </map>
-              <key>default</key>
-              <string>True</string>
               <key>name</key>
               <string>RelWithDebInfo</string>
             </map>
@@ -3082,6 +3045,8 @@
                   <string>--platform win32</string>
                 </array>
               </map>
+              <key>default</key>
+              <string>True</string>
               <key>name</key>
               <string>RelWithDebInfoFS</string>
             </map>
@@ -3163,7 +3128,7 @@
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DUSE_KDU=FALSE</string>
                   <string>-DFMODEX:BOOL=ON</string>
-                  </array>
+                </array>
               </map>
               <key>name</key>
               <string>RelWithDebInfoOS</string>
@@ -3359,7 +3324,7 @@
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DUSE_KDU=FALSE</string>
                   <string>-DFMODEX:BOOL=ON</string>
-                  </array>
+                </array>
               </map>
               <key>name</key>
               <string>ReleaseOS</string>