ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From co...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant Main.java
Date Wed, 24 Jan 2001 12:53:38 GMT
conor       01/01/24 04:53:38

  Modified:    .        WHATSNEW build.bat build.xml
               src/main/org/apache/tools/ant Main.java
  Log:
  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
  
  Revision  Changes    Path
  1.69      +4 -1      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- WHATSNEW	2001/01/12 14:08:50	1.68
  +++ WHATSNEW	2001/01/24 12:53:37	1.69
  @@ -16,7 +16,7 @@
   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 @@
     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 @@
   * <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
   ===============================
  
  
  
  1.20      +45 -43    jakarta-ant/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.bat,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.bat	2001/01/23 14:20:48	1.19
  +++ build.bat	2001/01/24 12:53:37	1.20
  @@ -1,43 +1,45 @@
  -@echo off
  -
  -if exist build\classes\org\apache\tools\ant\Main.class goto doBuild
  -
  -bootstrap.bat %1 %2 %3 %4 %5 %6 %7 %8
  -
  -:doBuild
  -
  -echo ----------------
  -echo Ant Build System
  -echo ----------------
  -
  -rem exit
  -
  -set LOCALCLASSPATH=lib\optional\junit.jar;build\classes
  -for %%i in (lib\*.jar) do call src\script\lcp.bat %%i
  -
  -if "%JAVA_HOME%" == "" goto noJavaHome
  -set _JAVACMD=%JAVACMD%
  -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"
  -if exist "%JAVA_HOME%\lib\classes.zip" call src\script\lcp.bat" "%JAVA_HOME%\lib\classes.zip"
  -goto runAnt
  -
  -:noJavaHome
  -if "%_JAVACMD%" == "" set _JAVACMD=java
  -echo.
  -echo Warning: JAVA_HOME environment variable is not set.
  -echo   If build fails because sun.* classes could not be found
  -echo   you will need to set the JAVA_HOME environment variable
  -echo   to the installation directory of java.
  -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 "-Dant.home=%NEW_ANT_HOME%"
-logger org.apache.tools.ant.NoBannerLogger -emacs %1 %2 %3 %4 %5 %6 %7 %8
  -
  -set CLASSPATH=
  -set NEW_ANT_HOME=
  -set _JAVACMD=
  +@echo off
  +
  +set _CP=CLASSPATH
  +
  +if exist build\classes\org\apache\tools\ant\Main.class goto doBuild
  +
  +call bootstrap.bat %1 %2 %3 %4 %5 %6 %7 %8
  +
  +:doBuild
  +
  +echo ----------------
  +echo Ant Build System
  +echo ----------------
  +
  +rem exit
  +
  +set LOCALCLASSPATH=lib\optional\junit.jar;build\classes
  +for %%i in (lib\*.jar) do call src\script\lcp.bat %%i
  +
  +if "%JAVA_HOME%" == "" goto noJavaHome
  +set _JAVACMD=%JAVACMD%
  +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"
  +if exist "%JAVA_HOME%\lib\classes.zip" call src\script\lcp.bat" "%JAVA_HOME%\lib\classes.zip"
  +goto runAnt
  +
  +:noJavaHome
  +if "%_JAVACMD%" == "" set _JAVACMD=java
  +echo.
  +echo Warning: JAVA_HOME environment variable is not set.
  +echo   If build fails because sun.* classes could not be found
  +echo   you will need to set the JAVA_HOME environment variable
  +echo   to the installation directory of java.
  +echo.
  +
  +:runAnt
  +set NEW_ANT_HOME=%ANT_HOME%
  +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=%_CP%
  +set NEW_ANT_HOME=
  +set _JAVACMD=
  
  
  
  1.114     +10 -2     jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- build.xml	2001/01/23 17:12:07	1.113
  +++ build.xml	2001/01/24 12:53:37	1.114
  @@ -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
  
  
  
  1.28      +1 -1      jakarta-ant/src/main/org/apache/tools/ant/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/Main.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- Main.java	2001/01/23 14:07:06	1.27
  +++ Main.java	2001/01/24 12:53:38	1.28
  @@ -75,7 +75,7 @@
       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";
  
  
  

Mime
View raw message