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 7145 invoked by uid 500); 23 Jan 2001 08:59:36 -0000
Delivered-To: apmail-jakarta-ant-cvs@apache.org
Received: (qmail 7138 invoked by uid 1195); 23 Jan 2001 08:59:36 -0000
Date: 23 Jan 2001 08:59:36 -0000
Message-ID: <20010123085936.7137.qmail@apache.org>
From: donaldp@apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit: jakarta-ant build.xml

donaldp     01/01/23 00:59:36

  Modified:    .        build.xml
  Log:
  Added dist.base to complete all recomends of Conor
  
  Revision  Changes    Path
  1.111     +15 -8     jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.110
  retrieving revision 1.111
  diff -u -r1.110 -r1.111
  --- build.xml	2001/01/23 08:44:46	1.110
  +++ build.xml	2001/01/23 08:59:35	1.111
  @@ -46,6 +46,7 @@
          =================================================================== 
     -->
     <property name="dist.name" value="jakarta-${name}-${version}"/>
  +  <property name="dist.base" value="."/>
   
     <property name="java.dir" value="src/main"/>
     <property name="docs.dir" value="docs"/>
  @@ -353,10 +354,15 @@
   
       <chmod dir="${dist.dir}" perm="go-rwx" />
   
  -    <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"/>
  +    <zip zipfile="${dist.base}/${dist.name}-bin.zip" 
  +         basedir="${dist.dir}/.." 
  +         includes="${dist.dir}/**"/>
  +    <tar tarfile="${dist.base}/${dist.name}-bin.tar" 
  +         basedir="${dist.dir}/.." 
  +         includes="${dist.dir}/**"/>
  +    <gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz" 
  +          src="${dist.base}/${dist.name}-bin.tar"/>
  +    <delete file="${dist.base}/${dist.name}-bin.tar"/>
     </target>
   
    <!--
  @@ -410,15 +416,16 @@
   
       <fixcrlf srcdir="${src.dist.src}" includes="**/*.java" cr="remove"/>
       
  -    <zip zipfile="${dist.name}-src.zip" 
  +    <zip zipfile="${dist.base}/${dist.name}-src.zip" 
            basedir="${src.dist.dir}/.." 
            includes="${src.dist.dir}/**"/>
       <!--
  -    <tar tarfile="${dist.name}-src.tar" 
  +    <tar tarfile="${dist.base}/${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"/>
  +    <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 dir="${src.dist.dir}" />    
     </target>