bodewig 00/10/17 04:00:39
Modified: . WHATSNEW bootstrap.sh
Log:
Changed bootstrap.sh so that you can specify the compiler to use via
the JAVAC environment variable. This enables a bootstrap process using
jikes.
Submitted by: GOMEZ Henri <[EMAIL PROTECTED]>
Added a warning about the changed behavior of <delete dir> to WHATSNEW.
Revision Changes Path
1.34 +4 -0 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- WHATSNEW 2000/10/16 07:23:52 1.33
+++ WHATSNEW 2000/10/17 11:00:38 1.34
@@ -48,6 +48,10 @@
name attribute to be a single pattern, they don't accept multiple
patterns anymore. Split them into multiple elements of the same type.
+* <delete dir="somedir" /> will now delete the directory itself as
+well as all included files. If you just want to clean out the
+directory and keep the empty one, use a nested fileset.
+
Other changes:
--------------
1.23 +9 -5 jakarta-ant/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- bootstrap.sh 2000/09/08 15:40:38 1.22
+++ bootstrap.sh 2000/10/17 11:00:38 1.23
@@ -5,6 +5,10 @@
ANT_HOME=.
export ANT_HOME
+if [ -z "$JAVAC" ] ; then
+ JAVAC=javac;
+fi
+
echo ... Bootstrapping Ant Distribution
if test -f lib/ant.jar ; then
@@ -44,10 +48,10 @@
echo ... Compiling Ant Classes
-javac -d ${CLASSDIR} ${TOOLS}/tar/*.java
-javac -d ${CLASSDIR} ${TOOLS}/ant/types/*.java
-javac -d ${CLASSDIR} ${TOOLS}/ant/*.java
-javac -d ${CLASSDIR} ${TOOLS}/ant/taskdefs/*.java
+${JAVAC} -d ${CLASSDIR} ${TOOLS}/tar/*.java
+${JAVAC} -d ${CLASSDIR} ${TOOLS}/ant/types/*.java
+${JAVAC} -d ${CLASSDIR} ${TOOLS}/ant/*.java
+${JAVAC} -d ${CLASSDIR} ${TOOLS}/ant/taskdefs/*.java
echo ... Copying Required Files
@@ -55,7 +59,7 @@
echo ... Building Ant Distribution
-java org.apache.tools.ant.Main clean main bootstrap
+java org.apache.tools.ant.Main clean main bootstrap $JIKESON
echo ... Cleaning Up Build Directories
