peterreilly 2005/01/18 04:40:01
Modified: . Tag: ANT_16_BRANCH WHATSNEW
docs/manual/CoreTasks Tag: ANT_16_BRANCH zip.html
src/main/org/apache/tools/ant/taskdefs Tag: ANT_16_BRANCH
Zip.java
Log:
sync
Revision Changes Path
No revision
No revision
1.503.2.160 +3 -0 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.159
retrieving revision 1.503.2.160
diff -u -r1.503.2.159 -r1.503.2.160
--- WHATSNEW 14 Jan 2005 10:12:31 -0000 1.503.2.159
+++ WHATSNEW 18 Jan 2005 12:40:01 -0000 1.503.2.160
@@ -161,6 +161,9 @@
* Expose objects and methods in IntrospectionHelper. Bugzilla Report 30794.
+* Added a comment attribute to the zip task.
+ Bugzilla report 22793.
+
Fixed bugs:
-----------
No revision
No revision
1.21.2.7 +5 -0 ant/docs/manual/CoreTasks/zip.html
Index: zip.html
===================================================================
RCS file: /home/cvs/ant/docs/manual/CoreTasks/zip.html,v
retrieving revision 1.21.2.6
retrieving revision 1.21.2.7
diff -u -r1.21.2.6 -r1.21.2.7
--- zip.html 22 Nov 2004 22:55:10 -0000 1.21.2.6
+++ zip.html 18 Jan 2005 12:40:01 -0000 1.21.2.7
@@ -185,6 +185,11 @@
Defaults to true. <em>Since Ant 1.6.2</em></td>
<td align="center" valign="top">No</td>
</tr>
+ <tr>
+ <td valign="top">comment</td>
+ <td valign="top">Comment to store in the archive. <em>Since Ant
1.6.3</em></td>
+ <td valign="top" align="center">No</td>
+ </tr>
</table>
<h3>Parameters specified as nested elements</h3>
<h4>fileset</h4>
No revision
No revision
1.116.2.12 +28 -1 ant/src/main/org/apache/tools/ant/taskdefs/Zip.java
Index: Zip.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,v
retrieving revision 1.116.2.11
retrieving revision 1.116.2.12
diff -u -r1.116.2.11 -r1.116.2.12
--- Zip.java 27 Dec 2004 11:33:19 -0000 1.116.2.11
+++ Zip.java 18 Jan 2005 12:40:01 -0000 1.116.2.12
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2004 The Apache Software Foundation
+ * Copyright 2000-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -115,6 +115,12 @@
private boolean roundUp = true;
/**
+ * Comment for the archive.
+ * @since Ant 1.6.3
+ */
+ private String comment = "";
+
+ /**
* This is the name/location of where to
* create the .zip file.
*
@@ -290,6 +296,26 @@
public void setKeepCompression(boolean keep) {
keepCompression = keep;
}
+
+ /**
+ * Comment to use for archive.
+ *
+ * @param comment The content of the comment.
+ * @since Ant 1.6.3
+ */
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
+
+ /**
+ * Comment of the archive
+ *
+ * @return Comment of the archive.
+ * @since Ant 1.6.3
+ */
+ public String getComment() {
+ return comment;
+ }
/**
* Whether the file modification times will be rounded up to the
@@ -484,6 +510,7 @@
}
addResources(oldFiles, r, zOut);
}
+ zOut.setComment(comment);
finalizeZipOutputStream(zOut);
// If we've been successful on an update, delete the
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
