diff options
author | Rob Mensching <rob@firegiant.com> | 2021-05-16 16:00:41 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2021-05-17 01:01:59 -0700 |
commit | 91a3a42439d87a5b626e61244edcb8c8e231cc5f (patch) | |
tree | 94a5f52176cbdd7755c2bff4721a2d1e5f683799 | |
parent | 1446d4e582465af5c09db3fba16afc59529a3863 (diff) | |
download | wix-91a3a42439d87a5b626e61244edcb8c8e231cc5f.tar.gz wix-91a3a42439d87a5b626e61244edcb8c8e231cc5f.tar.bz2 wix-91a3a42439d87a5b626e61244edcb8c8e231cc5f.zip |
Fix batch file command-line parsing
-rw-r--r-- | src/api/api.cmd | 2 | ||||
-rw-r--r-- | src/build_all.cmd | 2 | ||||
-rw-r--r-- | src/burn/burn.cmd | 2 | ||||
-rw-r--r-- | src/dtf/dtf.cmd | 2 | ||||
-rw-r--r-- | src/ext/Bal/bal.cmd | 2 | ||||
-rw-r--r-- | src/ext/Dependency/dependency.cmd | 2 | ||||
-rw-r--r-- | src/ext/DifxApp/difxapp.cmd | 2 | ||||
-rw-r--r-- | src/ext/DirectX/directx.cmd | 2 | ||||
-rw-r--r-- | src/ext/Firewall/firewall.cmd | 2 | ||||
-rw-r--r-- | src/ext/Http/http.cmd | 2 | ||||
-rw-r--r-- | src/ext/Iis/iis.cmd | 2 | ||||
-rw-r--r-- | src/ext/Msmq/msmq.cmd | 2 | ||||
-rw-r--r-- | src/ext/NetFx/netfx.cmd | 2 | ||||
-rw-r--r-- | src/ext/PowerShell/ps.cmd | 2 | ||||
-rw-r--r-- | src/ext/Sql/sql.cmd | 2 | ||||
-rw-r--r-- | src/ext/UI/ui.cmd | 2 | ||||
-rw-r--r-- | src/ext/Util/util.cmd | 2 | ||||
-rw-r--r-- | src/ext/VisualStudio/vs.cmd | 2 | ||||
-rw-r--r-- | src/ext/ext.cmd | 2 | ||||
-rw-r--r-- | src/internal/internal.cmd | 2 | ||||
-rw-r--r-- | src/libs/libs.cmd | 2 | ||||
-rw-r--r-- | src/test/burn/test_burn.cmd | 2 | ||||
-rw-r--r-- | src/test/run_test.cmd | 16 | ||||
-rw-r--r-- | src/test/test.cmd | 2 | ||||
-rw-r--r-- | 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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 api %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 build %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 burn %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 dtf %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 ext\Util %_C% using %_N% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 Dependency.wixext build %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 Dependency.wixext build %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 DirectX.wixext build %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 Firewall.wixext build %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 Http.wixext build %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 Iis.wixext build %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 Msmq.wixext build %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 ext\NetFx %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 PowerShell.wixext build %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 Sql.wixext build %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 ext\UI %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 ext\Util %_C% using %_N% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 VisualStudio.wixext build %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 ext build %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 internal %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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% 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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 Burn integration tests %_C% | 9 | @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 @@ | |||
1 | @setlocal | @call %~dp0test.cmd test %* | |
2 | @pushd %~dp0 | ||
3 | |||
4 | @set _C=Debug | ||
5 | :parse_args | ||
6 | @if /i "%1"=="release" set _C=Release& shift | ||
7 | @if not "%1"=="" shift & goto parse_args | ||
8 | |||
9 | @echo Run integration tests %_C% | ||
10 | |||
11 | @SET RuntimeTestsEnabled=true | ||
12 | @call burn\test_burn.cmd | ||
13 | |||
14 | @popd | ||
15 | @endlocal | ||
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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 Build integration tests %_C% | 9 | @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 @@ | |||
3 | 3 | ||
4 | @set _C=Debug | 4 | @set _C=Debug |
5 | :parse_args | 5 | :parse_args |
6 | @if /i "%1"=="release" set _C=Release& shift | 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 | @set _P_OBJ=%~dp0..\..\build\wix\obj\publish\%_C%\ | 9 | @set _P_OBJ=%~dp0..\..\build\wix\obj\publish\%_C%\ |