root
/
jmeter
mirror of https://github.com/apache/jmeter.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Replace zifile (deprecated) by destfile 

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1694483 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bruno Demion 2015-08-06 12:41:45 +00:00
parent 8331342c68
commit 934d18c87d
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
build.xml
View File

@ -1456,7 +1456,7 @@ run JMeter unless all the JMeter jars are added.
<!-- Delete work directory (may not exist) --> <!-- Delete work directory (may not exist) -->
<delete dir="${dist.dir}/lf" quiet="true"/> <delete dir="${dist.dir}/lf" quiet="true"/>
<gzip zipfile="${dist.dir}/${pack.name}.tgz" src="${dist.dir}/${pack.name}.tar" /> <gzip destfile="${dist.dir}/${pack.name}.tgz" src="${dist.dir}/${pack.name}.tar" />
<!-- no longer needed --> <!-- no longer needed -->
<delete file="${dist.dir}/${pack.name}.tar"/> <delete file="${dist.dir}/${pack.name}.tar"/>
<antcall target="_hash"> <antcall target="_hash">
@ -1467,7 +1467,7 @@ run JMeter unless all the JMeter jars are added.
<param name="eoltype" value="crlf"/> <param name="eoltype" value="crlf"/>
<param name="fileset" value="dist_bin_files_native"/> <param name="fileset" value="dist_bin_files_native"/>
</antcall> </antcall>
<zip zipfile="${dist.dir}/${pack.name}.zip"> <zip destfile="${dist.dir}/${pack.name}.zip">
<zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes"> <zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes">
<patternset refid="dist_bin_files_non_native"/> <patternset refid="dist_bin_files_non_native"/>
</zipfileset> </zipfileset>
@ -1497,7 +1497,7 @@ run JMeter unless all the JMeter jars are added.
<!-- Delete work directory (may not exist) --> <!-- Delete work directory (may not exist) -->
<delete dir="${dist.dir}/lf" quiet="true"/> <delete dir="${dist.dir}/lf" quiet="true"/>
<gzip zipfile="${dist.dir}/${pack.name}_src.tgz" src="${dist.dir}/${pack.name}_src.tar" /> <gzip destfile="${dist.dir}/${pack.name}_src.tgz" src="${dist.dir}/${pack.name}_src.tar" />
<!-- no longer needed --> <!-- no longer needed -->
<delete file="${dist.dir}/${pack.name}_src.tar"/> <delete file="${dist.dir}/${pack.name}_src.tar"/>
<antcall target="_hash"> <antcall target="_hash">
@ -1509,7 +1509,7 @@ run JMeter unless all the JMeter jars are added.
<param name="fileset" value="dist_src_files_native"/> <param name="fileset" value="dist_src_files_native"/>
</antcall> </antcall>
<zip zipfile="${dist.dir}/${pack.name}_src.zip"> <zip destfile="${dist.dir}/${pack.name}_src.zip">
<zipfileset dir="${native.dir.crlf}" prefix="${dist.name}"> <zipfileset dir="${native.dir.crlf}" prefix="${dist.name}">
<patternset refid="dist_src_files_native"/> <patternset refid="dist_src_files_native"/>
</zipfileset> </zipfileset>
@ -2021,10 +2021,10 @@ run JMeter unless all the JMeter jars are added.
</tarfileset> </tarfileset>
<tarfileset mode="755" includes="${dist.executables}" dir="." prefix="${dist.name}" defaultexcludes="yes"/> <tarfileset mode="755" includes="${dist.executables}" dir="." prefix="${dist.name}" defaultexcludes="yes"/>
</tar> </tar>
<gzip zipfile="${dist.dir}/${pack.name}.tgz" src="${dist.dir}/${pack.name}.tar" /> <gzip destfile="${dist.dir}/${pack.name}.tgz" src="${dist.dir}/${pack.name}.tar" />
<!-- no longer needed --> <!-- no longer needed -->
<delete file="${dist.dir}/${pack.name}.tar"/> <delete file="${dist.dir}/${pack.name}.tar"/>
<zip zipfile="${dist.dir}/${pack.name}.zip"> <zip destfile="${dist.dir}/${pack.name}.zip">
<zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes"> <zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes">
<patternset refid="dist.binaries.native"/> <patternset refid="dist.binaries.native"/>
</zipfileset> </zipfileset>
@ -2045,10 +2045,10 @@ run JMeter unless all the JMeter jars are added.
<patternset refid="external.jars"/> <patternset refid="external.jars"/>
</tarfileset> </tarfileset>
</tar> </tar>
<gzip zipfile="${dist.dir}/${pack.name}.tgz" src="${dist.dir}/${pack.name}.tar" /> <gzip destfile="${dist.dir}/${pack.name}.tgz" src="${dist.dir}/${pack.name}.tar" />
<!-- no longer needed --> <!-- no longer needed -->
<delete file="${dist.dir}/${pack.name}.tar"/> <delete file="${dist.dir}/${pack.name}.tar"/>
<zip zipfile="${dist.dir}/${pack.name}.zip"> <zip destfile="${dist.dir}/${pack.name}.zip">
<zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes"> <zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes">
<patternset refid="external.jars.notices"/> <patternset refid="external.jars.notices"/>
</zipfileset> </zipfileset>
@ -2064,10 +2064,10 @@ run JMeter unless all the JMeter jars are added.
<tar destfile="${dist.dir}/${pack.name}.tar" longfile="gnu"> <tar destfile="${dist.dir}/${pack.name}.tar" longfile="gnu">
<tarfileset includes="${dest.docs.api}" dir="." prefix="${dist.name}" defaultexcludes="yes"/> <tarfileset includes="${dest.docs.api}" dir="." prefix="${dist.name}" defaultexcludes="yes"/>
</tar> </tar>
<gzip zipfile="${dist.dir}/${pack.name}.tgz" src="${dist.dir}/${pack.name}.tar" /> <gzip destfile="${dist.dir}/${pack.name}.tgz" src="${dist.dir}/${pack.name}.tar" />
<!-- no longer needed --> <!-- no longer needed -->
<delete file="${dist.dir}/${pack.name}.tar"/> <delete file="${dist.dir}/${pack.name}.tar"/>
<zip zipfile="${dist.dir}/${pack.name}.zip"> <zip destfile="${dist.dir}/${pack.name}.zip">
<zipfileset includes="${dest.docs.api}" dir="." prefix="${dist.name}" defaultexcludes="yes"/> <zipfileset includes="${dest.docs.api}" dir="." prefix="${dist.name}" defaultexcludes="yes"/>
</zip> </zip>
</target> </target>
@ -2083,10 +2083,10 @@ run JMeter unless all the JMeter jars are added.
<patternset refid="dist.sources.non.native"/> <patternset refid="dist.sources.non.native"/>
</tarfileset> </tarfileset>
</tar> </tar>
<gzip zipfile="${dist.dir}/${pack.name}.tgz" src="${dist.dir}/${pack.name}.tar" /> <gzip destfile="${dist.dir}/${pack.name}.tgz" src="${dist.dir}/${pack.name}.tar" />
<!-- no longer needed --> <!-- no longer needed -->
<delete file="${dist.dir}/${pack.name}.tar"/> <delete file="${dist.dir}/${pack.name}.tar"/>
<zip zipfile="${dist.dir}/${pack.name}.zip"> <zip destfile="${dist.dir}/${pack.name}.zip">
<zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes"> <zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes">
<patternset refid="dist.sources.native"/> <patternset refid="dist.sources.native"/>
</zipfileset> </zipfileset>
@ -2099,7 +2099,7 @@ run JMeter unless all the JMeter jars are added.
<!-- Create a zip of all resource files for translators --> <!-- Create a zip of all resource files for translators -->
<target name="pack-resources"> <target name="pack-resources">
<mkdir dir="${dist.dir}"/> <mkdir dir="${dist.dir}"/>
<zip zipfile="${dist.dir}/resources.zip"> <zip destfile="${dist.dir}/resources.zip">
<zipfileset dir="." defaultexcludes="yes"> <zipfileset dir="." defaultexcludes="yes">
<patternset excludes="${src.dir}/examples/**" /> <patternset excludes="${src.dir}/examples/**" />
<patternset includes="${src.dir}/**/*Resources.properties" /> <patternset includes="${src.dir}/**/*Resources.properties" />