cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Tar.java

[conor]

conor       01/02/11 01:21:45

  Modified:    .        Tag: ANT_13_BRANCH build.xml
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_13_BRANCH
                        Tar.java
  Log:
  Change tar tasks nested fileset to tarfileset since
  it takes additional attributes
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.130.2.1 +8 -8      jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.130
  retrieving revision 1.130.2.1
  diff -u -r1.130 -r1.130.2.1
  --- build.xml 2001/02/05 13:54:05     1.130
  +++ build.xml 2001/02/11 09:21:45     1.130.2.1
  @@ -399,16 +399,16 @@
            excludes="${dist.name}/lib/optional.jar"/>
       <tar longfile="gnu"
            tarfile="${dist.base}/${dist.name}-bin.tar">
  -      <fileset dir="${dist.name}/.." mode="755" username="ant" group="ant">
  +      <tarfileset dir="${dist.name}/.." mode="755" username="ant" 
group="ant">
           <include name="${dist.name}/bin/ant"/>
           <include name="${dist.name}/bin/antRun"/>
  -      </fileset> 
  -      <fileset dir="${dist.name}/.." username="ant" group="ant"> 
  +      </tarfileset> 
  +      <tarfileset dir="${dist.name}/.." username="ant" group="ant"> 
           <include name="${dist.name}/**"/>
           <exclude name="${dist.name}/bin/ant"/>
           <exclude name="${dist.name}/bin/antRun"/>
           <exclude name="${dist.name}/lib/optional.jar"/>
  -      </fileset> 
  +      </tarfileset> 
       </tar>
       <gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz" 
             src="${dist.base}/${dist.name}-bin.tar"/>
  @@ -425,15 +425,15 @@
            includes="${dist.name}/**"/>
       <tar longfile="gnu"
            tarfile="${dist.base}/${dist.name}-src.tar" >
  -      <fileset dir="${dist.name}/.." mode="755" username="ant" group="ant">
  +      <tarfileset dir="${dist.name}/.." mode="755" username="ant" 
group="ant">
           <include name="${dist.name}/bootstrap.sh"/>
           <include name="${dist.name}/build.sh"/>
  -      </fileset> 
  -      <fileset dir="${dist.name}/.." username="ant" group="ant"> 
  +      </tarfileset> 
  +      <tarfileset dir="${dist.name}/.." username="ant" group="ant"> 
           <include name="${dist.name}/**"/>
           <exclude name="${dist.name}/bootstrap.sh"/>
           <exclude name="${dist.name}/build.sh"/>
  -      </fileset>
  +      </tarfileset>
       </tar> 
       <gzip zipfile="${dist.base}/${dist.name}-src.tar.gz" 
             src="${dist.base}/${dist.name}-src.tar"/>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.10.2.2  +1 -1      
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java
  
  Index: Tar.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Tar.java,v
  retrieving revision 1.10.2.1
  retrieving revision 1.10.2.2
  diff -u -r1.10.2.1 -r1.10.2.2
  --- Tar.java  2001/02/08 00:42:18     1.10.2.1
  +++ Tar.java  2001/02/11 09:21:45     1.10.2.2
  @@ -81,7 +81,7 @@
       Vector filesets = new Vector();
       Vector fileSetFiles = new Vector();
   
  -    public TarFileSet createFileSet() {
  +    public TarFileSet createTarFileSet() {
           TarFileSet fileset = new TarFileSet();
           filesets.addElement(fileset);
           return fileset;