Return-Path: <donaldp@apache.org>
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 28970 invoked by uid 500); 23 Jan 2001 14:06:41 -0000
Delivered-To: apmail-jakarta-ant-cvs@apache.org
Received: (qmail 28960 invoked by uid 1195); 23 Jan 2001 14:06:41 -0000
Date: 23 Jan 2001 14:06:41 -0000
Message-ID: <20010123140641.28957.qmail@apache.org>
From: donaldp@apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit: jakarta-ant build.xml build.sh build.bat

donaldp     01/01/23 06:06:41

  Modified:    .        build.xml build.sh build.bat
  Log:
  Fixed errors wrt
  
  * junit not being on primordial classloader.
  * ANT_HOME being overidden
  * no install target
  * no version data
  
  Revision  Changes    Path
  1.112     +10 -3     jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- build.xml	2001/01/23 08:59:35	1.111
  +++ build.xml	2001/01/23 14:06:40	1.112
  @@ -193,10 +193,10 @@
         <fileset dir="${java.dir}"/>
       </copy>
   
  -    <replace file="${build.src}/org/apache/tools/ant/version.txt" 
  +    <replace file="${build.src}/org/apache/tools/ant/Main.java" 
                token="@VERSION@" 
                value="${version}"/>
  -    <replace file="${build.src}/org/apache/tools/ant/version.txt" 
  +    <replace file="${build.src}/org/apache/tools/ant/Main.java" 
                token="@DATE@"
                value="${date}"/>
       <replace file="${build.src}/org/apache/tools/ant/defaultManifest.mf" 
  @@ -446,6 +446,12 @@
       <delete dir="${dist.name}" />
     </target> 
   
  +  <target name="install">
  +    <antcall target="dist-lite">
  +      <param name="dist.dir" value="${ant.home}" />
  +    </antcall>
  +  </target>
  +
     <!--
          ===================================================================
                    Cleans up build and distribution directories
  @@ -509,6 +515,7 @@
          =================================================================== 
     -->
     <target name="run-tests" depends="compile-tests, define-junit" if="junit.present">
  +
       <junit printsummary="no" haltonfailure="yes" fork="${junit.fork}">
         <jvmarg value="-classic"/>
         <classpath refid="tests-classpath"/>
  @@ -547,7 +554,7 @@
       <delete file="${tests.dir}/taskdefs/tmp.jar" />
     </target>
   
  -  <target name="run-single-test" if="testcase, define-junit" depends="compile-tests">
  +  <target name="run-single-test" if="testcase" depends="compile-tests, define-junit">
   
       <junit printsummary="no" haltonfailure="yes" fork="${junit.fork}">
         <jvmarg value="-classic"/>
  
  
  
  1.14      +7 -2      jakarta-ant/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.sh,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- build.sh	2001/01/23 08:44:46	1.13
  +++ build.sh	2001/01/23 14:06:40	1.14
  @@ -4,7 +4,6 @@
     ./bootstrap.sh $*
   fi    
   
  -
   # Cygwin support.  $cygwin _must_ be set to either true or false.
   case "`uname`" in
     CYGWIN*) cygwin=true ;;
  @@ -20,6 +19,7 @@
   fi
   
   LOCALCLASSPATH=`echo lib/*.jar | tr ' ' ':'`
  +LOCALCLASSPATH=$LOCALCLASSPATH:build/classes:lib/optional/junit.jar
   
   if [ "$CLASSPATH" != "" ] ; then
     LOCALCLASSPATH=$CLASSPATH:$LOCALCLASSPATH
  @@ -50,7 +50,12 @@
   if $cygwin; then
     LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
   fi
  +
  +NEW_ANT_HOME=$ANT_HOME
  +if [ "$NEW_ANT_HOME" == "" ] ; then
  +  NEW_ANT_HOME=dist
  +fi
   
  -${JAVA_HOME}/bin/java -classpath $LOCALCLASSPATH org.apache.tools.ant.Main -logger org.apache.tools.ant.NoBannerLogger -emacs $*
  +${JAVA_HOME}/bin/java -classpath $LOCALCLASSPATH org.apache.tools.ant.Main -Dant.home=$NEW_ANT_HOME -logger org.apache.tools.ant.NoBannerLogger -emacs $*
   
   
  
  
  
  1.17      +5 -5      jakarta-ant/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.bat,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build.bat	2001/01/23 08:44:46	1.16
  +++ build.bat	2001/01/23 14:06:40	1.17
  @@ -12,11 +12,9 @@
   
   rem exit
   
  -set LOCALCLASSPATH=build\classes
  +set LOCALCLASSPATH=lib\optional\junit.jar;build\classes
   for %%i in (lib\*.jar) do call src\script\lcp.bat %%i
   
  -set ANT_HOME=.
  -
   if "%JAVA_HOME%" == "" goto noJavaHome
   if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java
   if exist "%JAVA_HOME%\lib\tools.jar" call src\script\lcp.bat "%JAVA_HOME%\lib\tools.jar"
  @@ -33,9 +31,11 @@
   echo.
   
   :runAnt
  +set NEW_ANT_HOME=%ANT_HOME%
  +if "x%ANT_HOME%" == "x" set NEW_ANT_HOME=dist
   set CLASSPATH=%LOCALCLASSPATH%
   set LOCALCLASSPATH=
  -%_JAVACMD% -classpath %CLASSPATH% %ANT_OPTS% org.apache.tools.ant.Main -logger org.apache.tools.ant.NoBannerLogger -emacs %1 %2 %3 %4 %5 %6 %7 %8
  +%_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 ANT_HOME=
   set CLASSPATH=
  +set NEW_ANT_HOME=
  \ No newline at end of file