From d977d4b58f8e6e323060aeb695e45749822187d4 Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Sun, 2 Jul 2000 16:29:40 +0000
Subject: [PATCH] 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.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@267724 13f79535-47bb-0310-9956-ffa450edef68
---
 bootstrap.bat |  1 +
 bootstrap.sh  |  1 +
 build.xml     | 13 +++++++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/bootstrap.bat b/bootstrap.bat
index 8b7b6aa57..0424f6bfc 100755
--- a/bootstrap.bat
+++ b/bootstrap.bat
@@ -45,6 +45,7 @@ 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
 
 echo.
 echo ... Cleaning Up Build Directories
diff --git a/bootstrap.sh b/bootstrap.sh
index e3fcfe97f..ceff20424 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -21,6 +21,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 
 
 if test ! -d bin; then mkdir bin; fi
diff --git a/build.xml b/build.xml
index 345044bf7..d411d3504 100644
--- a/build.xml
+++ b/build.xml
@@ -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"/>
@@ -169,6 +169,15 @@
     <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                                           -->
   <!-- =================================================================== -->