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/23 02:38:21 UTC
svn commit: r659341 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Thu May 22 17:38:20 2008
New Revision: 659341
URL: http://svn.apache.org/viewvc?rev=659341&view=rev
Log:
Move Javadoc to binary archives.
Remove site docs from all archives.
Add docs/images to nightly binary archive.
Add velocity jar to nightly source archive.
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=659341&r1=659340&r2=659341&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Thu May 22 17:38:20 2008
@@ -965,6 +965,8 @@
<exclude name="${dest.jar.jmeter}/*.log"/>
<include name="${dest.jar}/"/>
<include name="${dest.printable_docs}/**"/>
+ <!-- We also need the images for the printable docs -->
+ <include name="${dest.docs}/images/**"/>
<include name="${extras.dir}/**"/>
<include name="${lib.dir}/bshclient.jar"/>
<include name="${lib.dir}/jorphan.jar"/>
@@ -984,6 +986,7 @@
<include name="STATUS"/>
<include name="${src.dir}/**"/>
<include name="${src.docs}/**"/>
+ <include name="${velocity.jar}"/>
<include name="${src.test}/**"/>
<include name="build.xml"/>
<include name="build.properties"/>
@@ -1001,18 +1004,12 @@
<patternset id="dist_bin_files">
<patternset refid="dist.binaries"/>
<patternset refid="external.jars"/>
- <include name="${dest.docs}/**"/>
- <exclude name="${dest.docs}/api/**"/>
- </patternset>
- <!-- TODO: find way to share images etc between the two document sets -->
-
- <!-- Files to be included in source download -->
- <patternset id="dist_src_files">
- <patternset refid="dist.sources"/>
+ <!-- We don't need the site docs, but we do want Javadoc (e.g. for BeanShell) -->
<include name="${dest.docs}/api/**"/>
- <include name="${velocity.jar}"/>
</patternset>
+ <!-- NOTE: the site documents are not included in either archive -->
+
<!-- Invoke with -Djmeter.version=m.n -Duser.name=xyz@apache.org [-Dsvn.revision=nnnnn] [-Ddisplay.version=xxxx]
Creates clean build and all documentation
Creates runtime and source distributions and site documentation
@@ -1069,7 +1066,7 @@
<tar destfile="${dist.dir}/${pack.name}_src.tar" longfile="gnu">
<tarfileset dir="." includes="${build.dir}/MANIFEST_SRC.MF" fullpath="${dist.name}/MANIFEST.MF"/>
<tarfileset dir="." prefix="${dist.name}" defaultexcludes="yes">
- <patternset refid="dist_src_files"/>
+ <patternset refid="dist.sources"/>
</tarfileset>
</tar>
@@ -1083,7 +1080,7 @@
<zip zipfile="${dist.dir}/${pack.name}_src.zip">
<zipfileset dir="." includes="${build.dir}/MANIFEST_SRC.MF" fullpath="${dist.name}/MANIFEST.MF"/>
<zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes">
- <patternset refid="dist_src_files"/>
+ <patternset refid="dist.sources"/>
</zipfileset>
</zip>
<antcall target="_md5">
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org