Browse Source

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 <hgomez@slib.fr>

Added a warning about the changed behavior of <delete dir> to WHATSNEW.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268097 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 24 years ago
parent
commit
7548efa18e
2 changed files with 13 additions and 5 deletions
  1. +4
    -0
      WHATSNEW
  2. +9
    -5
      bootstrap.sh

+ 4
- 0
WHATSNEW View File

@@ -48,6 +48,10 @@ instance of this class are going to fail.
name attribute to be a single pattern, they don't accept multiple name attribute to be a single pattern, they don't accept multiple
patterns anymore. Split them into multiple elements of the same type. 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: Other changes:
-------------- --------------




+ 9
- 5
bootstrap.sh View File

@@ -5,6 +5,10 @@
ANT_HOME=. ANT_HOME=.
export ANT_HOME export ANT_HOME


if [ -z "$JAVAC" ] ; then
JAVAC=javac;
fi

echo ... Bootstrapping Ant Distribution echo ... Bootstrapping Ant Distribution


if test -f lib/ant.jar ; then if test -f lib/ant.jar ; then
@@ -44,10 +48,10 @@ mkdir -p ${CLASSDIR}


echo ... Compiling Ant Classes 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 echo ... Copying Required Files


@@ -55,7 +59,7 @@ cp src/main/org/apache/tools/ant/taskdefs/defaults.properties ${CLASSDIR}/org/ap


echo ... Building Ant Distribution 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 echo ... Cleaning Up Build Directories




Loading…
Cancel
Save