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:07:20 GMT
bodewig     2003/03/27 02:07:20

  Modified:    .        Tag: ANT_15_BRANCH WHATSNEW
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
                        Zip.java
  Log:
  Merge fix for 18403 from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.263.2.129 +3 -0      ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/ant/WHATSNEW,v
  retrieving revision 1.263.2.128
  retrieving revision 1.263.2.129
  diff -u -r1.263.2.128 -r1.263.2.129
  --- WHATSNEW	22 Mar 2003 10:23:50 -0000	1.263.2.128
  +++ WHATSNEW	27 Mar 2003 10:07:19 -0000	1.263.2.129
  @@ -30,6 +30,9 @@
   * 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 
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.78.2.15 +6 -5      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.78.2.14
  retrieving revision 1.78.2.15
  diff -u -r1.78.2.14 -r1.78.2.15
  --- Zip.java	18 Mar 2003 13:13:34 -0000	1.78.2.14
  +++ Zip.java	27 Mar 2003 10:07:19 -0000	1.78.2.15
  @@ -93,7 +93,7 @@
    *
    * @author James Davidson <a href="mailto:duncan@x180.com">duncan@x180.com</a>
    * @author Jon S. Stevens <a href="mailto:jon@clearink.com">jon@clearink.com</a>
  - * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  + * @author Stefan Bodewig
    * @author <a href="mailto:levylambert@tiscali-dsl.de">Antoine Levy-Lambert</a>
    *
    * @since Ant 1.1
  @@ -537,10 +537,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