ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs Zip.java
Date Thu, 27 Mar 2003 10:02:04 GMT
bodewig     2003/03/27 02:02:04

  Modified:    .        WHATSNEW
               src/main/org/apache/tools/ant/taskdefs Zip.java
  Log:
  prefix attribute of <zipfileset> would not generate directory entries
  for the prefix itself.
  
  PR: 18403
  
  Revision  Changes    Path
  1.373     +8 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.372
  retrieving revision 1.373
  diff -u -r1.372 -r1.373
  --- WHATSNEW	27 Mar 2003 08:24:21 -0000	1.372
  +++ WHATSNEW	27 Mar 2003 10:02:02 -0000	1.373
  @@ -211,6 +211,14 @@
   * Ant will no longer implicitly add Sun's rt.jar in <javac> when you
     use jvc and don't specify a bootclasspath.  Bugzilla Report 18055.
   
  +* The prefix attribute of <zipfileset> would not generate directory
  +  entries for the prefix itself.  Bugzilla Report 18403.
  +
  +Other Changes:
  +--------------
  +* Added ability to specify manifest encoding for the <jar> and 
  +  <manifest> tasks
  +
   Changes from Ant 1.5.1 to Ant 1.5.2
   =============================================
   
  
  
  
  1.103     +5 -4      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.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- Zip.java	18 Mar 2003 13:15:48 -0000	1.102
  +++ Zip.java	27 Mar 2003 10:02:04 -0000	1.103
  @@ -558,10 +558,11 @@
                                        + " file.");
           }
   
  -        if (prefix.length() > 0
  -            && !prefix.endsWith("/")
  -            && !prefix.endsWith("\\")) {
  -            prefix += "/";
  +        if (prefix.length() > 0) {
  +            if (!prefix.endsWith("/") && !prefix.endsWith("\\")) {
  +                prefix += "/";
  +            }
  +            addParentDirs(null, prefix, zOut, "", dirMode);
           }
   
           ZipFile zf = null;
  
  
  

Mime
View raw message