Browse Source

Revert to old gzip interface.

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269714 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 24 years ago
parent
commit
35e92352f4
2 changed files with 3 additions and 8 deletions
  1. +2
    -2
      build.xml
  2. +1
    -6
      src/main/org/apache/tools/ant/taskdefs/GZip.java

+ 2
- 2
build.xml View File

@@ -514,7 +514,7 @@
<exclude name="${dist.name}/lib/optional.jar"/> <exclude name="${dist.name}/lib/optional.jar"/>
</tarfileset> </tarfileset>
</tar> </tar>
<gzip tofile="${dist.base}/${dist.name}-bin.tar.gz"
<gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz"
src="${dist.base}/${dist.name}-bin.tar"/> src="${dist.base}/${dist.name}-bin.tar"/>
<delete file="${dist.base}/${dist.name}-bin.tar"/> <delete file="${dist.base}/${dist.name}-bin.tar"/>
<copy file="${dist.name}/lib/optional.jar" tofile="${dist.base}/${dist.name}-optional.jar"/> <copy file="${dist.name}/lib/optional.jar" tofile="${dist.base}/${dist.name}-optional.jar"/>
@@ -539,7 +539,7 @@
<exclude name="${dist.name}/build.sh"/> <exclude name="${dist.name}/build.sh"/>
</tarfileset> </tarfileset>
</tar> </tar>
<gzip tofile="${dist.base}/${dist.name}-src.tar.gz"
<gzip zipfile="${dist.base}/${dist.name}-src.tar.gz"
src="${dist.base}/${dist.name}-src.tar"/> src="${dist.base}/${dist.name}-src.tar"/>
<delete file="${dist.base}/${dist.name}-src.tar"/> <delete file="${dist.base}/${dist.name}-src.tar"/>
<delete dir="${dist.name}" /> <delete dir="${dist.name}" />


+ 1
- 6
src/main/org/apache/tools/ant/taskdefs/GZip.java View File

@@ -72,13 +72,8 @@ public class GZip extends Task {
private File zipFile; private File zipFile;
private File source; private File source;
public void setTofile(File file) {
zipFile = file;
}

public void setZipfile(File zipFile) { public void setZipfile(File zipFile) {
log("DEPRECATED - The zipfile attribute is deprecated. Use tofile attribute instead.");
setTofile( zipFile );
this.zipFile = zipFile;
} }


public void setSrc(File src) { public void setSrc(File src) {


Loading…
Cancel
Save