You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2008/05/27 01:15:27 UTC
svn commit: r660332 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Mon May 26 16:15:25 2008
New Revision: 660332
URL: http://svn.apache.org/viewvc?rev=660332&view=rev
Log:
Fixup files that are native - or not.
Javadoc generates files with mixed line endings, so fix these
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=660332&r1=660331&r2=660332&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Mon May 26 16:15:25 2008
@@ -1008,7 +1008,9 @@
<include name="NOTICE"/>
<include name="README"/>
<include name="${src.dir}/**"/>
- <exclude name="${src.dir}/**/images/**"/>
+ <exclude name="${src.dir}/**/*.gif"/>
+ <exclude name="${src.dir}/**/*.jpg"/>
+ <exclude name="${src.dir}/**/*.png"/>
<include name="${src.docs}/**"/>
<exclude name="${src.docs}/images/**"/>
<exclude name="${src.docs}/**/*.jmx"/>
@@ -1023,6 +1025,7 @@
<exclude name="${dest.jar.jmeter}/testfiles/*.jtl"/>
<!-- Ignore unit test output -->
<exclude name="${dest.jar.jmeter}/testfiles/*.out"/>
+ <exclude name="${dest.jar.jmeter}/testfiles/Sample_*.png"/>
<include name="eclipse.classpath"/>
<include name="eclipse.readme"/>
<include name="${lib.dir}/aareadme.txt"/>
@@ -1034,7 +1037,9 @@
<patternset id="dist.sources.non.native">
<include name="${velocity.jar}"/>
<include name="${lib.api}/*.jar"/>
- <include name="${src.dir}/**/images/**"/>
+ <include name="${src.dir}/**/*.gif"/>
+ <include name="${src.dir}/**/*.jpg"/>
+ <include name="${src.dir}/**/*.png"/>
<include name="${src.docs}/images/**"/>
<include name="${src.docs}/**/*.jmx"/>
<include name="${src.docs}/**/*.pdf"/>
@@ -1056,22 +1061,6 @@
</copy>
<echo>Converting work files to eol=${eoltype}</echo>
<fixcrlf fixlast="false" eol="${eoltype}" srcdir="${workdir}">
- <include name="*"/>
- <include name="eclipse.classpath"/>
- <include name="**/*.all"/>
- <include name="**/*.bsh"/>
- <include name="**/testfiles/*.csv"/>
- <include name="**/testfiles/*.tsv"/>
- <include name="**/*.properties"/>
- <include name="**/*.html"/>
- <include name="**/*.java"/>
- <include name="**/*.readme"/>
- <include name="**/*.set"/>
- <include name="**/*.txt"/>
- <include name="**/*.vsl"/>
- <include name="**/*.xml"/>
- <include name="**/*.xsd"/>
- <include name="**/*.xsl"/>
</fixcrlf>
</target>
@@ -1080,12 +1069,14 @@
<patternset refid="dist.binaries.native"/>
<patternset refid="external.jars.notices"/>
<!-- We don't need the site docs, but we do want Javadoc (e.g. for BeanShell) -->
- <include name="${dest.docs}/api/**"/>
+ <include name="${dest.docs.api}/**"/>
+ <exclude name="${dest.docs.api}/resources/**"/>
</patternset>
<patternset id="dist_bin_files_non_native">
<patternset refid="dist.binaries.non.native"/>
<patternset refid="external.jars"/>
+ <include name="${dest.docs.api}/resources/**"/>
</patternset>
<!-- NOTE: the site documents are not included in either archive -->
@@ -1376,13 +1367,13 @@
<property name="pack.name" value="${dist.name}_api"/>
<mkdir dir="${dist.dir}"/>
<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>
<gzip zipfile="${dist.dir}/${pack.name}.tgz" src="${dist.dir}/${pack.name}.tar" />
<!-- no longer needed -->
<delete file="${dist.dir}/${pack.name}.tar"/>
<zip zipfile="${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>
</target>
@@ -1439,7 +1430,7 @@
<target name="clean-apidocs">
<delete>
- <fileset dir="${dest.docs}/api" excludes=".svn/**"/>
+ <fileset dir="${dest.docs.api}" excludes=".svn/**"/>
</delete>
</target>
@@ -1500,7 +1491,9 @@
flags="g" byline="true">
<fileset dir="${dest.docs.api}" includes="**/*.html" />
</replaceregexp>
-
+ <!-- Javadoc on Windows creates mixed line endings -->
+ <echo level="info">Fixing Javadoc line endings</echo>
+ <fixcrlf srcdir="${dest.docs.api}" includes="**/*.html" fixlast="false"/>
</target>
<!--
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org