From d53045b4903d28bf18fd1291d0fa71a0ff200c41 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 6 Jun 2021 23:36:28 -0400
Subject: Use traversal projects to build libs in parallel.

---
 src/libs/dutil/dutil.proj     | 18 ++++++++++++++++++
 src/libs/libs.cmd             | 33 +--------------------------------
 src/libs/libs.proj            |  6 ++++++
 src/libs/wcautil/wcautil.proj | 16 ++++++++++++++++
 4 files changed, 41 insertions(+), 32 deletions(-)
 create mode 100644 src/libs/dutil/dutil.proj
 create mode 100644 src/libs/libs.proj
 create mode 100644 src/libs/wcautil/wcautil.proj

(limited to 'src/libs')

diff --git a/src/libs/dutil/dutil.proj b/src/libs/dutil/dutil.proj
new file mode 100644
index 00000000..9f4d884d
--- /dev/null
+++ b/src/libs/dutil/dutil.proj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.Build.Traversal">
+  <ItemGroup>
+    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
+    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
+
+    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
+    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
+    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
+
+    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86;PlatformToolset=v142" />
+    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64;PlatformToolset=v142" />
+    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v142" />
+
+    <ProjectReference Include="test\DUtilUnitTest\DUtilUnitTest.vcxproj" Targets="Test" />
+
+    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Targets="PackNative" />
+  </ItemGroup>
+</Project>
diff --git a/src/libs/libs.cmd b/src/libs/libs.cmd
index 544c4b32..affb72b1 100644
--- a/src/libs/libs.cmd
+++ b/src/libs/libs.cmd
@@ -12,38 +12,7 @@
 
 nuget restore || exit /b
 
-:: dutil
-
-msbuild -t:Test -p:Configuration=%_C% dutil\test\DUtilUnitTest || exit /b
-
-msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
-msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
-msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
-
-msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
-msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
-msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
-
-msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
-msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
-
-msbuild -p:Configuration=%_C% -t:PackNative dutil\WixToolset.DUtil\dutil.vcxproj || exit /b
-
-
-:: wcautil
-
-msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
-msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
-msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
-
-msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
-msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
-msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
-
-msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
-msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
-
-msbuild -t:PackNative -p:Configuration=%_C% wcautil\WixToolset.WcaUtil\wcautil.vcxproj || exit /b
+msbuild -m -p:Configuration=%_C% libs.proj || exit /b
 
 @popd
 @endlocal
diff --git a/src/libs/libs.proj b/src/libs/libs.proj
new file mode 100644
index 00000000..e1291af7
--- /dev/null
+++ b/src/libs/libs.proj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.Build.Traversal/3.0.23">
+  <ItemGroup>
+    <ProjectReference Include="dutil\dutil.proj" />
+    <ProjectReference Include="wcautil\wcautil.proj" />
+  </ItemGroup>
+</Project>
diff --git a/src/libs/wcautil/wcautil.proj b/src/libs/wcautil/wcautil.proj
new file mode 100644
index 00000000..839c63a4
--- /dev/null
+++ b/src/libs/wcautil/wcautil.proj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.Build.Traversal">
+  <ItemGroup>
+    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
+    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
+
+    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
+    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
+    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
+
+    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86;PlatformToolset=v142" />
+    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64;PlatformToolset=v142" />
+    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v142" />
+
+    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Targets="PackNative" />
+  </ItemGroup>
+</Project>
-- 
cgit v1.2.3-55-g6feb