Commit b1923b90 authored by Steve Holme's avatar Steve Holme
Browse files

build-openssl.bat: Perfer the use of if statements rather than goto (where possible)

parent a4df3429

projects/build-openssl.bat

+137 −141
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@ rem *************************************************************************** 
  )



:parseArgs

  if "%~1" == "" goto prerequisites



  if not "%~1" == "" (

    if /i "%~1" == "vc6" (

      set VC_VER=6.0

      set VC_DESC=VC6
@@ -137,6 +136,7 @@ rem *************************************************************************** 
    )



    shift & goto parseArgs

  )



:prerequisites

  rem Compiler is a required parameter
@@ -233,9 +233,7 @@ rem *************************************************************************** 
  set OUTDIR=build\Win64\%VC_DESC%

  if not exist %OUTDIR% md %OUTDIR%



  if "%BUILD_CONFIG%" == "release" goto x64release



:x64debug

  if not "%BUILD_CONFIG%" == "release" (

    rem Configuring 64-bit Debug Build

    call :configure x64 debug
@@ -250,10 +248,9 @@ rem *************************************************************************** 


    rem Perform the shared library install

    call :install debug shared

  )



  if "%BUILD_CONFIG%" == "debug" goto success



:x64release

  if not "%BUILD_CONFIG%" == "debug" (

    rem Configuring 64-bit Release Build

    call :configure x64 release
@@ -268,6 +265,7 @@ rem *************************************************************************** 


    rem Perform the shared library install

    call :install release shared

  )



  goto success
@@ -276,9 +274,7 @@ rem *************************************************************************** 
  set OUTDIR=build\Win32\%VC_DESC%

  if not exist %OUTDIR% md %OUTDIR%



  if "%BUILD_CONFIG%" == "release" goto x86release



:x86debug

  if not "%BUILD_CONFIG%" == "release" (

    rem Configuring 32-bit Debug Build

    call :configure x86 debug
@@ -293,10 +289,9 @@ rem *************************************************************************** 


    rem Perform the shared library install

    call :install debug shared

  )



  if "%BUILD_CONFIG%" == "debug" goto success



:x86release

  if not "%BUILD_CONFIG%" == "debug" (

    rem Configuring 32-bit Release Build

    call :configure x86 release
@@ -311,6 +306,7 @@ rem *************************************************************************** 


    rem Perform the shared library install

    call :install release shared

  )



  goto success