Commit 648679ab authored by Steve Holme's avatar Steve Holme
Browse files

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

parent a64b002e

projects/build-openssl.bat

+50 −10
Original line number Diff line number Diff line
@@ -219,8 +219,18 @@ rem *************************************************************************** 
  nmake -f ms\ntdll.mak



  rem Move the output directories

  if exist "%OUTDIR%\LIB 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

  move tmp32.dbg\lib.pdb "%OUTDIR%\LIB Debug"
@@ -242,8 +252,18 @@ rem *************************************************************************** 
  nmake -f ms\ntdll.mak



  rem Move the output directories

  if exist "%OUTDIR%\LIB 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

  move tmp32\lib.pdb "%OUTDIR%\LIB Release"
@@ -272,8 +292,18 @@ rem *************************************************************************** 
  nmake -f ms\ntdll.mak



  rem Move the output directories

  if exist "%OUTDIR%\LIB 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

  move tmp32.dbg\lib.pdb "%OUTDIR%\LIB Debug"
@@ -295,8 +325,18 @@ rem *************************************************************************** 
  nmake -f ms\ntdll.mak



  rem Move the output directories

  if exist "%OUTDIR%\LIB 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

  move tmp32\lib.pdb "%OUTDIR%\LIB Release"