ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Bordet, Simone" <Simone.Bor...@compaq.com>
Subject [PATCH] RE: Zip task and ZipFileSet's fullpath attribute
Date Mon, 24 Sep 2001 09:21:19 GMT
Hi,

> If it is a simple fix (which it sounds like) send a patch to the list.

here's the patch and attached the full file, both WRT today's CVS, thanks !

Simon

DIFF:
cvs diff src\main\org\apache\tools\ant\taskdefs\Zip.java (in directory
J:\Java\Apache\Ant\jakarta-ant\)
Index: src/main/org/apache/tools/ant/taskdefs/Zip.java
===================================================================
RCS file:
/home/cvspublic/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Zip.java,
v
retrieving revision 1.49
diff -B -b -w -r1.49 Zip.java
412c412
<       ZipOutputStream zOut, String prefix)
---
>       ZipOutputStream zOut, String prefix, String fullpath)
414a415,417
>         if (prefix.length() > 0 && fullpath.length() > 0)
>              throw new BuildException("Both prefix and fullpath attributes
may not be set on the same fileset.");
> 
427a431
> 					if (prefix.length() > 0) {
432a437,440
> 					else if (fullpath.length() > 0) {
> 						zipFile(in, zOut, fullpath,
entry.getTime());
> 					}
>                 }
694c702,703
<      * all files to the ZipOutputStream using the given prefix.
---
>      * all files to the ZipOutputStream using the given prefix
>      * or fullpath.
728c737
<                 addZipEntries((ZipFileSet) fs, ds, zOut, prefix);
---
>                 addZipEntries((ZipFileSet) fs, ds, zOut, prefix,
fullpath);

*****CVS exited normally with code 1*****




Mime
View raw message