avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: jakarta-avalon-apps/db build.xml
Date Mon, 03 Jun 2002 18:42:56 GMT
hammant     2002/06/03 11:42:56

  Modified:    db       build.xml
  Log:
  dist target now produces useful results.
  
  Revision  Changes    Path
  1.49      +64 -6     jakarta-avalon-apps/db/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/db/build.xml,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- build.xml	19 May 2002 12:16:19 -0000	1.48
  +++ build.xml	3 Jun 2002 18:42:56 -0000	1.49
  @@ -328,7 +328,31 @@
   
       <property name="dist.name" value="${Name}-${version}"/>
       <property name="dist.image" value="${name}-${version}"/>
  +    
       <mkdir dir="${dist.image}"/>
  +    <mkdir dir="${dist.base}"/>  
  +    
  +    <antcall target="bin-dist" inheritAll="false">
  +      <param name="bin.dist.dir" value="${dist.name}" />
  +    </antcall> 
  +    
  +    <zip zipfile="${dist.base}/${dist.name}-bin.zip"
  +         basedir="${dist.name}/.."
  +         includes="${dist.name}/**"/>
  +
  +    <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-bin.tar">
  +      <tarfileset dir="${dist.name}/.." username="avalon" group="avalon">
  +        <include name="${dist.name}/**"/>
  +      </tarfileset>
  +    </tar>
  +
  +    <gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz"
  +          src="${dist.base}/${dist.name}-bin.tar"/>
  +
  +    <delete file="${dist.base}/${dist.name}-bin.tar"/>
  +    <delete dir="${dist.name}" />
  +    
  +    <!-- source -->
   
       <copy todir="${dist.image}">
         <fileset dir=".">
  @@ -336,24 +360,42 @@
           <include name="lib/**"/>
           <include name="build.xml"/>
           <include name="readme.txt"/>
  -      </fileset>
  +      </fileset>      
       </copy>
   
  -    <zip zipfile="dist/${dist.name}-src.zip">
  +    <zip zipfile="${dist.base}/${dist.name}-src.zip">
         <fileset dir=".">
           <include name="${dist.image}/**"/>
         </fileset>         
  +      <fileset dir="..">
  +        <include name="common/lib/excalibur-*"/>
  +        <include name="common/lib/avalon-*"/>
  +        <include name="common/lib/cornerstone.jar"/>
  +        <include name="common/lib/phoenix-*"/>
  +        <include name="common/lib/xdoclet*"/>
  +        <include name="common/lib/xjavadoc*"/>
  +        <include name="common/lib/log4j-core*"/>
  +      </fileset>      
       </zip>
   
  -    <tar longfile="gnu" tarfile="dist/${dist.name}-src.tar" >
  +    <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-src.tar" >
         <tarfileset dir="." username="avalon" group="avalon">
           <include name="${dist.image}/**"/>
         </tarfileset>
  +      <tarfileset dir=".." username="avalon" group="avalon">
  +        <include name="common/lib/excalibur-*"/>
  +        <include name="common/lib/avalon-*"/>
  +        <include name="common/lib/cornerstone.jar"/>
  +        <include name="common/lib/phoenix-*"/>
  +        <include name="common/lib/xdoclet*"/>
  +        <include name="common/lib/xjavadoc*"/>
  +        <include name="common/lib/log4j-core*"/>
  +      </tarfileset>      
       </tar>
   
  -    <gzip zipfile="dist/${dist.name}-src.tar.gz"
  -          src="dist/${dist.name}-src.tar"/>
  -    <delete file="dist/${dist.name}-src.tar"/>
  +    <gzip zipfile="${dist.base}/${dist.name}-src.tar.gz"
  +          src="${dist.base}/${dist.name}-src.tar"/>
  +    <delete file="${dist.base}/${dist.name}-src.tar"/>
   
       <delete>
         <fileset dir="${dist.image}" defaultexcludes="no"/>
  @@ -375,6 +417,8 @@
       </copy>
   
       <copy file="${build.lib}/avalon-db.sar" tofile="${bin.dist.dir}/avalon-db-${version}.sar"/>
  +    <copy file="${build.lib}/avalon-db-driver-altrmi.jar" tofile="${bin.dist.dir}/avalon-db-driver-altrmi-${version}.jar"/>
  +    <copy file="${build.lib}/avalon-db-testgui.jar" tofile="${bin.dist.dir}/avalon-db-testgui-${version}.jar"/>
   
   
       <chmod dir="${bin.dist.dir}" perm="go-rwx" />
     </target>
  @@ -394,6 +438,20 @@
       <copy todir="${src.dist.src}">
         <fileset dir="${src.dir}"/>
       </copy>
  +    
  +    <copy todir="${src.dist.dir}">
  +      <fileset dir=".">
  +        <include name="build.xml"/>
  +      </fileset>
  +    </copy>
  +    
  +    <mkdir dir="${src.dist.dir}/lib"/>
  +    <copy todir="${src.dist.dir}/lib">
  +      <fileset dir="lib">
  +        <include name="**"/>
  +      </fileset>
  +    </copy>    
  +    
       <fixcrlf srcdir="${src.dist.src}/java" includes="**/*.java" eol="lf"/>
   
       <chmod dir="${src.dist.dir}" perm="go-rwx" />
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message