ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Pack.java
Date Thu, 17 Apr 2003 13:09:19 GMT
bodewig     2003/04/17 06:09:19

  Modified:    .        build.xml
               docs/manual/CoreTasks pack.html war.html zip.html
               src/main/org/apache/tools/ant/taskdefs Pack.java
  Log:
  Add destfile attribute to <gzip> and <bzip2>.
  
  PR: 11102
  
  Revision  Changes    Path
  1.366     +4 -4      ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/ant/build.xml,v
  retrieving revision 1.365
  retrieving revision 1.366
  diff -u -r1.365 -r1.366
  --- build.xml	15 Apr 2003 15:21:47 -0000	1.365
  +++ build.xml	17 Apr 2003 13:09:17 -0000	1.366
  @@ -1213,9 +1213,9 @@
           <exclude name="${dist.name}/bin/*.py"/>
         </tarfileset>
       </tar>
  -    <gzip zipfile="${dist.base}/bin/${dist.name}-bin.tar.gz"
  +    <gzip destfile="${dist.base}/bin/${dist.name}-bin.tar.gz"
             src="${dist.base}/bin/${dist.name}-bin.tar"/>
  -    <bzip2 zipfile="${dist.base}/bin/${dist.name}-bin.tar.bz2"
  +    <bzip2 destfile="${dist.base}/bin/${dist.name}-bin.tar.bz2"
              src="${dist.base}/bin/${dist.name}-bin.tar"/>
       <delete file="${dist.base}/bin/${dist.name}-bin.tar"/>
       <delete dir="${dist.name}"/>
  @@ -1253,9 +1253,9 @@
           <exclude name="${dist.name}/build.sh"/>
         </tarfileset>
       </tar>
  -    <gzip zipfile="${dist.base}/src/${dist.name}-src.tar.gz"
  +    <gzip destfile="${dist.base}/src/${dist.name}-src.tar.gz"
             src="${dist.base}/src/${dist.name}-src.tar"/>
  -    <bzip2 zipfile="${dist.base}/src/${dist.name}-src.tar.bz2"
  +    <bzip2 destfile="${dist.base}/src/${dist.name}-src.tar.bz2"
              src="${dist.base}/src/${dist.name}-src.tar"/>
       <delete file="${dist.base}/src/${dist.name}-src.tar"/>
       <delete dir="${dist.name}"/>
  
  
  
  1.8       +9 -5      ant/docs/manual/CoreTasks/pack.html
  
  Index: pack.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/pack.html,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- pack.html	4 Sep 2002 11:05:16 -0000	1.7
  +++ pack.html	17 Apr 2003 13:09:18 -0000	1.8
  @@ -25,20 +25,24 @@
       <td align="center" valign="top">Yes</td>
     </tr>
     <tr>
  +    <td valign="top">destfile</td>
  +    <td valign="top">the destination file to create.</td>
  +    <td align="center" valign="top" rowspan="2">Exactly one of the two.</td>
  +  </tr>
  +  <tr>
       <td valign="top">zipfile</td>
  -    <td valign="top">the destination file.</td>
  -    <td align="center" valign="top">Yes</td>
  +    <td valign="top">the <i>deprecated</i> old name of destfile.</td>
     </tr>
   </table>
   <h3>Examples</h3>
   <blockquote>
  -  <p><code>&lt;gzip src=&quot;test.tar&quot; zipfile=&quot;test.tar.gz&quot;/&gt;</code></p>
  +  <p><code>&lt;gzip src=&quot;test.tar&quot; destfile=&quot;test.tar.gz&quot;/&gt;</code></p>
   </blockquote>
   <blockquote>
  -  <p><code>&lt;bzip2 src=&quot;test.tar&quot; zipfile=&quot;test.tar.bz2&quot;/&gt;</code></p>
  +  <p><code>&lt;bzip2 src=&quot;test.tar&quot; destfile=&quot;test.tar.bz2&quot;/&gt;</code></p>
   </blockquote>
   <hr>
  -<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. All
rights
  +<p align="center">Copyright &copy; 2000-2003 Apache Software Foundation. All
rights
   Reserved.</p>
   
   </body>
  
  
  
  1.19      +1 -2      ant/docs/manual/CoreTasks/war.html
  
  Index: war.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/war.html,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- war.html	11 Apr 2003 13:31:18 -0000	1.18
  +++ war.html	17 Apr 2003 13:09:18 -0000	1.19
  @@ -28,13 +28,12 @@
     <tr>
       <td valign="top">destfile</td>
       <td valign="top">the WAR file to create.</td>
  -    <td valign="top" align="center">Yes</td>
  +    <td align="center" valign="top" rowspan="2">Exactly one of the two.</td>
     </tr>
     <tr>
       <td valign="top">warfile</td>
       <td valign="top"><i>Deprecated<i> name of the file to create
       -use <tt>destfile</tt> instead.</td>
  -    <td valign="top" align="center">No</td>
     </tr>      
     <tr>
       <td valign="top">webxml</td>
  
  
  
  1.19      +1 -2      ant/docs/manual/CoreTasks/zip.html
  
  Index: zip.html
  ===================================================================
  RCS file: /home/cvs/ant/docs/manual/CoreTasks/zip.html,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- zip.html	11 Apr 2003 13:31:18 -0000	1.18
  +++ zip.html	17 Apr 2003 13:09:18 -0000	1.19
  @@ -76,12 +76,11 @@
     <tr>
       <td valign="top">destfile</td>
       <td valign="top">the zip-file to create.</td>
  -    <td align="center" valign="top">Yes</td>
  +    <td align="center" valign="top" rowspan="2">Exactly one of the two.</td>
     </tr>
     <tr>
       <td valign="top">zipfile</td>
       <td valign="top">the <i>deprecated</i> old name of destfile.</td>
  -    <td align="center" valign="top">Yes</td>
     </tr>
     <tr>
       <td valign="top">basedir</td>
  
  
  
  1.14      +9 -1      ant/src/main/org/apache/tools/ant/taskdefs/Pack.java
  
  Index: Pack.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Pack.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Pack.java	10 Feb 2003 14:13:36 -0000	1.13
  +++ Pack.java	17 Apr 2003 13:09:19 -0000	1.14
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -82,6 +82,14 @@
        */
       public void setZipfile(File zipFile) {
           this.zipFile = zipFile;
  +    }
  +
  +    /**
  +     * the required destination file.
  +     * @param zipFile
  +     */
  +    public void setDestfile(File zipFile) {
  +        setZipfile(zipFile);
       }
   
       /**
  
  
  

Mime
View raw message