From 91a3a42439d87a5b626e61244edcb8c8e231cc5f Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 16 May 2021 16:00:41 -0700 Subject: Fix batch file command-line parsing --- src/api/api.cmd | 2 +- src/build_all.cmd | 2 +- src/burn/burn.cmd | 2 +- src/dtf/dtf.cmd | 2 +- src/ext/Bal/bal.cmd | 2 +- src/ext/Dependency/dependency.cmd | 2 +- src/ext/DifxApp/difxapp.cmd | 2 +- src/ext/DirectX/directx.cmd | 2 +- src/ext/Firewall/firewall.cmd | 2 +- src/ext/Http/http.cmd | 2 +- src/ext/Iis/iis.cmd | 2 +- src/ext/Msmq/msmq.cmd | 2 +- src/ext/NetFx/netfx.cmd | 2 +- src/ext/PowerShell/ps.cmd | 2 +- src/ext/Sql/sql.cmd | 2 +- src/ext/UI/ui.cmd | 2 +- src/ext/Util/util.cmd | 2 +- src/ext/VisualStudio/vs.cmd | 2 +- src/ext/ext.cmd | 2 +- src/internal/internal.cmd | 2 +- src/libs/libs.cmd | 2 +- src/test/burn/test_burn.cmd | 2 +- src/test/run_test.cmd | 16 +--------------- src/test/test.cmd | 2 +- src/wix/wix.cmd | 2 +- 25 files changed, 25 insertions(+), 39 deletions(-) diff --git a/src/api/api.cmd b/src/api/api.cmd index e08c10aa..db8d5183 100644 --- a/src/api/api.cmd +++ b/src/api/api.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Building api %_C% diff --git a/src/build_all.cmd b/src/build_all.cmd index de9a22e6..7c62be74 100644 --- a/src/build_all.cmd +++ b/src/build_all.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo build %_C% diff --git a/src/burn/burn.cmd b/src/burn/burn.cmd index 1eb09b99..55478eb2 100644 --- a/src/burn/burn.cmd +++ b/src/burn/burn.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Building burn %_C% diff --git a/src/dtf/dtf.cmd b/src/dtf/dtf.cmd index e90a54aa..1f6b3842 100644 --- a/src/dtf/dtf.cmd +++ b/src/dtf/dtf.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Building dtf %_C% diff --git a/src/ext/Bal/bal.cmd b/src/ext/Bal/bal.cmd index 0bc55dfb..6253c5a7 100644 --- a/src/ext/Bal/bal.cmd +++ b/src/ext/Bal/bal.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Building ext\Util %_C% using %_N% diff --git a/src/ext/Dependency/dependency.cmd b/src/ext/Dependency/dependency.cmd index 74e72798..e367ab1b 100644 --- a/src/ext/Dependency/dependency.cmd +++ b/src/ext/Dependency/dependency.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Dependency.wixext build %_C% diff --git a/src/ext/DifxApp/difxapp.cmd b/src/ext/DifxApp/difxapp.cmd index 754ec455..da2fe7a9 100644 --- a/src/ext/DifxApp/difxapp.cmd +++ b/src/ext/DifxApp/difxapp.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Dependency.wixext build %_C% diff --git a/src/ext/DirectX/directx.cmd b/src/ext/DirectX/directx.cmd index 1e1baba8..bc1068d7 100644 --- a/src/ext/DirectX/directx.cmd +++ b/src/ext/DirectX/directx.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo DirectX.wixext build %_C% diff --git a/src/ext/Firewall/firewall.cmd b/src/ext/Firewall/firewall.cmd index a735aa23..47a5edc5 100644 --- a/src/ext/Firewall/firewall.cmd +++ b/src/ext/Firewall/firewall.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Firewall.wixext build %_C% diff --git a/src/ext/Http/http.cmd b/src/ext/Http/http.cmd index e1994af3..0115db8b 100644 --- a/src/ext/Http/http.cmd +++ b/src/ext/Http/http.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Http.wixext build %_C% diff --git a/src/ext/Iis/iis.cmd b/src/ext/Iis/iis.cmd index 02f9f393..b5db37ac 100644 --- a/src/ext/Iis/iis.cmd +++ b/src/ext/Iis/iis.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Iis.wixext build %_C% diff --git a/src/ext/Msmq/msmq.cmd b/src/ext/Msmq/msmq.cmd index 1a60dad3..dc85e8e9 100644 --- a/src/ext/Msmq/msmq.cmd +++ b/src/ext/Msmq/msmq.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Msmq.wixext build %_C% diff --git a/src/ext/NetFx/netfx.cmd b/src/ext/NetFx/netfx.cmd index d5e0989b..f5e3984e 100644 --- a/src/ext/NetFx/netfx.cmd +++ b/src/ext/NetFx/netfx.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Building ext\NetFx %_C% diff --git a/src/ext/PowerShell/ps.cmd b/src/ext/PowerShell/ps.cmd index 66eed1db..b5a0657b 100644 --- a/src/ext/PowerShell/ps.cmd +++ b/src/ext/PowerShell/ps.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo PowerShell.wixext build %_C% diff --git a/src/ext/Sql/sql.cmd b/src/ext/Sql/sql.cmd index 0e66816d..a18d4648 100644 --- a/src/ext/Sql/sql.cmd +++ b/src/ext/Sql/sql.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Sql.wixext build %_C% diff --git a/src/ext/UI/ui.cmd b/src/ext/UI/ui.cmd index 1b5a3a6c..b0380adc 100644 --- a/src/ext/UI/ui.cmd +++ b/src/ext/UI/ui.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Building ext\UI %_C% diff --git a/src/ext/Util/util.cmd b/src/ext/Util/util.cmd index 1b189086..3913c892 100644 --- a/src/ext/Util/util.cmd +++ b/src/ext/Util/util.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Building ext\Util %_C% using %_N% diff --git a/src/ext/VisualStudio/vs.cmd b/src/ext/VisualStudio/vs.cmd index 21a9768b..12caed8c 100644 --- a/src/ext/VisualStudio/vs.cmd +++ b/src/ext/VisualStudio/vs.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo VisualStudio.wixext build %_C% diff --git a/src/ext/ext.cmd b/src/ext/ext.cmd index 49120180..0429f542 100644 --- a/src/ext/ext.cmd +++ b/src/ext/ext.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo ext build %_C% diff --git a/src/internal/internal.cmd b/src/internal/internal.cmd index bd0e4738..da46b70a 100644 --- a/src/internal/internal.cmd +++ b/src/internal/internal.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Building internal %_C% diff --git a/src/libs/libs.cmd b/src/libs/libs.cmd index 4b3cfa09..544c4b32 100644 --- a/src/libs/libs.cmd +++ b/src/libs/libs.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Building libs %_C% using %_N% diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd index 81df9f26..8359d12a 100644 --- a/src/test/burn/test_burn.cmd +++ b/src/test/burn/test_burn.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Burn integration tests %_C% diff --git a/src/test/run_test.cmd b/src/test/run_test.cmd index ef6de9bd..c24bb8e0 100644 --- a/src/test/run_test.cmd +++ b/src/test/run_test.cmd @@ -1,15 +1 @@ -@setlocal -@pushd %~dp0 - -@set _C=Debug -:parse_args -@if /i "%1"=="release" set _C=Release& shift -@if not "%1"=="" shift & goto parse_args - -@echo Run integration tests %_C% - -@SET RuntimeTestsEnabled=true -@call burn\test_burn.cmd - -@popd -@endlocal +@call %~dp0test.cmd test %* diff --git a/src/test/test.cmd b/src/test/test.cmd index b327ba75..169b229c 100644 --- a/src/test/test.cmd +++ b/src/test/test.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @echo Build integration tests %_C% diff --git a/src/wix/wix.cmd b/src/wix/wix.cmd index 0c650688..de64ccc9 100644 --- a/src/wix/wix.cmd +++ b/src/wix/wix.cmd @@ -3,7 +3,7 @@ @set _C=Debug :parse_args -@if /i "%1"=="release" set _C=Release& shift +@if /i "%1"=="release" set _C=Release @if not "%1"=="" shift & goto parse_args @set _P_OBJ=%~dp0..\..\build\wix\obj\publish\%_C%\ -- cgit v1.2.3-55-g6feb