1
0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00

build-openssl.bat: Split the install of static and shared build types

This commit is contained in:
Steve Holme 2019-04-06 20:00:21 +01:00
parent 89efe0e396
commit 089e2d9de0

View File

@ -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,14 +370,17 @@ 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" (
if "%2" == "static" (
rem Move the output directories
if exist "%OUTDIR%\LIB Debug" (
copy /y out32.dbg\* "%OUTDIR%\LIB Debug" 1>nul
@ -381,6 +388,13 @@ rem
) else (
move out32.dbg "%OUTDIR%\LIB 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
) else if "%2" == "shared" (
if exist "%OUTDIR%\DLL Debug" (
copy /y out32dll.dbg\* "%OUTDIR%\DLL Debug" 1>nul
rd out32dll.dbg /s /q
@ -389,13 +403,15 @@ rem
)
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 Remove the intermediate directories
rd tmp32.dbg /s /q
rd tmp32dll.dbg /s /q
) else (
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
@ -403,6 +419,13 @@ rem
) else (
move out32 "%OUTDIR%\LIB 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
) else if "%2" == "shared" (
if exist "%OUTDIR%\DLL Release" (
copy /y out32dll\* "%OUTDIR%\DLL Release" 1>nul
rd out32dll /s /q
@ -411,12 +434,13 @@ rem
)
rem Move the PDB files
move tmp32\lib.pdb "%OUTDIR%\LIB Release" 1>nul
move tmp32dll\lib.pdb "%OUTDIR%\DLL Release" 1>nul
rem Remove the intermediate directories
rd tmp32 /s /q
rd tmp32dll /s /q
) else (
exit /B 1
)
)
exit /B 0