ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant build.xml build.sh build.bat bootstrap.sh bootstrap.bat
Date Tue, 23 Jan 2001 08:44:47 GMT
donaldp     01/01/23 00:44:46

  Modified:    .        build.xml build.sh build.bat bootstrap.sh
                        bootstrap.bat
  Log:
  Work in almost all of Conors suggestions
  
  Revision  Changes    Path
  1.110     +125 -28   jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -u -r1.109 -r1.110
  --- build.xml	2001/01/23 05:10:33	1.109
  +++ build.xml	2001/01/23 08:44:46	1.110
  @@ -21,10 +21,10 @@
          Set the properties for source directories
          =================================================================== 
     -->
  -  <property name="src.base" value="src"/>
  -  <property name="manifest.dir" value="${src.base}/manifest"/>
  -  <property name="java.dir" value="${src.base}/main"/>
  -  <property name="script.dir" value="${src.base}/script"/>
  +  <property name="src.dir" value="src"/>
  +  <property name="manifest.dir" value="${src.dir}/manifest"/>
  +  <property name="java.dir" value="${src.dir}/main"/>
  +  <property name="script.dir" value="${src.dir}/script"/>
     <property name="lib.dir" value="lib"/>
   
     <!-- 
  @@ -45,13 +45,7 @@
          Set the properties related dist target
          =================================================================== 
     -->
  -  <property name="dist.name" value="${Name}-${version}"/>
  -<!--   <property name="dist.dir" value="${dist.name}"/> -->
  -  <property name="dist.dir" value="dist"/>
  -  <property name="dist.bin" value="${dist.dir}/bin"/>
  -  <property name="dist.lib" value="${dist.dir}/lib"/>
  -  <property name="dist.docs" value="${dist.dir}/docs"/>
  -  <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  +  <property name="dist.name" value="jakarta-${name}-${version}"/>
   
     <property name="java.dir" value="src/main"/>
     <property name="docs.dir" value="docs"/>
  @@ -76,9 +70,11 @@
     <property name="packages" value="org.apache.tools.*"/>
     <property name="manifest" value="src/etc/manifest"/>
   
  -  <!-- =================================================================== -->
  -  <!-- Set some the defaults the user can override in .ant.properties      -->
  -  <!-- =================================================================== -->
  +  <!-- 
  +       ===================================================================
  +       Set some the defaults the user can override in .ant.properties     
  +       =================================================================== 
  +  -->
     <property name="build.compiler.emacs" value="on"/>
     <property name="build.compiler.warnings" value="true"/>
     <property name="build.compiler.depend" value="true"/>
  @@ -89,17 +85,38 @@
     <property name="optimize" value="true" />
     <property name="junit.fork" value="false" />
   
  - <!--
  +  <!--
          ===================================================================
                                     Main target
          ===================================================================
     -->
     <target name="main" depends="dist-lite" />
   
  -  <!-- =================================================================== -->
  -  <!-- Check to see what optional dependencies are available               -->
  -  <!-- =================================================================== -->
  -  <target name="check_for_optional_packages">
  + <!-- 
  +       ===================================================================
  +       Set up dist properties
  +       =================================================================== 
  +  -->
  +  <target name="setup-properties">
  +
  +    <property name="dist.dir" value="dist"/>
  +    <property name="dist.bin" value="${dist.dir}/bin"/>
  +    <property name="dist.lib" value="${dist.dir}/lib"/>
  +    <property name="dist.docs" value="${dist.dir}/docs"/>
  +    <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
  +
  +    <property name="src.dist.dir" value="dist-src"/>
  +    <property name="src.dist.src" value="${src.dist.dir}/src"/>
  +    <property name="src.dist.docs" value="${src.dist.dir}/docs"/>
  +    <property name="src.dist.lib" value="${src.dist.dir}/lib"/>
  +  </target>
  +
  +  <!-- 
  +       ===================================================================
  +       Check to see what optional dependencies are available              
  +       =================================================================== 
  +  -->
  +  <target name="check_for_optional_packages" depends="setup-properties">
       <available property="jdk1.2+" classname="java.lang.ThreadLocal" />
       <available property="jdk1.3+" classname="java.lang.StrictMath" />
       <available property="bsf.present" 
  @@ -274,9 +291,9 @@
          </fileset>
        </chmod>
   
  -    <fixcrlf srcdir="${dist.dir}" cr="add" includes="**/*.bat" />
  -    <fixcrlf srcdir="${dist.dir}" cr="remove" includes="**/*.sh" />
  -    <fixcrlf srcdir="${dist.dir}" cr="remove" includes="ant" />
  +    <fixcrlf srcdir="${dist.bin}" cr="add" includes="*.bat" />
  +    <fixcrlf srcdir="${dist.bin}" cr="remove" includes="*.sh" />
  +    <fixcrlf srcdir="${dist.bin}" cr="remove" includes="ant" />
   
     </target>
   
  @@ -310,7 +327,8 @@
   
       <copy todir="${dist.lib}">
         <fileset dir="${lib.dir}">
  -        <include name="*" />
  +        <include name="*.jar" />
  +        <include name="*.zip" />
         </fileset>
       </copy>
   
  @@ -335,12 +353,92 @@
   
       <chmod dir="${dist.dir}" perm="go-rwx" />
   
  -    <zip zipfile="${dist.name}.zip" basedir="${dist.dir}/.." includes="${dist.dir}/**"/>
  -    <tar tarfile="${dist.name}.tar" basedir="${dist.dir}/.." includes="${dist.dir}/**"/>
  -    <gzip zipfile="${dist.name}.tar.gz" src="${dist.name}.tar"/>
  -    <delete file="${dist.name}.tar"/>
  +    <zip zipfile="${dist.name}-bin.zip" basedir="${dist.dir}/.." includes="${dist.dir}/**"/>
  +    <tar tarfile="${dist.name}-bin.tar" basedir="${dist.dir}/.." includes="${dist.dir}/**"/>
  +    <gzip zipfile="${dist.name}-bin.tar.gz" src="${dist.name}-bin.tar"/>
  +    <delete file="${dist.name}-bin.tar"/>
     </target>
   
  + <!--
  +       ===================================================================
  +                            Create the source distribution
  +       ===================================================================
  +  -->
  +  <target name="src-dist" depends="setup-properties">
  +
  +    <mkdir dir="${src.dist.dir}" />
  +<!--
  +    <mkdir dir="${src.dist.lib}" />
  +    <mkdir dir="${src.dist.src}" />
  +    <mkdir dir="${src.dist.docs}" />
  +-->
  +    <copy todir="${src.dist.lib}">
  +      <fileset dir="${lib.dir}">
  +        <include name="*.jar" />
  +        <include name="*.zip" />
  +      </fileset>
  +    </copy>
  +
  +    <copy todir="${src.dist.src}">
  +      <fileset dir="${src.dir}"/>
  +    </copy>
  +
  +    <copy todir="${src.dist.docs}">
  +      <fileset dir="${docs.dir}"/>
  +    </copy>
  +
  +    <copy todir="${src.dist.dir}">
  +      <fileset dir=".">
  +        <include name="README"/>
  +        <include name="LICENSE"/>
  +        <include name="TODO"/>
  +        <include name="WHATSNEW"/>
  +        <include name="build.bat"/>
  +        <include name="build.sh"/>
  +        <include name="bootstrap.bat"/>
  +        <include name="bootstrap.sh"/>
  +      </fileset>
  +    </copy>
  +
  +    <fixcrlf srcdir="${src.dist.dir}" includes="*.sh" cr="remove"/>
  +    <fixcrlf srcdir="${src.dist.dir}" includes="*.bat" cr="add"/>
  +    <chmod perm="+x">
  +      <fileset dir="${src.dist.dir}">
  +        <include name="*.sh" />
  +      </fileset>
  +    </chmod>
  +
  +    <fixcrlf srcdir="${src.dist.src}" includes="**/*.java" cr="remove"/>
  +    
  +    <zip zipfile="${dist.name}-src.zip" 
  +         basedir="${src.dist.dir}/.." 
  +         includes="${src.dist.dir}/**"/>
  +    <!--
  +    <tar tarfile="${dist.name}-src.tar" 
  +         basedir="${src.dist.dir}/.." 
  +         includes="${src.dist.dir}/**"/>
  +    <gzip zipfile="${dist.name}-src.tar.gz" src="${dist.name}-src.tar"/>
  +    <delete file="${dist.name}-src.tar"/>
  +    -->
  +    <delete dir="${src.dist.dir}" />    
  +  </target>
  +
  +  <!--
  +       ===================================================================
  +                 Completely build all dists
  +       ===================================================================
  +  -->
  +  <target name="full-dist">
  +    <antcall target="src-dist">
  +      <param name="src.dist.dir" value="${dist.name}" />
  +    </antcall>
  +
  +    <antcall target="dist">
  +      <param name="dist.dir" value="${dist.name}" />
  +    </antcall>
  +    <delete dir="${dist.name}" />
  +  </target> 
  +
     <!--
          ===================================================================
                    Cleans up build and distribution directories
  @@ -360,7 +458,6 @@
          ===================================================================
     -->
     <target name="real-clean" depends="clean">
  -    <delete dir="${docs.dir}" />
       <delete file="${dist.name}.tar.gz" />
       <delete file="${dist.name}.zip" />
     </target>
  
  
  
  1.13      +1 -1      jakarta-ant/build.sh
  
  Index: build.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.sh,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- build.sh	2001/01/23 05:10:32	1.12
  +++ build.sh	2001/01/23 08:44:46	1.13
  @@ -1,7 +1,7 @@
   #!/bin/sh
   
   if test ! -f build\classes\org\apache\tools\ant\Main.class ; then
  -  ./bootstrap.sh
  +  ./bootstrap.sh $*
   fi    
   
   
  
  
  
  1.16      +1 -1      jakarta-ant/build.bat
  
  Index: build.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.bat,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.bat	2001/01/23 05:10:32	1.15
  +++ build.bat	2001/01/23 08:44:46	1.16
  @@ -2,7 +2,7 @@
   
   if exist build\classes\org\apache\tools\ant\Main.class goto doBuild
   
  -bootstrap.bat
  +bootstrap.bat %1 %2 %3 %4 %5 %6 %7 %8
   
   :doBuild
   
  
  
  
  1.36      +1 -1      jakarta-ant/bootstrap.sh
  
  Index: bootstrap.sh
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/bootstrap.sh,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- bootstrap.sh	2001/01/23 08:05:34	1.35
  +++ bootstrap.sh	2001/01/23 08:44:46	1.36
  @@ -86,6 +86,6 @@
     CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
   fi
   
  -${JAVA_HOME}/bin/java -classpath ${CLASSPATH} org.apache.tools.ant.Main
  +${JAVA_HOME}/bin/java -classpath ${CLASSPATH} org.apache.tools.ant.Main $*
   
   echo ... Done Bootstrapping Ant Distribution
  
  
  
  1.25      +1 -1      jakarta-ant/bootstrap.bat
  
  Index: bootstrap.bat
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/bootstrap.bat,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- bootstrap.bat	2001/01/23 05:10:32	1.24
  +++ bootstrap.bat	2001/01/23 08:44:46	1.25
  @@ -52,7 +52,7 @@
   echo ... Building Ant Distribution
   
   SET CLASSPATH=%LOCALCLASSPATH%;build\classes
  -call build.bat
  +call build.bat %1 %2 %3 %4 %5 %6 %7 %8
   
   echo.
   echo ... Done Bootstrapping Ant Distribution
  
  
  

Mime
View raw message