donaldp 01/09/12 09:43:26
Modified: . WHATSNEW build.xml
docs/manual/CoreTasks gzip.html
src/main/org/apache/tools/ant/taskdefs GZip.java
Log:
Oops I used the wrong convention!!!
This patch corrects it so that the old zipfile attribute is now tofile.
Revision Changes Path
1.151 +6 -2 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- WHATSNEW 2001/09/12 15:23:41 1.150
+++ WHATSNEW 2001/09/12 16:43:26 1.151
@@ -7,8 +7,12 @@
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:
-----------
1.182 +2 -2 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- build.xml 2001/09/12 15:26:08 1.181
+++ build.xml 2001/09/12 16:43:26 1.182
@@ -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}" />
1.4 +2 -2 jakarta-ant/docs/manual/CoreTasks/gzip.html
Index: gzip.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/manual/CoreTasks/gzip.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gzip.html 2001/09/12 15:22:41 1.3
+++ gzip.html 2001/09/12 16:43:26 1.4
@@ -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><gzip src="test.tar" file="test.tar.gz"
+ <p><code><gzip src="test.tar" tofile="test.tar.gz"
/></code></p>
</blockquote>
<hr>
1.10 +3 -3
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GZip.java
Index: GZip.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/GZip.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- GZip.java 2001/09/12 15:21:55 1.9
+++ GZip.java 2001/09/12 16:43:26 1.10
@@ -72,13 +72,13 @@
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) {
