From f85120e0bfc2ea8f94eb2b99e7ce262e9f29fd9e Mon Sep 17 00:00:00 2001
From: Signal Linden <signal@lindenlab.com>
Date: Wed, 12 Oct 2022 14:00:59 -0700
Subject: [PATCH] Consistently use msbuild not devenv in autobuild.xml
---
autobuild.xml | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 954299d1f36..288def254b0 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -3218,11 +3218,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<string>SecondLife.sln</string>
</array>
<key>command</key>
- <string>devenv</string>
+ <string>msbuild.exe</string>
<key>options</key>
<array>
- <string>/build</string>
- <string>RelWithDebInfo|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+ <string>/p:Configuration=RelWithDebInfo</string>
+ <string>/p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+ <string>/t:Build</string>
+ <string>/p:useenv=true</string>
+ <string>/verbosity:minimal</string>
+ <string>/p:VCBuildAdditionalOptions= /incremental</string>
+ <string>/m:${AUTOBUILD_CPU_COUNT}</string>
</array>
</map>
<key>configure</key>
@@ -3262,6 +3267,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<string>/p:useenv=true</string>
<string>/verbosity:minimal</string>
<string>/p:VCBuildAdditionalOptions= /incremental</string>
+ <string>/m:${AUTOBUILD_CPU_COUNT}</string>
</array>
</map>
<key>configure</key>
@@ -3293,11 +3299,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<string>SecondLife.sln</string>
</array>
<key>command</key>
- <string>devenv</string>
+ <string>msbuild.exe</string>
<key>options</key>
<array>
- <string>/build</string>
- <string>Release|${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+ <string>/p:Configuration=Release</string>
+ <string>/p:Platform=${AUTOBUILD_WIN_VSPLATFORM|NOTWIN}</string>
+ <string>/t:Build</string>
+ <string>/p:useenv=true</string>
+ <string>/verbosity:minimal</string>
+ <string>/p:VCBuildAdditionalOptions= /incremental</string>
+ <string>/m:${AUTOBUILD_CPU_COUNT}</string>
</array>
</map>
<key>configure</key>
@@ -3335,6 +3346,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<string>/p:useenv=true</string>
<string>/verbosity:minimal</string>
<string>/p:VCBuildAdditionalOptions= /incremental</string>
+ <string>/m:${AUTOBUILD_CPU_COUNT}</string>
</array>
</map>
<key>configure</key>
--
GitLab