Update to new build scripts

Correct version string
call bootstrap.bat
Introduce an install-lite target
Move building of distributions files out of dist target


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

WHATSNEW

@@ -16,7 +16,7 @@ Changes that could break older environments:
 Other changes:
 --------------
 
-* A GUI Frontend: Antidote
+* A GUI Frontend: Antidote. This is currently in development.
 
 * New tasks: stylebook, propertyfile, depend, antlr, telnet, csc,
   ilasm, transform, javah, several clearcase tasks
@@ -77,6 +77,7 @@ Fixed bugs:
   CMP files are included by parsing the weblogic deployment descriptor rather 
   than relying on the naming convention used in ant 1.2
   Include super classes and super interfaces into the generated ejb jar files
+  <support> nested element allows support classes to be included in the EJB jar
 
 * <vssget> now correctly deals with spaces in arguments
 
@@ -97,6 +98,8 @@ Fixed bugs:
 * <property> and <available> will search for the resource "foo" instead
   of "/org/apache/tools/ant/taskdefs/foo" when given a relative resource
   name foo.
+  
+* Handle build files in directories whose name contained a "#" character
 
 Changes from Ant 1.1 to Ant 1.2
 ===============================

build.bat

@@ -1,8 +1,10 @@
 @echo off
 
+set _CP=CLASSPATH
+
 if exist build\classes\org\apache\tools\ant\Main.class goto doBuild
 
-bootstrap.bat %1 %2 %3 %4 %5 %6 %7 %8
+call bootstrap.bat %1 %2 %3 %4 %5 %6 %7 %8
 
 :doBuild
 
@@ -33,11 +35,11 @@ echo.
 
 :runAnt
 set NEW_ANT_HOME=%ANT_HOME%
-if "x%ANT_HOME%" == "x" set NEW_ANT_HOME=dist
+if "%ANT_HOME%" == "" set NEW_ANT_HOME=dist
 set CLASSPATH=%LOCALCLASSPATH%
 set LOCALCLASSPATH=
 %_JAVACMD% -classpath %CLASSPATH% %ANT_OPTS% org.apache.tools.ant.Main "-Dant.home=%NEW_ANT_HOME%" -logger org.apache.tools.ant.NoBannerLogger -emacs %1 %2 %3 %4 %5 %6 %7 %8
 
-set CLASSPATH=
+set CLASSPATH=%_CP%
 set NEW_ANT_HOME=
 set _JAVACMD=

build.xml

@@ -357,6 +357,9 @@
 
     <chmod dir="${dist.dir}" perm="go-rwx" />
 
+  </target>
+
+  <target name="bin-dist" depends="dist">
     <zip zipfile="${dist.base}/${dist.name}-bin.zip" 
          basedir="${dist.dir}/.." 
          includes="${dist.dir}/**"/>
@@ -443,18 +446,23 @@
       <param name="src.dist.dir" value="${dist.name}" />
     </antcall>
 
-    <antcall target="dist">
+    <antcall target="bin-dist">
       <param name="dist.dir" value="${dist.name}" />
     </antcall>
     <delete dir="${dist.name}" />
   </target> 
 
   <target name="install">
-    <antcall target="dist-lite">
+    <antcall target="dist">
       <param name="dist.dir" value="${ant.home}" />
     </antcall>
   </target>
 
+  <target name="install-lite">
+    <antcall target="dist-lite">
+      <param name="dist.dir" value="${ant.home}" />
+    </antcall>
+  </target>
   <!--
        ===================================================================
                  Cleans up build and distribution directories

src/main/org/apache/tools/ant/Main.java

@@ -75,7 +75,7 @@ public class Main {
     public final static String VERSION             = "@VERSION@";
     public final static String DATE                = "@DATE@";
     public final static String BANNER              = 
-        "Ant version " + DATE + " compiled on " + DATE;
+        "Ant version " + VERSION + " compiled on " + DATE;
 
     /** The default build file name */
     public static final String DEFAULT_BUILD_FILENAME = "build.xml";