From c70ea810d8cf1d88fc0f2380d79019a483cee6f9 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Sun, 6 Feb 2011 08:50:06 -0500
Subject: OPEN-1 WORKAROUND - create a VCexpressRelWithDebInfo for compiling
 with VS Express

---
 autobuild.xml | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/autobuild.xml b/autobuild.xml
index 7ca481f275..2aa9b5c3d6 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1658,6 +1658,29 @@
               <key>name</key>
               <string>OpenSourceRelWithDebInfo</string>
             </map>
+            <!-- OPEN-1 WORKAROUND begin - to be removed when VC express is detected correctly -->
+            <key>VCexpressRelWithDebInfo</key>
+            <map>
+              <key>configure</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>../indra</string>
+                </array>
+                <key>command</key>
+                <string>cmake</string>
+                <key>options</key>
+                <array>
+                  <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
+                  <string>-DUNATTENDED:BOOL=OFF</string>
+                  <string>-DWORD_SIZE:STRING=32</string>
+                  <string>-DROOT_PROJECT_NAME:STRING=SecondLife</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>VCexpressRelWithDebInfo</string>
+            </map>
+            <!-- OPEN-1 WORKAROUND end -->
             <key>OpenSourceRelease</key>
             <map>
               <key>configure</key>
@@ -2402,6 +2425,37 @@
               <key>name</key>
               <string>OpenSourceRelWithDebInfo</string>
             </map>
+            <!-- OPEN-1 WORKAROUND begin - to be removed when VC express is detected correctly -->
+            <key>VCexpressRelWithDebInfo</key>
+            <map>
+              <key>build</key>
+              <map>
+                <key>arguments</key>
+                <array>
+                  <string>SecondLife.sln</string>
+                </array>
+                <key>command</key>
+                <string>vcbuild.exe</string>
+                <key>options</key>
+                <array>
+                  <string>RelWithDebInfo</string>
+                </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>"Visual Studio Express 8 2005"</string>
+                  <string>-DSTANDALONE:BOOL=FALSE</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                  <string>-DFMOD=FALSE</string>
+                </array>
+              </map>
+              <key>name</key>
+              <string>VCexpressRelWithDebInfo</string>
+            </map>
+            <!-- OPEN-1 WORKAROUND end -->
             <key>OpenSourceRelease</key>
             <map>
               <key>build</key>
-- 
cgit v1.2.3


From da287963220d5e53c6c6d7a0ee67f15e01efba33 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Sun, 6 Feb 2011 09:56:09 -0500
Subject: OPEN-1 WORKAROUND revert change to cmake string for VS 8

---
 autobuild.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autobuild.xml b/autobuild.xml
index 2aa9b5c3d6..5d07c035e6 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2446,7 +2446,7 @@
                 <key>options</key>
                 <array>
                   <string>-G</string>
-                  <string>"Visual Studio Express 8 2005"</string>
+                  <string>"Visual Studio 8 2005"</string>
                   <string>-DSTANDALONE:BOOL=FALSE</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DFMOD=FALSE</string>
-- 
cgit v1.2.3


From ec98d9c98ea7de95b783f6a32a4d6c6953556cd3 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Sun, 6 Feb 2011 10:09:58 -0500
Subject: OPEN-1 WORKAROUND correct build arguments for VS Express

---
 autobuild.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 5d07c035e6..e1733ac9ae 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2432,13 +2432,13 @@
               <map>
                 <key>arguments</key>
                 <array>
-                  <string>SecondLife.sln</string>
+                  <string>"RelWithDebInfo|Win32"</string>
                 </array>
                 <key>command</key>
                 <string>vcbuild.exe</string>
                 <key>options</key>
                 <array>
-                  <string>RelWithDebInfo</string>
+                  <string>"RelWithDebInfo|Win32"</string>
                 </array>
               </map>
               <key>configure</key>
-- 
cgit v1.2.3


From 04a401fa23da102cf3c5c2e864dcd3b3eabb4582 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Sun, 6 Feb 2011 10:37:42 -0500
Subject: OPEN-1 WORKAROUND correct build arguments again for VS Express

---
 autobuild.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autobuild.xml b/autobuild.xml
index e1733ac9ae..cceb197f0e 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2438,7 +2438,7 @@
                 <string>vcbuild.exe</string>
                 <key>options</key>
                 <array>
-                  <string>"RelWithDebInfo|Win32"</string>
+                  <string>SecondLife.sln</string>
                 </array>
               </map>
               <key>configure</key>
-- 
cgit v1.2.3


From 9bdaf04432c9daeda9a8d4596cd47143cb5980a1 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 10 Feb 2011 14:41:00 -0500
Subject: OPEN-1: (partial) use environment when building with Visual Studio
 Express

---
 autobuild.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/autobuild.xml b/autobuild.xml
index cceb197f0e..ec332a81bb 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2438,6 +2438,7 @@
                 <string>vcbuild.exe</string>
                 <key>options</key>
                 <array>
+                  <string>/u</string>
                   <string>SecondLife.sln</string>
                 </array>
               </map>
-- 
cgit v1.2.3