From 6d71acb4d90b9338f305057563e982759534a07f Mon Sep 17 00:00:00 2001 From: Jaikiran Pai Date: Mon, 29 Nov 2021 09:21:38 +0530 Subject: [PATCH] don't rely on deltree command - prevent any build failures on CI where that command is not present --- bootstrap.bat | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/bootstrap.bat b/bootstrap.bat index 6cec0290e..1d79958d2 100755 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -34,10 +34,8 @@ if "" == "%JAVAC%" set JAVAC=%JAVA_HOME%\bin\javac echo. echo ... Bootstrapping Ant Distribution -if "%OS%" == "Windows_NT" if exist bootstrap\nul rmdir/s/q bootstrap -if not "%OS%" == "Windows_NT" if exist bootstrap\nul deltree/y bootstrap -if "%OS%" == "Windows_NT" if exist build\nul rmdir/s/q build -if not "%OS%" == "Windows_NT" if exist build\nul deltree/y build +if exist bootstrap\nul rmdir/s/q bootstrap +if exist build\nul rmdir/s/q build SET LOCALCLASSPATH= for %%i in (lib\optional\*.jar) do call src\script\lcp.bat %%i @@ -55,8 +53,7 @@ echo JAVAC=%JAVAC% echo CLASSPATH=%CLASSPATH% echo ANT_HOME=%ANT_HOME% -if "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul rmdir/s/q %CLASSDIR% -if not "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul deltree/y %CLASSDIR% +if exist %CLASSDIR%\nul rmdir/s/q %CLASSDIR% if not exist build\nul mkdir build if not exist build\classes\nul mkdir build\classes @@ -131,8 +128,7 @@ if not "%OS%"=="Windows_NT" goto mainEnd echo. echo ... Cleaning Up Build Directories -if "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul rmdir/s/q %CLASSDIR% -if not "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul deltree/y %CLASSDIR% +if exist %CLASSDIR%\nul rmdir/s/q %CLASSDIR% echo. echo ... Done Bootstrapping Ant Distribution