Author: sebb
Date: Sat May 24 06:00:36 2008
New Revision: 659813
URL: http://svn.apache.org/viewvc?rev=659813&view=rev
Log:
Factor out jars from rest of source
Use -server mode for unit tests
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=659813&r1=659812&r2=659813&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sat May 24 06:00:36 2008
@@ -991,7 +991,6 @@
<include name="README"/>
<include name="${src.dir}/**"/>
<include name="${src.docs}/**"/>
- <include name="${velocity.jar}"/>
<include name="${src.test}/**"/>
<include name="build.xml"/>
<include name="build.properties"/>
@@ -1000,11 +999,16 @@
<include name="eclipse.classpath"/>
<include name="eclipse.readme"/>
<include name="${lib.dir}/aareadme.txt"/>
- <include name="${lib.api}/*.jar"/>
<include name="fb-*.x*"/>
<include name="KEYS.txt"/>
</patternset>
+ <!-- Treat the jars separately -->
+ <patternset id="dist.sources.jars">
+ <include name="${velocity.jar}"/>
+ <include name="${lib.api}/*.jar"/>
+ </patternset>
+
<!-- Files to be included in full download -->
<patternset id="dist_bin_files">
<patternset refid="dist.binaries"/>
@@ -1072,6 +1076,7 @@
<tarfileset dir="." includes="${build.dir}/MANIFEST_SRC.MF"
fullpath="${dist.name}/MANIFEST.MF"/>
<tarfileset dir="." prefix="${dist.name}" defaultexcludes="yes">
<patternset refid="dist.sources"/>
+ <patternset refid="dist.sources.jars"/>
</tarfileset>
</tar>
@@ -1086,6 +1091,7 @@
<zipfileset dir="." includes="${build.dir}/MANIFEST_SRC.MF"
fullpath="${dist.name}/MANIFEST.MF"/>
<zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes">
<patternset refid="dist.sources"/>
+ <patternset refid="dist.sources.jars"/>
</zipfileset>
</zip>
<antcall target="_md5">
@@ -1251,6 +1257,7 @@
<tarfileset dir="." includes="${build.dir}/MANIFEST_SRC.MF"
fullpath="${dist.name}/MANIFEST.MF"/>
<tarfileset dir="." prefix="${dist.name}" defaultexcludes="yes">
<patternset refid="dist.sources"/>
+ <patternset refid="dist.sources.jars"/>
</tarfileset>
</tar>
<gzip zipfile="${dist.dir}/${pack.name}.tgz"
src="${dist.dir}/${pack.name}.tar" />
@@ -1260,6 +1267,7 @@
<zipfileset dir="." includes="${build.dir}/MANIFEST_SRC.MF"
fullpath="${dist.name}/MANIFEST.MF"/>
<zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes">
<patternset refid="dist.sources"/>
+ <patternset refid="dist.sources.jars"/>
</zipfileset>
</zip>
</target>
@@ -1629,6 +1637,7 @@
<pathelement location="${build.test}"/>
<path refid="classpath"/>
</classpath>
+ <jvmarg value="-server"/>
<sysproperty key="java.awt.headless" value="${test.headless}"/>
<sysproperty key="testsaveservice.saveout"
value="${testsaveservice.saveout}" />
<arg value="${build.test}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
