From 3b1dee9abf5e4e220c325438f2da125937d584c1 Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Fri, 18 Mar 2011 08:05:36 -0400
Subject: OPEN-1: OPEN-37: Needed changes in autobuild.xml for OpenSource
 Developers to be able to  use VS2010 Autobuild

---
 autobuild.xml         | 133 +++++++++++++++++++++++++++++++++++++++++++++-----
 doc/contributions.txt |   2 +
 2 files changed, 124 insertions(+), 11 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index ba70320d0c..f133c8d07c 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1764,10 +1764,15 @@
               <key>name</key>
               <string>Release</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>
@@ -1781,6 +1786,53 @@
               <key>name</key>
               <string>VCexpressRelWithDebInfo</string>
             </map>
+            <!-- OPEN-1 WORKAROUND end -->
+            <!-- OPEN-1a WORKAROUND begin - to be removed when VC 2010 is detected correctly -->
+            <key>VC10msbuildRelWithDebInfo</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>VC10msbuildRelWithDebInfo</string>
+            </map>
+            <!-- OPEN-1a WORKAROUND end -->
+            <!-- OPEN-1a Release WORKAROUND begin - to be removed when VC 2010 is detected correctly -->
+            <key>VC10msbuildRelease</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=Release</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>VC10msbuildRelease</string>
+            </map>
+            <!-- OPEN-1a Release WORKAROUND end -->            
           </map>
           <key>name</key>
           <string>common</string>
@@ -2724,10 +2776,15 @@
               <key>name</key>
               <string>Release</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>"RelWithDebInfo|Win32"</string>
+                </array>
                 <key>command</key>
                 <string>vcbuild.exe</string>
                 <key>options</key>
@@ -2738,30 +2795,84 @@
               </map>
               <key>configure</key>
               <map>
-                <key>arguments</key>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>"Visual Studio 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 -->
+            <!-- OPEN-1a WORKAROUND begin - to be removed when VC 2010 is detected correctly -->
+           <key>VC10msbuildRelWithDebInfo</key>
+            <map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>msbuild.exe</string>
+                <key>options</key>
                 <array>
-                  <string>..\indra</string>
-                  <string>&amp;&amp;</string>
-                  <string>..\indra\tools\vstool\VSTool.exe</string>
-                  <string>--solution</string>
                   <string>SecondLife.sln</string>
-                  <string>--config</string>
-                  <string>Release</string>
-                  <string>--startup</string>
-                  <string>secondlife-bin</string>
+                  <string>/verbosity:minimal</string>
+                  <string>/t:build</string>
+                  <string>/p:Configuration=RelWithDebInfo</string>
+                  <string>/p:Platform=Win32</string>
+                  <string>/p:"VCBuildAdditionalOptions= /useenv"</string>
+                  <string>/p:"VCBuildAdditionalOptions= /incremental"</string>
+                  </array>
+              </map>
+              <key>configure</key>
+              <map>
+                <key>options</key>
+                <array>
+                  <string>-G</string>
+                  <string>"Visual Studio 10"</string>
+                  <string>-DSTANDALONE:BOOL=FALSE</string>
+                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
+                  <string>-DFMOD=FALSE</string>
                 </array>
+              </map>
+              <key>name</key>
+              <string>VC10msbuildRelWithDebInfo</string>
+            </map>
+           <!-- OPEN-1a WORKAROUND end -->
+            <!-- OPEN-1a Release WORKAROUND begin - to be removed when VC 2010 is detected correctly -->
+           <key>VC10msbuildRelease</key>
+            <map>
+              <key>build</key>
+              <map>
+                <key>command</key>
+                <string>msbuild.exe</string>
+                <key>options</key>
+                <array>
+                  <string>SecondLife.sln</string>
+                  <string>/t:build</string>
+                  <string>/p:Configuration=Release</string>
+                  <string>/p:Platform=Win32</string>
+                  <string>/p:"VCBuildAdditionalOptions= /useenv"</string>
+                  <string>/p:"VCBuildAdditionalOptions= /incremental"</string>
+                  </array>
+              </map>
+              <key>configure</key>
+              <map>
                 <key>options</key>
                 <array>
                   <string>-G</string>
-                  <string>"Visual Studio 8 2005"</string>
+                  <string>"Visual Studio 10"</string>
                   <string>-DSTANDALONE:BOOL=FALSE</string>
                   <string>-DINSTALL_PROPRIETARY=FALSE</string>
                   <string>-DFMOD=FALSE</string>
                 </array>
               </map>
               <key>name</key>
-              <string>VCexpressRelWithDebInfo</string>
+              <string>VC10msbuildRelease</string>
             </map>
+           <!-- OPEN-1a WORKAROUND end -->
           </map>
           <key>name</key>
           <string>windows</string>
diff --git a/doc/contributions.txt b/doc/contributions.txt
index a947b922ab..9caed38d30 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -833,6 +833,8 @@ Whoops Babii
 Wilton Lundquist
 	VWR-7682
 WolfPup Lowenhar
+	OPEN-1
+	OPEN-37
 	SNOW-622
 	SNOW-772
 	STORM-102
-- 
cgit v1.2.3