summaryrefslogtreecommitdiff
path: root/autobuild.xml
diff options
context:
space:
mode:
Diffstat (limited to 'autobuild.xml')
-rw-r--r--autobuild.xml99
1 files changed, 18 insertions, 81 deletions
diff --git a/autobuild.xml b/autobuild.xml
index a31d280b6f..1a9788047e 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1740,8 +1740,7 @@
<key>name</key>
<string>Release</string>
</map>
- <!-- OPEN-1 WORKAROUND begin - to be removed when VC express is detected correctly -->
- <key>VCexpressRelWithDebInfo</key>
+ <key>VC10msbuildRelWithDebInfo</key>
<map>
<key>configure</key>
<map>
@@ -1760,11 +1759,9 @@
</array>
</map>
<key>name</key>
- <string>VCexpressRelWithDebInfo</string>
+ <string>VC10msbuildRelWithDebInfo</string>
</map>
- <!-- OPEN-1 WORKAROUND end -->
- <!-- OPEN-1a WORKAROUND begin - to be removed when VC 2010 is detected correctly -->
- <key>VC10msbuildRelWithDebInfo</key>
+ <key>VC10msbuildRelease</key>
<map>
<key>configure</key>
<map>
@@ -1776,18 +1773,16 @@
<string>cmake</string>
<key>options</key>
<array>
- <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
+ <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>VC10msbuildRelWithDebInfo</string>
+ <string>VC10msbuildRelease</string>
</map>
- <!-- OPEN-1a WORKAROUND end -->
- <!-- OPEN-1a Release WORKAROUND begin - to be removed when VC 2010 is detected correctly -->
- <key>VC10msbuildRelease</key>
+ <key>VCexpressRelWithDebInfo</key>
<map>
<key>configure</key>
<map>
@@ -1799,16 +1794,15 @@
<string>cmake</string>
<key>options</key>
<array>
- <string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
+ <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>VC10msbuildRelease</string>
+ <string>VCexpressRelWithDebInfo</string>
</map>
- <!-- OPEN-1a Release WORKAROUND end -->
</map>
<key>name</key>
<string>common</string>
@@ -2752,7 +2746,16 @@
<key>name</key>
<string>Release</string>
</map>
- <!-- OPEN-1 WORKAROUND begin - to be removed when VC express is detected correctly -->
+ <key>VC10msbuildRelWithDebInfo</key>
+ <map>
+ <key>name</key>
+ <string>VC10msbuildRelWithDebInfo</string>
+ </map>
+ <key>VC10msbuildRelease</key>
+ <map>
+ <key>name</key>
+ <string>VC10msbuildRelease</string>
+ </map>
<key>VCexpressRelWithDebInfo</key>
<map>
<key>build</key>
@@ -2783,72 +2786,6 @@
<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>SecondLife.sln</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 10"</string>
- <string>-DSTANDALONE:BOOL=FALSE</string>
- <string>-DINSTALL_PROPRIETARY=FALSE</string>
- <string>-DFMOD=FALSE</string>
- </array>
- </map>
- <key>name</key>
- <string>VC10msbuildRelease</string>
- </map>
- <!-- OPEN-1a WORKAROUND end -->
</map>
<key>name</key>
<string>windows</string>