From eac9c2d1b2a31a45a4bff75d0d93a68f1dd0596a Mon Sep 17 00:00:00 2001 From: Conor MacNeill Date: Sun, 4 Feb 2001 11:46:23 +0000 Subject: [PATCH] Copy - which is to save compiling files which have already been compiled now goes to the right place. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268578 13f79535-47bb-0310-9956-ffa450edef68 --- bootstrap.bat | 3 ++- bootstrap.sh | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bootstrap.bat b/bootstrap.bat index d20125972..d40625542 100755 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -41,6 +41,7 @@ if not "%OS%" == "Windows_NT" if exist %CLASSDIR%\nul deltree/y %CLASSDIR% if not exist %CLASSDIR% mkdir %CLASSDIR% if not exist build mkdir build +if not exist build\classes mkdir build\classes echo. echo ... Compiling Ant Classes @@ -56,7 +57,7 @@ copy %TOOLS%\ant\types\*.properties %CLASSDIR%\org\apache\tools\ant\types echo. echo ... Building Ant Distribution -xcopy /s/q %CLASSDIR% build +xcopy /s/q %CLASSDIR% build\classes %JAVA% %ANT_OPTS% org.apache.tools.ant.Main bootstrap diff --git a/bootstrap.sh b/bootstrap.sh index 276769811..04fc49c87 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -58,7 +58,7 @@ fi export CLASSPATH mkdir -p ${CLASSDIR} -mkdir -p build +mkdir -p build/classes echo ... Compiling Ant Classes @@ -77,7 +77,7 @@ cp src/main/org/apache/tools/ant/types/defaults.properties \ echo ... Building Ant Distribution -cp -r ${CLASSDIR} build +cp -r ${CLASSDIR} build/classes ${JAVA_HOME}/bin/java -classpath ${CLASSPATH} org.apache.tools.ant.Main \ -buildfile build.xml bootstrap