Browse Source

Oops I used the wrong convention!!!

This patch corrects it so that the old zipfile attribute is now tofile.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269692 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 24 years ago
parent
commit
e4957c5f19
4 changed files with 13 additions and 9 deletions
  1. +6
    -2
      WHATSNEW
  2. +2
    -2
      build.xml
  3. +2
    -2
      docs/manual/CoreTasks/gzip.html
  4. +3
    -3
      src/main/org/apache/tools/ant/taskdefs/GZip.java

+ 6
- 2
WHATSNEW View File

@@ -7,8 +7,12 @@ Changes that could break older environments:
Other changes:
--------------

* The attributes zipfile, jarfile, warfile and earfile (from the Zip, Gzip, Jar,
War and Ear tasks) have been deprecated and supersceded by a new attribute "file".
* The attributes zipfile, jarfile, warfile and earfile (from the Zip,
Jar, War and Ear tasks) have been deprecated and supersceded by a
new attribute "file".

* The attribute zipfile in GZip has been deprecated and supersceded
by "tofile" attribute.

Fixed bugs:
-----------


+ 2
- 2
build.xml View File

@@ -514,7 +514,7 @@
<exclude name="${dist.name}/lib/optional.jar"/>
</tarfileset>
</tar>
<gzip file="${dist.base}/${dist.name}-bin.tar.gz"
<gzip tofile="${dist.base}/${dist.name}-bin.tar.gz"
src="${dist.base}/${dist.name}-bin.tar"/>
<delete file="${dist.base}/${dist.name}-bin.tar"/>
<copy file="${dist.name}/lib/optional.jar" tofile="${dist.base}/${dist.name}-optional.jar"/>
@@ -539,7 +539,7 @@
<exclude name="${dist.name}/build.sh"/>
</tarfileset>
</tar>
<gzip file="${dist.base}/${dist.name}-src.tar.gz"
<gzip tofile="${dist.base}/${dist.name}-src.tar.gz"
src="${dist.base}/${dist.name}-src.tar"/>
<delete file="${dist.base}/${dist.name}-src.tar"/>
<delete dir="${dist.name}" />


+ 2
- 2
docs/manual/CoreTasks/gzip.html View File

@@ -23,14 +23,14 @@
<td align="center" valign="top">Yes</td>
</tr>
<tr>
<td valign="top">file</td>
<td valign="top">tofile</td>
<td valign="top">the destination file.</td>
<td align="center" valign="top">Yes</td>
</tr>
</table>
<h3>Examples</h3>
<blockquote>
<p><code>&lt;gzip src=&quot;test.tar&quot; file=&quot;test.tar.gz&quot;
<p><code>&lt;gzip src=&quot;test.tar&quot; tofile=&quot;test.tar.gz&quot;
/&gt;</code></p>
</blockquote>
<hr>


+ 3
- 3
src/main/org/apache/tools/ant/taskdefs/GZip.java View File

@@ -72,13 +72,13 @@ public class GZip extends Task {
private File zipFile;
private File source;
public void setFile(File file) {
public void setTofile(File file) {
zipFile = file;
}

public void setZipfile(File zipFile) {
log("DEPRECATED - The zipfile attribute is deprecated. Use file attribute instead.");
setFile( zipFile );
log("DEPRECATED - The zipfile attribute is deprecated. Use tofile attribute instead.");
setTofile( zipFile );
}

public void setSrc(File src) {


Loading…
Cancel
Save