From 8e1cbe8d7b468553d76c20452561e89726de5c47 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 8 Aug 2022 18:40:25 -0700 Subject: Simplify and fix incremental/clean in build cmds Refining this pattern before spreading more widely. --- src/api/api.cmd | 7 ++++--- src/setup/setup.cmd | 7 ++++--- 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 @@ :parse_args @if /i "%1"=="release" set _C=Release -@if /i "%1"=="inc" set _INCREMENTAL=1 -@if /i "%1"=="clean" set _INCREMENTAL= & set _CLEAN=1 +@if /i "%1"=="inc" set _INC=1 +@if /i "%1"=="clean" set _CLEAN=1 @if not "%1"=="" shift & goto parse_args @set _B=%~dp0..\..\build\api\%_C% :: Clean -@if NOT "%_INCREMENTAL%"=="" call :clean + +@if "%_INC%"=="" call :clean @if NOT "%_CLEAN%"=="" goto :end @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 @@ :parse_args @if /i "%1"=="release" set _C=Release -@if /i "%1"=="inc" set _INCREMENTAL=1 -@if /i "%1"=="clean" set _INCREMENTAL= & set _CLEAN=1 +@if /i "%1"=="inc" set _INC=1 +@if /i "%1"=="clean" set _CLEAN=1 @if not "%1"=="" shift & goto parse_args :: Clean -@if NOT "%_INCREMENTAL%"=="" call :clean + +@if "%_INC%"=="" call :clean @if NOT "%_CLEAN%"=="" goto :end @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 @@ :parse_args @if /i "%1"=="release" set _C=Release -@if /i "%1"=="inc" set _INCREMENTAL=1 -@if /i "%1"=="clean" set _INCREMENTAL= & set _CLEAN=1 +@if /i "%1"=="inc" set _INC=1 +@if /i "%1"=="clean" set _CLEAN=1 @if not "%1"=="" shift & goto parse_args :: Clean -@if NOT "%_INCREMENTAL%"=="" call :clean + +@if "%_INC%"=="" call :clean @if NOT "%_CLEAN%"=="" goto :end @echo Building tools %_C% -- cgit v1.2.3-55-g6feb