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-ffa450edef68master
@@ -7,8 +7,12 @@ Changes that could break older environments: | |||||
Other changes: | 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: | Fixed bugs: | ||||
----------- | ----------- | ||||
@@ -514,7 +514,7 @@ | |||||
<exclude name="${dist.name}/lib/optional.jar"/> | <exclude name="${dist.name}/lib/optional.jar"/> | ||||
</tarfileset> | </tarfileset> | ||||
</tar> | </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"/> | src="${dist.base}/${dist.name}-bin.tar"/> | ||||
<delete file="${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"/> | <copy file="${dist.name}/lib/optional.jar" tofile="${dist.base}/${dist.name}-optional.jar"/> | ||||
@@ -539,7 +539,7 @@ | |||||
<exclude name="${dist.name}/build.sh"/> | <exclude name="${dist.name}/build.sh"/> | ||||
</tarfileset> | </tarfileset> | ||||
</tar> | </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"/> | src="${dist.base}/${dist.name}-src.tar"/> | ||||
<delete file="${dist.base}/${dist.name}-src.tar"/> | <delete file="${dist.base}/${dist.name}-src.tar"/> | ||||
<delete dir="${dist.name}" /> | <delete dir="${dist.name}" /> | ||||
@@ -23,14 +23,14 @@ | |||||
<td align="center" valign="top">Yes</td> | <td align="center" valign="top">Yes</td> | ||||
</tr> | </tr> | ||||
<tr> | <tr> | ||||
<td valign="top">file</td> | |||||
<td valign="top">tofile</td> | |||||
<td valign="top">the destination file.</td> | <td valign="top">the destination file.</td> | ||||
<td align="center" valign="top">Yes</td> | <td align="center" valign="top">Yes</td> | ||||
</tr> | </tr> | ||||
</table> | </table> | ||||
<h3>Examples</h3> | <h3>Examples</h3> | ||||
<blockquote> | <blockquote> | ||||
<p><code><gzip src="test.tar" file="test.tar.gz" | |||||
<p><code><gzip src="test.tar" tofile="test.tar.gz" | |||||
/></code></p> | /></code></p> | ||||
</blockquote> | </blockquote> | ||||
<hr> | <hr> | ||||
@@ -72,13 +72,13 @@ public class GZip extends Task { | |||||
private File zipFile; | private File zipFile; | ||||
private File source; | private File source; | ||||
public void setFile(File file) { | |||||
public void setTofile(File file) { | |||||
zipFile = file; | zipFile = file; | ||||
} | } | ||||
public void setZipfile(File zipFile) { | 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) { | public void setSrc(File src) { | ||||