livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove obsolete workaround configurations

master
Oz Linden 2011-04-05 16:48:05 -04:00
parent b5c834c6fd
commit f23bd166fc
1 changed files with 31 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
autobuild.xml
View File

@ -1740,30 +1740,6 @@
<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>
<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 -->
<!-- OPEN-1a WORKAROUND begin - to be removed when VC 2010 is detected correctly -->
<key>VC10msbuildRelWithDebInfo</key>
<map>
<key>configure</key>
@ -1785,8 +1761,6 @@
<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>
@ -1808,7 +1782,27 @@
<key>name</key>
<string>VC10msbuildRelease</string>
</map>
<!-- OPEN-1a Release WORKAROUND end -->
<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>
</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>