diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2019-04-06 20:00:21 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2019-04-08 22:36:22 +0100 |
| commit | 089e2d9de0d278e32ab41822072e9a3d9d54e6bc (patch) | |
| tree | e74d13f1bf0e3d2d9900f66015fd8369c226b67f | |
| parent | 89efe0e396fac9f495c3aa1a90a5d4c1fae90e65 (diff) | |
| download | curl-089e2d9de0d278e32ab41822072e9a3d9d54e6bc.tar.gz | |
build-openssl.bat: Split the install of static and shared build types
| -rw-r--r-- | projects/build-openssl.bat | 106 |
1 files changed, 65 insertions, 41 deletions
diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat index b16887296..5f849dd7d 100644 --- a/projects/build-openssl.bat +++ b/projects/build-openssl.bat @@ -244,7 +244,8 @@ rem *************************************************************************** call :build x64 shared rem Perform the install - call :install debug + call :install debug static + call :install debug shared if "%BUILD_CONFIG%" == "debug" goto success @@ -257,7 +258,8 @@ rem *************************************************************************** call :build x64 shared rem Perform the install - call :install release + call :install release static + call :install release shared goto success @@ -277,7 +279,8 @@ rem *************************************************************************** call :build x86 shared rem Perform the install - call :install debug + call :install debug static + call :install debug shared if "%BUILD_CONFIG%" == "debug" goto success @@ -290,7 +293,8 @@ rem *************************************************************************** call :build x86 shared rem Perform the install - call :install release + call :install release static + call :install release shared goto success @@ -366,57 +370,77 @@ rem rem Main installation function. rem rem %1 - Configuration (release or debug) +rem %2 - Build Type (static or shared) rem :install setlocal if "%1" == "" exit /B 1 + if "%2" == "" exit /B 1 rem Copy the generated files to our directory structure if "%1" == "debug" ( - rem Move the output directories - if exist "%OUTDIR%\LIB Debug" ( - copy /y out32.dbg\* "%OUTDIR%\LIB Debug" 1>nul - rd out32.dbg /s /q - ) else ( - move out32.dbg "%OUTDIR%\LIB Debug" 1>nul - ) - if exist "%OUTDIR%\DLL Debug" ( - copy /y out32dll.dbg\* "%OUTDIR%\DLL Debug" 1>nul - rd out32dll.dbg /s /q - ) else ( - move out32dll.dbg "%OUTDIR%\DLL Debug" 1>nul - ) + if "%2" == "static" ( + rem Move the output directories + if exist "%OUTDIR%\LIB Debug" ( + copy /y out32.dbg\* "%OUTDIR%\LIB Debug" 1>nul + rd out32.dbg /s /q + ) else ( + move out32.dbg "%OUTDIR%\LIB Debug" 1>nul + ) - rem Move the PDB files - move tmp32.dbg\lib.pdb "%OUTDIR%\LIB Debug" 1>nul - move tmp32dll.dbg\lib.pdb "%OUTDIR%\DLL Debug" 1>nul + rem Move the PDB files + move tmp32.dbg\lib.pdb "%OUTDIR%\LIB Debug" 1>nul - rem Remove the intermediate directories - rd tmp32.dbg /s /q - rd tmp32dll.dbg /s /q - ) else if "%1" == "release" ( - rem Move the output directories - if exist "%OUTDIR%\LIB Release" ( - copy /y out32\* "%OUTDIR%\LIB Release" 1>nul - rd out32 /s /q - ) else ( - move out32 "%OUTDIR%\LIB Release" 1>nul - ) - if exist "%OUTDIR%\DLL Release" ( - copy /y out32dll\* "%OUTDIR%\DLL Release" 1>nul - rd out32dll /s /q + rem Remove the intermediate directories + rd tmp32.dbg /s /q + ) else if "%2" == "shared" ( + if exist "%OUTDIR%\DLL Debug" ( + copy /y out32dll.dbg\* "%OUTDIR%\DLL Debug" 1>nul + rd out32dll.dbg /s /q + ) else ( + move out32dll.dbg "%OUTDIR%\DLL Debug" 1>nul + ) + + rem Move the PDB files + move tmp32dll.dbg\lib.pdb "%OUTDIR%\DLL Debug" 1>nul + + rem Remove the intermediate directories + rd tmp32dll.dbg /s /q ) else ( - move out32dll "%OUTDIR%\DLL Release" 1>nul + exit /B 1 ) + ) else if "%1" == "release" ( + if "%2" == "static" ( + rem Move the output directories + if exist "%OUTDIR%\LIB Release" ( + copy /y out32\* "%OUTDIR%\LIB Release" 1>nul + rd out32 /s /q + ) else ( + move out32 "%OUTDIR%\LIB Release" 1>nul + ) - rem Move the PDB files - move tmp32\lib.pdb "%OUTDIR%\LIB Release" 1>nul - move tmp32dll\lib.pdb "%OUTDIR%\DLL Release" 1>nul + rem Move the PDB files + move tmp32\lib.pdb "%OUTDIR%\LIB Release" 1>nul - rem Remove the intermediate directories - rd tmp32 /s /q - rd tmp32dll /s /q + rem Remove the intermediate directories + rd tmp32 /s /q + ) else if "%2" == "shared" ( + if exist "%OUTDIR%\DLL Release" ( + copy /y out32dll\* "%OUTDIR%\DLL Release" 1>nul + rd out32dll /s /q + ) else ( + move out32dll "%OUTDIR%\DLL Release" 1>nul + ) + + rem Move the PDB files + move tmp32dll\lib.pdb "%OUTDIR%\DLL Release" 1>nul + + rem Remove the intermediate directories + rd tmp32dll /s /q + ) else ( + exit /B 1 + ) ) exit /B 0 |