diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-12-21 12:44:27 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-12-30 08:15:54 -0800 |
| commit | 4cd4828e6225a2ff5e81002a7f6f7401570b21c4 (patch) | |
| tree | 54acd62489f52661881372b6d22bf6e670017ef2 /src/libs | |
| parent | 6d431a1488f770a0c2c753e2e3744fbb8d3eee0b (diff) | |
| download | wix-4cd4828e6225a2ff5e81002a7f6f7401570b21c4.tar.gz wix-4cd4828e6225a2ff5e81002a7f6f7401570b21c4.tar.bz2 wix-4cd4828e6225a2ff5e81002a7f6f7401570b21c4.zip | |
Build simplification and parallelization
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/dutil/dutil_t.proj (renamed from src/libs/dutil/dutil.proj) | 0 | ||||
| -rw-r--r-- | src/libs/libs.cmd | 8 | ||||
| -rw-r--r-- | src/libs/libs.proj | 6 | ||||
| -rw-r--r-- | src/libs/libs_t.proj | 6 | ||||
| -rw-r--r-- | src/libs/wcautil/wcautil_t.proj (renamed from src/libs/wcautil/wcautil.proj) | 0 |
5 files changed, 8 insertions, 12 deletions
diff --git a/src/libs/dutil/dutil.proj b/src/libs/dutil/dutil_t.proj index 90d66440..90d66440 100644 --- a/src/libs/dutil/dutil.proj +++ b/src/libs/dutil/dutil_t.proj | |||
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 @@ | |||
| 6 | @if /i "%1"=="release" set _C=Release | 6 | @if /i "%1"=="release" set _C=Release |
| 7 | @if not "%1"=="" shift & goto parse_args | 7 | @if not "%1"=="" shift & goto parse_args |
| 8 | 8 | ||
| 9 | @echo Building libs %_C% using %_N% | 9 | @echo Building libs %_C% |
| 10 | 10 | ||
| 11 | :: libs | 11 | msbuild -Restore libs_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\libs_build.binlog || exit /b |
| 12 | |||
| 13 | nuget restore || exit /b | ||
| 14 | |||
| 15 | msbuild -m -p:Configuration=%_C% libs.proj || exit /b | ||
| 16 | 12 | ||
| 17 | @popd | 13 | @popd |
| 18 | @endlocal | 14 | @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 @@ | |||
| 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/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 @@ | |||
| 1 | <Project Sdk="Microsoft.Build.Traversal"> | ||
| 2 | <ItemGroup> | ||
| 3 | <ProjectReference Include="dutil\dutil_t.proj" /> | ||
| 4 | <ProjectReference Include="wcautil\wcautil_t.proj" /> | ||
| 5 | </ItemGroup> | ||
| 6 | </Project> | ||
diff --git a/src/libs/wcautil/wcautil.proj b/src/libs/wcautil/wcautil_t.proj index ae0ebc08..ae0ebc08 100644 --- a/src/libs/wcautil/wcautil.proj +++ b/src/libs/wcautil/wcautil_t.proj | |||