romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-30 16:48:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

build-openssl.bat: Fixed incorrect move if destination build folder exists

Browse source
This commit is contained in:
Steve Holme 2018-02-08 21:22:59 +00:00
parent a64b002e3a
commit 648679ab8e
1 changed files with 50 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

60
projects/build-openssl.bat
View file

@ -219,8 +219,18 @@ rem ***************************************************************************
nmake -f ms\ntdll.mak nmake -f ms\ntdll.mak
rem Move the output directories rem Move the output directories
move out32.dbg "%OUTDIR%\LIB Debug" if exist "%OUTDIR%\LIB Debug" (
move out32dll.dbg "%OUTDIR%\DLL Debug" copy /y out32.dbg\* "%OUTDIR%\LIB Debug"
rd out32.dbg /s /q
) else (
move out32.dbg "%OUTDIR%\LIB Debug"
)
if exist "%OUTDIR%\DLL Debug" (
copy /y out32dll.dbg\* "%OUTDIR%\DLL Debug"
rd out32dll.dbg /s /q
) else (
move out32dll.dbg "%OUTDIR%\DLL Debug"
)
rem Move the PDB files rem Move the PDB files
move tmp32.dbg\lib.pdb "%OUTDIR%\LIB Debug" move tmp32.dbg\lib.pdb "%OUTDIR%\LIB Debug"
@ -240,10 +250,20 @@ rem ***************************************************************************
call ms\do_win64a call ms\do_win64a
nmake -f ms\nt.mak nmake -f ms\nt.mak
nmake -f ms\ntdll.mak nmake -f ms\ntdll.mak
rem Move the output directories rem Move the output directories
move out32 "%OUTDIR%\LIB Release" if exist "%OUTDIR%\LIB Release" (
move out32dll "%OUTDIR%\DLL Release" copy /y out32\* "%OUTDIR%\LIB Release"
rd out32 /s /q
) else (
move out32 "%OUTDIR%\LIB Release"
)
if exist "%OUTDIR%\DLL Release" (
copy /y out32dll\* "%OUTDIR%\DLL Release"
rd out32dll /s /q
) else (
move out32dll "%OUTDIR%\DLL Release"
)
rem Move the PDB files rem Move the PDB files
move tmp32\lib.pdb "%OUTDIR%\LIB Release" move tmp32\lib.pdb "%OUTDIR%\LIB Release"
@ -272,8 +292,18 @@ rem ***************************************************************************
nmake -f ms\ntdll.mak nmake -f ms\ntdll.mak
rem Move the output directories rem Move the output directories
move out32.dbg "%OUTDIR%\LIB Debug" if exist "%OUTDIR%\LIB Debug" (
move out32dll.dbg "%OUTDIR%\DLL Debug" copy /y out32.dbg\* "%OUTDIR%\LIB Debug"
rd out32.dbg /s /q
) else (
move out32.dbg "%OUTDIR%\LIB Debug"
)
if exist "%OUTDIR%\DLL Debug" (
copy /y out32dll.dbg\* "%OUTDIR%\DLL Debug"
rd out32dll.dbg /s /q
) else (
move out32dll.dbg "%OUTDIR%\DLL Debug"
)
rem Move the PDB files rem Move the PDB files
move tmp32.dbg\lib.pdb "%OUTDIR%\LIB Debug" move tmp32.dbg\lib.pdb "%OUTDIR%\LIB Debug"
@ -293,10 +323,20 @@ rem ***************************************************************************
call ms\do_ms call ms\do_ms
nmake -f ms\nt.mak nmake -f ms\nt.mak
nmake -f ms\ntdll.mak nmake -f ms\ntdll.mak
rem Move the output directories rem Move the output directories
move out32 "%OUTDIR%\LIB Release" if exist "%OUTDIR%\LIB Release" (
move out32dll "%OUTDIR%\DLL Release" copy /y out32\* "%OUTDIR%\LIB Release"
rd out32 /s /q
) else (
move out32 "%OUTDIR%\LIB Release"
)
if exist "%OUTDIR%\DLL Release" (
copy /y out32dll\* "%OUTDIR%\DLL Release"
rd out32dll /s /q
) else (
move out32dll "%OUTDIR%\DLL Release"
)
rem Move the PDB files rem Move the PDB files
move tmp32\lib.pdb "%OUTDIR%\LIB Release" move tmp32\lib.pdb "%OUTDIR%\LIB Release"