From 4cd4828e6225a2ff5e81002a7f6f7401570b21c4 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 21 Dec 2021 12:44:27 -0800
Subject: Build simplification and parallelization

---
 src/libs/dutil/dutil.proj       | 11 -----------
 src/libs/dutil/dutil_t.proj     | 11 +++++++++++
 src/libs/libs.cmd               |  8 ++------
 src/libs/libs.proj              |  6 ------
 src/libs/libs_t.proj            |  6 ++++++
 src/libs/wcautil/wcautil.proj   |  9 ---------
 src/libs/wcautil/wcautil_t.proj |  9 +++++++++
 7 files changed, 28 insertions(+), 32 deletions(-)
 delete mode 100644 src/libs/dutil/dutil.proj
 create mode 100644 src/libs/dutil/dutil_t.proj
 delete mode 100644 src/libs/libs.proj
 create mode 100644 src/libs/libs_t.proj
 delete mode 100644 src/libs/wcautil/wcautil.proj
 create mode 100644 src/libs/wcautil/wcautil_t.proj

(limited to 'src/libs')

diff --git a/src/libs/dutil/dutil.proj b/src/libs/dutil/dutil.proj
deleted file mode 100644
index 90d66440..00000000
--- a/src/libs/dutil/dutil.proj
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.Build.Traversal">
-  <ItemGroup>
-    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86" />
-    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64" />
-    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64" />
-
-    <ProjectReference Include="test\DUtilUnitTest\DUtilUnitTest.vcxproj" Targets="Test" />
-
-    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Targets="PackNative" />
-  </ItemGroup>
-</Project>
diff --git a/src/libs/dutil/dutil_t.proj b/src/libs/dutil/dutil_t.proj
new file mode 100644
index 00000000..90d66440
--- /dev/null
+++ b/src/libs/dutil/dutil_t.proj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.Build.Traversal">
+  <ItemGroup>
+    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64" />
+    <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64" />
+
+    <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 affb72b1..ddc2e1d6 100644
--- a/src/libs/libs.cmd
+++ b/src/libs/libs.cmd
@@ -6,13 +6,9 @@
 @if /i "%1"=="release" set _C=Release
 @if not "%1"=="" shift & goto parse_args
 
-@echo Building libs %_C% using %_N%
+@echo Building libs %_C%
 
-:: libs
-
-nuget restore || exit /b
-
-msbuild -m -p:Configuration=%_C% libs.proj || exit /b
+msbuild -Restore libs_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\libs_build.binlog || exit /b
 
 @popd
 @endlocal
diff --git a/src/libs/libs.proj b/src/libs/libs.proj
deleted file mode 100644
index e1291af7..00000000
--- a/src/libs/libs.proj
+++ /dev/null
@@ -1,6 +0,0 @@
-<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/libs_t.proj b/src/libs/libs_t.proj
new file mode 100644
index 00000000..8c35f1c3
--- /dev/null
+++ b/src/libs/libs_t.proj
@@ -0,0 +1,6 @@
+<Project Sdk="Microsoft.Build.Traversal">
+  <ItemGroup>
+    <ProjectReference Include="dutil\dutil_t.proj" />
+    <ProjectReference Include="wcautil\wcautil_t.proj" />
+  </ItemGroup>
+</Project>
diff --git a/src/libs/wcautil/wcautil.proj b/src/libs/wcautil/wcautil.proj
deleted file mode 100644
index ae0ebc08..00000000
--- a/src/libs/wcautil/wcautil.proj
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project Sdk="Microsoft.Build.Traversal">
-  <ItemGroup>
-    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86" />
-    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64" />
-    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=ARM64" />
-
-    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Targets="PackNative" />
-  </ItemGroup>
-</Project>
diff --git a/src/libs/wcautil/wcautil_t.proj b/src/libs/wcautil/wcautil_t.proj
new file mode 100644
index 00000000..ae0ebc08
--- /dev/null
+++ b/src/libs/wcautil/wcautil_t.proj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.Build.Traversal">
+  <ItemGroup>
+    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86" />
+    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64" />
+    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=ARM64" />
+
+    <ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Targets="PackNative" />
+  </ItemGroup>
+</Project>
-- 
cgit v1.2.3-55-g6feb