Pick up jar files from the lib directory in the bootstrap process

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267741 13f79535-47bb-0310-9956-ffa450edef68

bootstrap.bat

@@ -17,8 +17,12 @@ if "" == "%JAVAC%"                        set JAVAC=%JAVA_HOME%\bin\javac
 echo.
 echo ... Bootstrapping Ant Distribution
 
-set CLASSPATH=src\main;classes;%CLASSPATH%
-if exist %JAVA_HOME%\lib\tools.jar set CLASSPATH=%CLASSPATH%;%JAVA_HOME%\lib\tools.jar
+SET LOCALCLASSPATH=classes
+if exist lib\ant.jar erase lib\ant.jar
+for %%i in (lib\*.jar) do call lcp.bat %%i
+if exist %JAVA_HOME%\lib\tools.jar call lcp.bat %JAVA_HOME%\lib\tools.jar
+if exist %JAVA_HOME%\lib\classes.zip call lcp.bat %JAVA_HOME%\lib\classes.zip
+SET CLASSPATH=%CLASSPATH%;%LOCALCLASSPATH%
 
 echo JAVA_HOME=%JAVA_HOME%
 echo JAVA=%JAVA%
@@ -44,8 +48,7 @@ copy %TOOLS%\ant\taskdefs\*.properties classes\org\apache\tools\ant\taskdefs
 echo.
 echo ... Building Ant Distribution
 
-%JAVA% org.apache.tools.ant.Main clean main %1 %2 %3 %4 %5
-%JAVA% org.apache.tools.ant.Main install %1 %2 %3 %4 %5
+%JAVA% org.apache.tools.ant.Main clean main install %1 %2 %3 %4 %5
 
 echo.
 echo ... Cleaning Up Build Directories
@@ -64,5 +67,6 @@ set CLASSPATH=%OLDCLASSPATH%
 set OLDJAVA=
 set OLDJAVAC=
 set OLDCLASSPATH=
+set LOCALCLASSPATH=
 set TOOLS=
 

bootstrap.sh

@@ -6,13 +6,36 @@ fi
 
 SRCDIR=src/main/org/apache/tools
 CLASSDIR=classes
-CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/classes.zip:${JAVA_HOME}/lib/tools.jar
-CLASSPATH=${CLASSPATH}:src/main:${CLASSDIR}
+
+if test -f lib/ant.jar ; then
+  rm lib/ant.jar
+fi
+
+LOCALCLASSPATH=`echo $ANT_HOME/lib/*.jar | tr ' ' ':'`
+
+if [ "$CLASSPATH" != "" ] ; then
+  CLASSPATH=$CLASSPATH:$LOCALCLASSPATH
+else
+  CLASSPATH=$LOCALCLASSPATH
+fi
+
+if test -f $JAVA_HOME/lib/tools.jar ; then
+  CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/tools.jar
+fi
+
+if test -f $JAVA_HOME/lib/classes.zip ; then
+  CLASSPATH=$CLASSPATH:$JAVA_HOME/lib/classes.zip
+fi
+
+CLASSPATH=${CLASSPATH}:${CLASSDIR}:src/main
 
 mkdir -p ${CLASSDIR}
 
 export CLASSPATH
-echo $CLASSPATH
+
+echo
+echo Building with classpath: $CLASSPATH
+echo
 
 javac  -d ${CLASSDIR} ${SRCDIR}/tar/*.java
 javac  -d ${CLASSDIR} ${SRCDIR}/ant/*.java
@@ -20,8 +43,7 @@ javac  -d ${CLASSDIR} ${SRCDIR}/ant/taskdefs/*.java
 
 cp src/main/org/apache/tools/ant/taskdefs/defaults.properties ${CLASSDIR}/org/apache/tools/ant/taskdefs
 
-java org.apache.tools.ant.Main clean main
-java org.apache.tools.ant.Main install
+java org.apache.tools.ant.Main clean main install
 java org.apache.tools.ant.Main clean 
 
 if test ! -d bin; then mkdir bin; fi