diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-08-08 18:40:25 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-08-08 19:44:05 -0700 |
| commit | 8e1cbe8d7b468553d76c20452561e89726de5c47 (patch) | |
| tree | f0209f90fbb395767af76caa4e48e1cf26317ddf | |
| parent | 2f1a8d6caa50640925bf634062121391c450a5ed (diff) | |
| download | wix-8e1cbe8d7b468553d76c20452561e89726de5c47.tar.gz wix-8e1cbe8d7b468553d76c20452561e89726de5c47.tar.bz2 wix-8e1cbe8d7b468553d76c20452561e89726de5c47.zip | |
Simplify and fix incremental/clean in build cmds
Refining this pattern before spreading more widely.
| -rw-r--r-- | src/api/api.cmd | 7 | ||||
| -rw-r--r-- | src/setup/setup.cmd | 7 | ||||
| -rw-r--r-- | src/tools/tools.cmd | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/src/api/api.cmd b/src/api/api.cmd index abdc975b..d93f1435 100644 --- a/src/api/api.cmd +++ b/src/api/api.cmd | |||
| @@ -6,14 +6,15 @@ | |||
| 6 | 6 | ||
| 7 | :parse_args | 7 | :parse_args |
| 8 | @if /i "%1"=="release" set _C=Release | 8 | @if /i "%1"=="release" set _C=Release |
| 9 | @if /i "%1"=="inc" set _INCREMENTAL=1 | 9 | @if /i "%1"=="inc" set _INC=1 |
| 10 | @if /i "%1"=="clean" set _INCREMENTAL= & set _CLEAN=1 | 10 | @if /i "%1"=="clean" set _CLEAN=1 |
| 11 | @if not "%1"=="" shift & goto parse_args | 11 | @if not "%1"=="" shift & goto parse_args |
| 12 | 12 | ||
| 13 | @set _B=%~dp0..\..\build\api\%_C% | 13 | @set _B=%~dp0..\..\build\api\%_C% |
| 14 | 14 | ||
| 15 | :: Clean | 15 | :: Clean |
| 16 | @if NOT "%_INCREMENTAL%"=="" call :clean | 16 | |
| 17 | @if "%_INC%"=="" call :clean | ||
| 17 | @if NOT "%_CLEAN%"=="" goto :end | 18 | @if NOT "%_CLEAN%"=="" goto :end |
| 18 | 19 | ||
| 19 | @echo Building api %_C% | 20 | @echo Building api %_C% |
diff --git a/src/setup/setup.cmd b/src/setup/setup.cmd index 8a7b01c9..28982ad2 100644 --- a/src/setup/setup.cmd +++ b/src/setup/setup.cmd | |||
| @@ -6,12 +6,13 @@ | |||
| 6 | 6 | ||
| 7 | :parse_args | 7 | :parse_args |
| 8 | @if /i "%1"=="release" set _C=Release | 8 | @if /i "%1"=="release" set _C=Release |
| 9 | @if /i "%1"=="inc" set _INCREMENTAL=1 | 9 | @if /i "%1"=="inc" set _INC=1 |
| 10 | @if /i "%1"=="clean" set _INCREMENTAL= & set _CLEAN=1 | 10 | @if /i "%1"=="clean" set _CLEAN=1 |
| 11 | @if not "%1"=="" shift & goto parse_args | 11 | @if not "%1"=="" shift & goto parse_args |
| 12 | 12 | ||
| 13 | :: Clean | 13 | :: Clean |
| 14 | @if NOT "%_INCREMENTAL%"=="" call :clean | 14 | |
| 15 | @if "%_INC%"=="" call :clean | ||
| 15 | @if NOT "%_CLEAN%"=="" goto :end | 16 | @if NOT "%_CLEAN%"=="" goto :end |
| 16 | 17 | ||
| 17 | @echo Building setup %_C% | 18 | @echo Building setup %_C% |
diff --git a/src/tools/tools.cmd b/src/tools/tools.cmd index a37703f6..4ddfde46 100644 --- a/src/tools/tools.cmd +++ b/src/tools/tools.cmd | |||
| @@ -6,12 +6,13 @@ | |||
| 6 | 6 | ||
| 7 | :parse_args | 7 | :parse_args |
| 8 | @if /i "%1"=="release" set _C=Release | 8 | @if /i "%1"=="release" set _C=Release |
| 9 | @if /i "%1"=="inc" set _INCREMENTAL=1 | 9 | @if /i "%1"=="inc" set _INC=1 |
| 10 | @if /i "%1"=="clean" set _INCREMENTAL= & set _CLEAN=1 | 10 | @if /i "%1"=="clean" set _CLEAN=1 |
| 11 | @if not "%1"=="" shift & goto parse_args | 11 | @if not "%1"=="" shift & goto parse_args |
| 12 | 12 | ||
| 13 | :: Clean | 13 | :: Clean |
| 14 | @if NOT "%_INCREMENTAL%"=="" call :clean | 14 | |
| 15 | @if "%_INC%"=="" call :clean | ||
| 15 | @if NOT "%_CLEAN%"=="" goto :end | 16 | @if NOT "%_CLEAN%"=="" goto :end |
| 16 | 17 | ||
| 17 | @echo Building tools %_C% | 18 | @echo Building tools %_C% |