Allow jakarta-ant to be build into an "ANT_HOME" structure in place.

Move implicit tasks into an explicit init target


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

bootstrap.bat

@@ -1,7 +1,7 @@
 @ECHO OFF
 echo BOOTSTRAPPING ANT DISTRIBUTION
 
-set C=%CLASSPATH%;lib/projectx-tr2.jar
+set C=%CLASSPATH%;lib/xml.jar
 set SRCDIR=src\main\org\apache\tools\ant
 set TMPDIR=tmp
 

bootstrap.sh

@@ -5,7 +5,7 @@ fi
 SRCDIR=src/main/org/apache/tools/ant
 CLASSDIR=classes
 CLASSPATH=${CLASSPATH}:${JAVA_HOME}/lib/classes.zip:${JAVA_HOME}/lib/tools.jar
-CLASSPATH=${CLASSPATH}:lib/projectx-tr2.jar:src:${CLASSDIR}
+CLASSPATH=${CLASSPATH}:lib/xml.jar:src:${CLASSDIR}
 
 mkdir -p ${CLASSDIR}
 

build.bat

@@ -1,3 +1,3 @@
 @echo off
 REM convience bat file to build with
-java -classpath "%CLASSPATH%;lib\ant.jar;lib\projectx-tr2.jar" org.apache.tools.ant.Main %1 %2 %3 %4 %5
+java -classpath "%CLASSPATH%;lib\ant.jar;lib\xml.jar" org.apache.tools.ant.Main %1 %2 %3 %4 %5

build.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-ADDL_CLASSPATH=./lib/ant.jar:./lib/projectx-tr2.jar
+ADDL_CLASSPATH=./lib/ant.jar:./lib/xml.jar
 
 if [ "$CLASSPATH" != "" ] ; then
   CLASSPATH=$CLASSPATH:$ADDL_CLASSPATH

build.xml

@@ -2,16 +2,18 @@
 
 <project name="Ant" default="main" basedir=".">
 
-  <property name="src.dir" value="src/main"/>
-  <property name="build.dir" value="build"/>
-  <property name="dist.dir" value="${user.home}/opt"/>
+  <target name="init">
+    <property name="src.dir" value="src/main"/>
+    <property name="build.dir" value="build"/>
+    <property name="dist.dir" value="${user.home}/opt"/>
 
-  <property name="classpath" value="lib/projectx-tr2.jar"/>
-  <property name="manifest" value="src/etc/manifest"/>
+    <property name="classpath" value="lib/xml.jar"/>
+    <property name="manifest" value="src/etc/manifest"/>
   
-  <property name="build.compiler" value="classic"/>
+    <property name="build.compiler" value="classic"/>
+  </target>
 
-  <target name="main">
+  <target name="main" depends="init">
     <mkdir dir="${build.dir}"/>
     <javac srcdir="${src.dir}" destdir="${build.dir}" classpath="${classpath}"
            debug="on" deprecation="on"/>
@@ -21,13 +23,20 @@
      <jar jarfile="lib/ant.jar" basedir="${build.dir}" items="org" manifest="${manifest}"/>
   </target>
 
+  <target name="home" depends="jar">
+     <mkdir dir="bin"/>
+     <copydir src="src/bin" dest="bin"/>
+     <chmod perm="+x" src="${dist.dir}/ant/bin/ant"/>
+     <chmod perm="+x" src="${dist.dir}/ant/bin/antRun"/>
+  </target>
+
   <target name="dist" depends="main">
      <mkdir dir="${dist.dir}/ant"/>
      <mkdir dir="${dist.dir}/ant/lib"/>
      <mkdir dir="${dist.dir}/ant/bin"/>
      <mkdir dir="${dist.dir}/ant/docs"/>
      <jar jarfile="${dist.dir}/ant/lib/ant.jar" basedir="${build.dir}" items="org" manifest="${manifest}"/>
-     <copyfile src="lib/projectx-tr2.jar" dest="${dist.dir}/ant/lib/xml.jar"/>
+     <copyfile src="lib/xml.jar" dest="${dist.dir}/ant/lib/xml.jar"/>
      <copyfile src="build.xml" dest="${dist.dir}/ant/lib/build.xml"/>
      <copydir src="src/bin" dest="${dist.dir}/ant/bin"/>
      <copydir src="docs" dest="${dist.dir}/ant/docs"/>
@@ -35,13 +44,14 @@
      <chmod perm="+x" src="${dist.dir}/ant/bin/antRun"/>
   </target>
 
-  <target name="clean">
+  <target name="clean" depends="init">
     <deltree dir="${build.dir}"/>
+    <deltree dir="bin"/>
   </target>
 
   <!-- in progress !  -->
 
-  <target name="get.snapshot">
+  <target name="get.snapshot" depends="init">
     <get src="http://jakarta.apache.org/build/tmp/ant/ant.src.zip" dest="ant-src.zip" />
     <expand src="ant-src.zip" dest="." />
   </target>