diff options
| -rw-r--r-- | buildconf.bat | 11 | ||||
| -rw-r--r-- | projects/build-openssl.bat | 13 | ||||
| -rw-r--r-- | projects/build-wolfssl.bat | 11 | ||||
| -rw-r--r-- | projects/checksrc.bat | 12 | ||||
| -rw-r--r-- | projects/generate.bat | 11 |
5 files changed, 35 insertions, 23 deletions
diff --git a/buildconf.bat b/buildconf.bat index 694737a94..b5f68d6d7 100644 --- a/buildconf.bat +++ b/buildconf.bat @@ -30,11 +30,6 @@ rem This file is not included or required for curl's release archives or daily rem snapshot archives. :begin - rem Display the help - if /i "%~1" == "-?" goto syntax - if /i "%~1" == "-h" goto syntax - if /i "%~1" == "-help" goto syntax - rem Switch to this batch file's directory cd /d "%~0\.." 1>NUL 2>&1 @@ -50,6 +45,12 @@ rem snapshot archives. if /i "%~1" == "-clean" ( set MODE=CLEAN + ) else if /i "%~1" == "-?" ( + goto syntax + ) else if /i "%~1" == "-h" ( + goto syntax + ) else if /i "%~1" == "-help" ( + goto syntax ) else ( goto unknown ) diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat index 409c5da38..e2bcf751e 100644 --- a/projects/build-openssl.bat +++ b/projects/build-openssl.bat @@ -27,12 +27,9 @@ rem *************************************************************************** setlocal set VC_VER= set BUILD_PLATFORM= - - rem Display the help + + rem Ensure we have the required arguments if /i "%~1" == "" goto syntax - if /i "%~1" == "-?" goto syntax - if /i "%~1" == "-h" goto syntax - if /i "%~1" == "-help" goto syntax :parseArgs if "%~1" == "" goto prerequisites @@ -81,6 +78,12 @@ rem *************************************************************************** set BUILD_CONFIG=debug ) else if /i "%~1%" == "release" ( set BUILD_CONFIG=release + ) else if /i "%~1" == "-?" ( + goto syntax + ) else if /i "%~1" == "-h" ( + goto syntax + ) else if /i "%~1" == "-help" ( + goto syntax ) else ( if not defined START_DIR ( set START_DIR=%~1% diff --git a/projects/build-wolfssl.bat b/projects/build-wolfssl.bat index 53188e853..ad755e937 100644 --- a/projects/build-wolfssl.bat +++ b/projects/build-wolfssl.bat @@ -30,11 +30,8 @@ rem *************************************************************************** set VC_VER= set BUILD_PLATFORM= - rem Display the help + rem Ensure we have the required arguments if /i "%~1" == "" goto syntax - if /i "%~1" == "-?" goto syntax - if /i "%~1" == "-h" goto syntax - if /i "%~1" == "-help" goto syntax :parseArgs if "%~1" == "" goto prerequisites @@ -67,6 +64,12 @@ rem *************************************************************************** set BUILD_CONFIG=debug ) else if /i "%~1" == "release" ( set BUILD_CONFIG=release + ) else if /i "%~1" == "-?" ( + goto syntax + ) else if /i "%~1" == "-h" ( + goto syntax + ) else if /i "%~1" == "-help" ( + goto syntax ) else ( if not defined START_DIR ( set START_DIR=%~1 diff --git a/projects/checksrc.bat b/projects/checksrc.bat index 8a2f63af2..37dc808a9 100644 --- a/projects/checksrc.bat +++ b/projects/checksrc.bat @@ -26,10 +26,14 @@ rem *************************************************************************** if not "%OS%" == "Windows_NT" goto nodos setlocal - rem Display the help - if /i "%~1" == "-?" goto syntax - if /i "%~1" == "-h" goto syntax - if /i "%~1" == "-help" goto syntax +:parseArgs + if /i "%~1" == "-?" ( + goto syntax + ) else if /i "%~1" == "-h" ( + goto syntax + ) else if /i "%~1" == "-help" ( + goto syntax + ) :prerequisites rem Check we have Perl installed diff --git a/projects/generate.bat b/projects/generate.bat index de4ff4dfb..36778e810 100644 --- a/projects/generate.bat +++ b/projects/generate.bat @@ -58,11 +58,6 @@ rem If you need to set the errorlevel do this instead: CALL :seterr [#] gzip --version <NUL 1>NUL 2>&1 if %ERRORLEVEL% equ 0 (set HAVE_GZIP=Y) else (set HAVE_GZIP=) - rem Display the help - if /i "%~1" == "-?" goto syntax - if /i "%~1" == "-h" goto syntax - if /i "%~1" == "-help" goto syntax - :parseArgs if "%~1" == "" goto start @@ -86,6 +81,12 @@ rem If you need to set the errorlevel do this instead: CALL :seterr [#] set VERSION=VC14 ) else if /i "%~1" == "-clean" ( set MODE=CLEAN + ) else if /i "%~1" == "-?" ( + goto syntax + ) else if /i "%~1" == "-h" ( + goto syntax + ) else if /i "%~1" == "-help" ( + goto syntax ) else ( goto unknown ) |