conor 00/07/02 09:29:43
Modified: . bootstrap.bat bootstrap.sh build.xml
Log:
Create an install target
Ant now builds ant.jar in the build area. A separate 'install' target copies
it into ant.home.
Bootstrap has been updated to perform this install step.
Revision Changes Path
1.10 +1 -0 jakarta-ant/bootstrap.bat
Index: bootstrap.bat
===================================================================
RCS file: /home/cvs/jakarta-ant/bootstrap.bat,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bootstrap.bat 2000/06/30 14:30:25 1.9
+++ bootstrap.bat 2000/07/02 16:29:40 1.10
@@ -45,6 +45,7 @@
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
echo.
echo ... Cleaning Up Build Directories
1.12 +1 -0 jakarta-ant/bootstrap.sh
Index: bootstrap.sh
===================================================================
RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bootstrap.sh 2000/06/30 14:30:26 1.11
+++ bootstrap.sh 2000/07/02 16:29:40 1.12
@@ -21,6 +21,7 @@
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
if test ! -d bin; then mkdir bin; fi
1.27 +11 -2 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- build.xml 2000/06/29 15:27:56 1.26
+++ build.xml 2000/07/02 16:29:40 1.27
@@ -11,12 +11,12 @@
<property name="version" value="1.0-rc1"/>
<property name="ant.home" value="."/>
- <property name="bin.dir" value="bin"/>
<property name="src.bin.dir" value="src/bin"/>
<property name="src.dir" value="src/main"/>
- <property name="lib.dir" value="lib"/>
<property name="docs.dir" value="docs"/>
<property name="build.dir" value="../build/ant"/>
+ <property name="lib.dir" value="${build.dir}/lib"/>
+ <property name="bin.dir" value="${build.dir}/bin"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.javadocs" value="${build.dir}/javadocs"/>
<property name="ant.dist.dir" value="../dist/ant"/>
@@ -168,6 +168,15 @@
<tar tarfile="${Name}-${version}.tar" basedir="${ant.dist.dir}"
includes="**"/>
<gzip zipfile="${Name}-${version}.tar.gz" src="${Name}-${version}.tar"/>
</target>
+
+ <!-- ===================================================================
-->
+ <!-- Installs the ant.jar library and binary files into ant.home
-->
+ <!-- ===================================================================
-->
+ <target name="install" depends="main">
+ <echo message="installing into ${ant.home}"/>
+ <copydir src="${lib.dir}" dest="${ant.home}/lib"/>
+ <copydir src="${bin.dir}" dest="${ant.home}/bin"/>
+ </target>
<!-- ===================================================================
-->
<!-- Cleans up generated stuff
-->
