mstover1 2004/04/04 06:59:53
Modified: . Tag: rel-2_0 build.xml
src/core/org/apache/jmeter/util Tag: rel-2_0
JMeterVersion.java
Log:
new build target for making end-user distribution
Revision Changes Path
No revision
No revision
1.175.2.1 +50 -6 jakarta-jmeter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.175
retrieving revision 1.175.2.1
diff -u -r1.175 -r1.175.2.1
--- build.xml 22 Mar 2004 15:05:56 -0000 1.175
+++ build.xml 4 Apr 2004 13:59:53 -0000 1.175.2.1
@@ -378,7 +378,7 @@
<target name="init-version">
<tstamp/>
<!-- JMeter version -->
- <property name="jmeter.version" value="1.9.${DSTAMP}"/>
+ <property name="jmeter.version" value="2.0.0"/>
</target>
<target name="init" depends="check-libs,report-missing-libs,init-version">
@@ -842,10 +842,54 @@
<include name="build.*"/>
<include name="lcp.bat"/>
<include name="${dest.jar.jmeter}/jmeter*.bat"/>
- <include name="${dest.jar.jmeter}/jmeter.properties"/>
+ <include name="${dest.jar.jmeter}/jmeter*.properties"/>
<include name="${dest.jar.jmeter}/log4j.conf"/>
+ <include name="${dest.jar.jmeter}/testfiles/**"/>
<include name="eclipse.classpath*"/>
</patternset>
+
+ <target name="distribution"
depends="assume-libs-present,clean,install,docs-all,test"
+ description="Build JMeter for end-user distribution">
+ <property name="dist.name" value="jakarta-jmeter-${jmeter.version}"/>
+ <property name="pack.name" value="${dist.name}"/>
+ <patternset id="dist_bin_files">
+ <patternset refid="dist.binaries"/>
+ <patternset refid="external.jars"/>
+ <include name="docs/**"/>
+ <include name="${dest.printable_docs}/**"/>
+ <exclude name="docs/api/**"/>
+ </patternset>
+ <patternset id="dist_src_files">
+ <patternset refid="external.jars"/>
+ <patternset refid="dist.sources"/>
+ </patternset>
+ <mkdir dir="${dist.dir}"/>
+ <tar destfile="${dist.dir}/${pack.name}_bin.tar" longfile="gnu">
+ <tarfileset dir="." prefix="${dist.name}" excludes="${dist.executables}"
defaultexcludes="yes">
+ <patternset refid="dist_bin_files"/>
+ </tarfileset>
+ <tarfileset mode="755" includes="${dist.executables}" dir="."
prefix="${dist.name}" defaultexcludes="yes"/>
+ </tar>
+ <gzip zipfile="${dist.dir}/${pack.name}_bin.tgz"
src="${dist.dir}/${pack.name}_bin.tar" />
+ <zip zipfile="${dist.dir}/${pack.name}_bin.zip">
+ <zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes">
+ <patternset refid="dist_bin_files"/>
+ </zipfileset>
+ </zip>
+
+ <tar destfile="${dist.dir}/${pack.name}_src.tar" longfile="gnu">
+ <tarfileset dir="." prefix="${dist.name}" excludes="${dist.executables}"
defaultexcludes="yes">
+ <patternset refid="dist_src_files"/>
+ </tarfileset>
+ <tarfileset mode="755" includes="${dist.executables}" dir="."
prefix="${dist.name}" defaultexcludes="yes"/>
+ </tar>
+ <gzip zipfile="${dist.dir}/${pack.name}_src.tgz"
src="${dist.dir}/${pack.name}_src.tar" />
+ <zip zipfile="${dist.dir}/${pack.name}_src.zip">
+ <zipfileset dir="." prefix="${dist.name}" defaultexcludes="yes">
+ <patternset refid="dist_src_files"/>
+ </zipfileset>
+ </zip>
+ </target>
<!-- N.B. this target is the one currently used by Gump -->
<target name="dist" depends="assume-libs-present,clean,install,docs-all,test"
description="Rebuild all and create the distribution packages.">
No revision
No revision
1.14.2.3 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterVersion.java
Index: JMeterVersion.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterVersion.java,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -r1.14.2.2 -r1.14.2.3
--- JMeterVersion.java 2 Apr 2004 22:40:50 -0000 1.14.2.2
+++ JMeterVersion.java 4 Apr 2004 13:59:53 -0000 1.14.2.3
@@ -41,7 +41,7 @@
* pattern: VERSION = <quote>.*<quote>
*
*/
- static final String VERSION = "1.9.20040402";
+ static final String VERSION = "2.0.0";
private JMeterVersion() // Not instantiable
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
