diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-03-03 10:12:53 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-03-03 10:12:53 -0500 |
| commit | e59dbf1b23a13c6a7f1f0d9661d3dcb78ea040f2 (patch) | |
| tree | 755e92e8ef167a38d7930a2574af55fb690943ce | |
| parent | 9436cc3c3b88745897cd1e3e3f58716143f610a3 (diff) | |
Align ReleaseOS / RelWithDebInfoOS more closely with Release, etc.
Specifically, engage devenv rather than msbuild for ReleaseOS and
RelWithDebInfoOS.
Eliminate minor redundancy in configure argument for Release and
RelWithDebInfo, which eliminates an egregious difference from ReleaseOS and
RelWithDebInfoOS.
| -rwxr-xr-x | autobuild.xml | 52 |
1 files changed, 14 insertions, 38 deletions
diff --git a/autobuild.xml b/autobuild.xml index 52d750f64d..ea7d166bc9 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -2388,11 +2388,12 @@ <map> <key>RelWithDebInfo</key> <map> - <key>build</key> - <map> - </map> <key>configure</key> <map> + <key>arguments</key> + <array> + <string>../indra</string> + </array> <key>command</key> <string>cmake</string> <key>options</key> @@ -2429,11 +2430,12 @@ </map> <key>Release</key> <map> - <key>build</key> - <map> - </map> <key>configure</key> <map> + <key>arguments</key> + <array> + <string>../indra</string> + </array> <key>command</key> <string>cmake</string> <key>options</key> @@ -2496,10 +2498,6 @@ </map> <key>configure</key> <map> - <key>arguments</key> - <array> - <string>../indra</string> - </array> <key>options</key> <array> <string>-G</string> @@ -2554,10 +2552,6 @@ </map> <key>configure</key> <map> - <key>arguments</key> - <array> - <string>../indra</string> - </array> <key>options</key> <array> <string>-G</string> @@ -2615,10 +2609,6 @@ </map> <key>configure</key> <map> - <key>arguments</key> - <array> - <string>../indra</string> - </array> <key>options</key> <array> <string>-G</string> @@ -2665,10 +2655,6 @@ </map> <key>configure</key> <map> - <key>arguments</key> - <array> - <string>../indra</string> - </array> <key>options</key> <array> <string>-G</string> @@ -2768,16 +2754,11 @@ <string>SecondLife.sln</string> </array> <key>command</key> - <string>msbuild.exe</string> + <string>devenv</string> <key>options</key> <array> - <string>/p:Configuration=RelWithDebInfo</string> - <string>/p:Platform=Win32</string> - <string>/t:Build</string> - <string>/p:useenv=true</string> - <string>/verbosity:minimal</string> - <string>/toolsversion:4.0</string> - <string>/p:"VCBuildAdditionalOptions= /incremental"</string> + <string>/build</string> + <string>"RelWithDebInfo|Win32"</string> </array> </map> <key>configure</key> @@ -2854,16 +2835,11 @@ <string>SecondLife.sln</string> </array> <key>command</key> - <string>msbuild.exe</string> + <string>devenv</string> <key>options</key> <array> - <string>/p:Configuration=Release</string> - <string>/p:Platform=Win32</string> - <string>/t:Build</string> - <string>/p:useenv=true</string> - <string>/verbosity:minimal</string> - <string>/toolsversion:4.0</string> - <string>/p:"VCBuildAdditionalOptions= /incremental"</string> + <string>/build</string> + <string>"Release|Win32"</string> </array> </map> <key>configure</key> |