Skip to content
Snippets Groups Projects
Commit fef21534 authored by Merov Linden's avatar Merov Linden
Browse files

OPEN-37 : pull into viewer-autobuild2010

parents e13f5884 3b1dee9a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
autobuild.xml
+ 122
− 11
View file @ fef21534
...@@ -1740,10 +1740,15 @@ ...@@ -1740,10 +1740,15 @@
<key>name</key> <key>name</key>
<string>Release</string> <string>Release</string>
</map> </map>
<!-- OPEN-1 WORKAROUND begin - to be removed when VC express is detected correctly -->
<key>VCexpressRelWithDebInfo</key> <key>VCexpressRelWithDebInfo</key>
<map> <map>
<key>configure</key> <key>configure</key>
<map> <map>
<key>arguments</key>
<array>
<string>../indra</string>
</array>
<key>command</key> <key>command</key>
<string>cmake</string> <string>cmake</string>
<key>options</key> <key>options</key>
...@@ -1757,6 +1762,53 @@ ...@@ -1757,6 +1762,53 @@
<key>name</key> <key>name</key>
<string>VCexpressRelWithDebInfo</string> <string>VCexpressRelWithDebInfo</string>
</map> </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> </map>
<key>name</key> <key>name</key>
<string>common</string> <string>common</string>
...@@ -2700,10 +2752,15 @@ ...@@ -2700,10 +2752,15 @@
<key>name</key> <key>name</key>
<string>Release</string> <string>Release</string>
</map> </map>
<!-- OPEN-1 WORKAROUND begin - to be removed when VC express is detected correctly -->
<key>VCexpressRelWithDebInfo</key> <key>VCexpressRelWithDebInfo</key>
<map> <map>
<key>build</key> <key>build</key>
<map> <map>
<key>arguments</key>
<array>
<string>"RelWithDebInfo|Win32"</string>
</array>
<key>command</key> <key>command</key>
<string>vcbuild.exe</string> <string>vcbuild.exe</string>
<key>options</key> <key>options</key>
...@@ -2714,30 +2771,84 @@ ...@@ -2714,30 +2771,84 @@
</map> </map>
<key>configure</key> <key>configure</key>
<map> <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> <array>
<string>..\indra</string>
<string>&amp;&amp;</string>
<string>..\indra\tools\vstool\VSTool.exe</string>
<string>--solution</string>
<string>SecondLife.sln</string> <string>SecondLife.sln</string>
<string>--config</string> <string>/verbosity:minimal</string>
<string>Release</string> <string>/t:build</string>
<string>--startup</string> <string>/p:Configuration=RelWithDebInfo</string>
<string>secondlife-bin</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> </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> <key>options</key>
<array> <array>
<string>-G</string> <string>-G</string>
<string>"Visual Studio 8 2005"</string> <string>"Visual Studio 10"</string>
<string>-DSTANDALONE:BOOL=FALSE</string> <string>-DSTANDALONE:BOOL=FALSE</string>
<string>-DINSTALL_PROPRIETARY=FALSE</string> <string>-DINSTALL_PROPRIETARY=FALSE</string>
<string>-DFMOD=FALSE</string> <string>-DFMOD=FALSE</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
<string>VCexpressRelWithDebInfo</string> <string>VC10msbuildRelease</string>
</map> </map>
<!-- OPEN-1a WORKAROUND end -->
</map> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
......
doc/contributions.txt
+ 2
− 0
View file @ fef21534
...@@ -840,6 +840,8 @@ Whoops Babii ...@@ -840,6 +840,8 @@ Whoops Babii
Wilton Lundquist Wilton Lundquist
VWR-7682 VWR-7682
WolfPup Lowenhar WolfPup Lowenhar
OPEN-1
OPEN-37
SNOW-622 SNOW-622
SNOW-772 SNOW-772
STORM-102 STORM-102
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment