Use traversal projects to build libs in parallel.

author: Bob Arnson <bob@firegiant.com> 2021-06-06 23:36:28 -0400
committer: Bob Arnson <bob@firegiant.com> 2021-06-28 20:03:09 -0400
commit: d53045b4903d28bf18fd1291d0fa71a0ff200c41 (patch)
tree: 7c94861fb55dc444a1957cb498aa4bdff7e0cc68 /src/libs
parent: df80238531f76724d2d3e9f4a92b0fd691cf8526 (diff)
download: wix-d53045b4903d28bf18fd1291d0fa71a0ff200c41.tar.gz
wix-d53045b4903d28bf18fd1291d0fa71a0ff200c41.tar.bz2
wix-d53045b4903d28bf18fd1291d0fa71a0ff200c41.zip
4 files changed, 41 insertions, 32 deletions
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 -m -p:Configuration=%_C% libs.proj || exit /b
-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
 @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>
author	Bob Arnson <bob@firegiant.com>	2021-06-06 23:36:28 -0400
committer	Bob Arnson <bob@firegiant.com>	2021-06-28 20:03:09 -0400
commit	d53045b4903d28bf18fd1291d0fa71a0ff200c41 (patch)
tree	7c94861fb55dc444a1957cb498aa4bdff7e0cc68 /src/libs
parent	df80238531f76724d2d3e9f4a92b0fd691cf8526 (diff)
download	wix-d53045b4903d28bf18fd1291d0fa71a0ff200c41.tar.gz wix-d53045b4903d28bf18fd1291d0fa71a0ff200c41.tar.bz2 wix-d53045b4903d28bf18fd1291d0fa71a0ff200c41.zip

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 @@
		1	<Project Sdk="Microsoft.Build.Traversal">
		2	<ItemGroup>
		3	<ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
		4	<ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
		5
		6	<ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
		7	<ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
		8	<ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
		9
		10	<ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86;PlatformToolset=v142" />
		11	<ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64;PlatformToolset=v142" />
		12	<ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v142" />
		13
		14	<ProjectReference Include="test\DUtilUnitTest\DUtilUnitTest.vcxproj" Targets="Test" />
		15
		16	<ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Targets="PackNative" />
		17	</ItemGroup>
		18	</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 @@
12		12
13	nuget restore \|\| exit /b	13	nuget restore \|\| exit /b
14		14
15	:: dutil	15	msbuild -m -p:Configuration=%_C% libs.proj \|\| exit /b
16
17	msbuild -t:Test -p:Configuration=%_C% dutil\test\DUtilUnitTest \|\| exit /b
18
19	msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 dutil\WixToolset.DUtil\dutil.vcxproj \|\| exit /b
20	msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 dutil\WixToolset.DUtil\dutil.vcxproj \|\| exit /b
21	msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 dutil\WixToolset.DUtil\dutil.vcxproj \|\| exit /b
22
23	msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 dutil\WixToolset.DUtil\dutil.vcxproj \|\| exit /b
24	msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 dutil\WixToolset.DUtil\dutil.vcxproj \|\| exit /b
25	msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 dutil\WixToolset.DUtil\dutil.vcxproj \|\| exit /b
26
27	msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 dutil\WixToolset.DUtil\dutil.vcxproj \|\| exit /b
28	msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 dutil\WixToolset.DUtil\dutil.vcxproj \|\| exit /b
29
30	msbuild -p:Configuration=%_C% -t:PackNative dutil\WixToolset.DUtil\dutil.vcxproj \|\| exit /b
31
32
33	:: wcautil
34
35	msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v142 wcautil\WixToolset.WcaUtil\wcautil.vcxproj \|\| exit /b
36	msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v142 wcautil\WixToolset.WcaUtil\wcautil.vcxproj \|\| exit /b
37	msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v142 wcautil\WixToolset.WcaUtil\wcautil.vcxproj \|\| exit /b
38
39	msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v141 wcautil\WixToolset.WcaUtil\wcautil.vcxproj \|\| exit /b
40	msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v141 wcautil\WixToolset.WcaUtil\wcautil.vcxproj \|\| exit /b
41	msbuild -p:Configuration=%_C%;Platform=ARM64;PlatformToolset=v141 wcautil\WixToolset.WcaUtil\wcautil.vcxproj \|\| exit /b
42
43	msbuild -p:Configuration=%_C%;Platform=x86;PlatformToolset=v140 wcautil\WixToolset.WcaUtil\wcautil.vcxproj \|\| exit /b
44	msbuild -p:Configuration=%_C%;Platform=x64;PlatformToolset=v140 wcautil\WixToolset.WcaUtil\wcautil.vcxproj \|\| exit /b
45
46	msbuild -t:PackNative -p:Configuration=%_C% wcautil\WixToolset.WcaUtil\wcautil.vcxproj \|\| exit /b
47		16
48	@popd	17	@popd
49	@endlocal	18	@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 @@
		1	<Project Sdk="Microsoft.Build.Traversal/3.0.23">
		2	<ItemGroup>
		3	<ProjectReference Include="dutil\dutil.proj" />
		4	<ProjectReference Include="wcautil\wcautil.proj" />
		5	</ItemGroup>
		6	</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 @@
		1	<Project Sdk="Microsoft.Build.Traversal">
		2	<ItemGroup>
		3	<ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86;PlatformToolset=v140" />
		4	<ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64;PlatformToolset=v140" />
		5
		6	<ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86;PlatformToolset=v141" />
		7	<ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64;PlatformToolset=v141" />
		8	<ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v141" />
		9
		10	<ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x86;PlatformToolset=v142" />
		11	<ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=x64;PlatformToolset=v142" />
		12	<ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Properties="Platform=ARM64;PlatformToolset=v142" />
		13
		14	<ProjectReference Include="WixToolset.WcaUtil\wcautil.vcxproj" Targets="PackNative" />
		15	</ItemGroup>
		16	</Project>