You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by se...@apache.org on 2004/01/02 17:55:16 UTC
cvs commit: jakarta-gump/project jakarta-jmeter.xml
sebb 2004/01/02 08:55:16
Modified: project jakarta-jmeter.xml
Log:
Separate builds for latest and from CVS; export Javadocs
Revision Changes Path
1.65 +77 -35 jakarta-gump/project/jakarta-jmeter.xml
Index: jakarta-jmeter.xml
===================================================================
RCS file: /home/cvs/jakarta-gump/project/jakarta-jmeter.xml,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- jakarta-jmeter.xml 22 Dec 2003 00:28:00 -0000 1.64
+++ jakarta-jmeter.xml 2 Jan 2004 16:55:16 -0000 1.65
@@ -16,30 +16,34 @@
<!-- The version of this file -->
<property name="version.projectfile" value="$Revision$"/>
-<!-- Temporary standalone trial build
+ <!--
+ These properties are passed to the build process, so the names need to agree with
+ the ones used in build.xml. However, at present the properties are only used for
+ creating the list of jars to be exported.
+ -->
<depend property="avalon-framework.jar" project="avalon-framework" id="combined"/>
<depend property="jakarta-oro.jar" project="jakarta-oro"/>
<depend property="junit.jar" project="junit"/>
<depend property="logkit.jar" project="avalon-logkit"/>
+ <!-- are the x jars still needed ? -->
<depend property="xalan.jar" project="xml-xalan2" id="transformer"/>
<depend property="xerces.jar" project="xml-xerces" id="parser"/>
<depend property="xml-apis.jar" project="xml-apis"/>
+
<depend property="jdom.jar" project="jdom"/>
<depend property="js.jar" project="rhino"/>
<depend property="soap.jar" project="ws-soap"/>
--->
</ant>
<depend project="ant" />
<depend project="jaf" />
<depend project="javamail" />
<depend project="jsse" />
-<!-- Temporary standalone trial build
<depend project="commons-collections"/>
<depend project="jakarta-velocity" />
<depend project="jtidy" />
<depend project="excalibur-compatibility" />
--->
+
<option project="beanshell" ids="bsh-core"/>
<option project="jakarta-bsf"/>
@@ -50,22 +54,56 @@
<!-- Allow http to build: -->
<work nested="build/components"/>
- <!--
- Add jars needed to run JUnit tests
- Note that bin/ApacheJMeter.jar is not currently needed,
- as there are no tests for the only class (NewDriver) in it.
- -->
- <work nested="lib/ext/ApacheJMeter_components.jar"/>
- <work nested="lib/ext/ApacheJMeter_core.jar"/>
- <work nested="lib/ext/ApacheJMeter_ftp.jar"/>
- <work nested="lib/ext/ApacheJMeter_functions.jar"/>
- <work nested="lib/ext/ApacheJMeter_http.jar"/>
- <work nested="lib/ext/ApacheJMeter_java.jar"/>
- <work nested="lib/ext/ApacheJMeter_jdbc.jar"/>
- <work nested="lib/ext/ApacheJMeter_ldap.jar"/>
- <work nested="lib/ext/ApacheJMeter_tcp.jar"/>
+ <!-- Export the JMeter jars -->
+ <home nested="." />
+<!--
+ <jar name="bin/ApacheJMeter.jar" />
+ <jar name="lib/ext/ApacheJMeter_components.jar" />
+ <jar name="lib/ext/ApacheJMeter_core.jar" />
+ <jar name="lib/ext/ApacheJMeter_ftp.jar" />
+ <jar name="lib/ext/ApacheJMeter_functions.jar" />
+ <jar name="lib/ext/ApacheJMeter_http.jar" />
+ <jar name="lib/ext/ApacheJMeter_java.jar" />
+ <jar name="lib/ext/ApacheJMeter_jdbc.jar" />
+ <jar name="lib/ext/ApacheJMeter_ldap.jar" />
+ <jar name="dist/jakarta-jmeter-@@DATE@@_bin.zip" />
+ <jar name="dist/jakarta-jmeter-@@DATE@@_src.zip" />
+ <jar name="dist/jakarta-jmeter-@@DATE@@_lib.zip" />
+ <license name="LICENSE"/>
+-->
+
+ <nag from="Geir Magnusson Jr. <geirm@apache.org>"
+ to="jmeter-dev@jakarta.apache.org">
+ <regexp pattern="/BUILD FAILED/" subject="JMeter Build Failure"/>
+ </nag>
+ </project>
+
+ <project name="jakarta-jmeter-cvs">
+ <!-- Build JMeter from CVS versions of dependencies -->
+ <package>org.apache.jmeter</package>
+
+ <ant target="gump-build">
+ <property name="version" value="@@DATE@@"/>
+ <property name="gump.run" value="true"/>
+ <!-- The version of this file -->
+ <property name="version.projectfile" value="$Revision$"/>
+ </ant>
+
+ <depend project="ant" />
+ <depend project="jaf" />
+ <depend project="javamail" />
+ <depend project="jsse" />
+
+ <option project="beanshell" ids="bsh-core"/>
+ <option project="jakarta-bsf"/>
+
+ <work nested="build/core"/>
+ <work nested="build/htmlparser"/>
+ <work nested="build/jorphan"/>
+
+ <!-- Allow http to build: -->
+ <work nested="build/components"/>
- <!-- Temporary standalone trial build -->
<work nested="lib/avalon-excalibur-4.1.jar"/>
<work nested="lib/avalon-framework-4.1.4.jar"/>
<work nested="lib/commons-collections.jar"/>
@@ -76,24 +114,18 @@
<work nested="lib/logkit-1.2.jar"/>
<work nested="lib/soap.jar"/>
<work nested="lib/Tidy.jar"/>
+
+ <!-- needed ? -->
<work nested="lib/velocity-1.4-dev.jar"/>
+
+ <!-- are these still needed ? -->
<work nested="lib/xalan.jar"/>
<work nested="lib/xercesImpl.jar"/>
<work nested="lib/xml-apis.jar"/>
<!-- Export the JMeter jars -->
<home nested="." />
-<!--
- <jar name="bin/ApacheJMeter.jar" />
- <jar name="lib/ext/ApacheJMeter_components.jar" />
- <jar name="lib/ext/ApacheJMeter_core.jar" />
- <jar name="lib/ext/ApacheJMeter_ftp.jar" />
- <jar name="lib/ext/ApacheJMeter_functions.jar" />
- <jar name="lib/ext/ApacheJMeter_http.jar" />
- <jar name="lib/ext/ApacheJMeter_java.jar" />
- <jar name="lib/ext/ApacheJMeter_jdbc.jar" />
- <jar name="lib/ext/ApacheJMeter_ldap.jar" />
--->
+
<jar name="dist/jakarta-jmeter-@@DATE@@_bin.zip" />
<jar name="dist/jakarta-jmeter-@@DATE@@_src.zip" />
<jar name="dist/jakarta-jmeter-@@DATE@@_lib.zip" />
@@ -102,7 +134,6 @@
<nag from="Geir Magnusson Jr. <geirm@apache.org>"
to="jmeter-dev@jakarta.apache.org">
<regexp pattern="/BUILD FAILED/" subject="JMeter Build Failure"/>
- <regexp pattern="/FAILURES!!!|OK \(0 tests\)/" subject="JMeter Unit Test Failure"/>
</nag>
</project>
@@ -118,6 +149,7 @@
<depend project="jakarta-jmeter" inherit="all"/>
+<!-- are these needed ? -->
<work nested="lib/avalon-excalibur-4.1.jar"/>
<work nested="lib/avalon-framework-4.1.4.jar"/>
<work nested="lib/commons-collections.jar"/>
@@ -133,6 +165,7 @@
<work nested="lib/xercesImpl.jar"/>
<work nested="lib/xml-apis.jar"/>
+ <!-- Add jars needed to run tests -->
<work nested="lib/jorphan.jar"/>
<work nested="lib/htmlparser.jar"/>
<work nested="lib/ext/ApacheJMeter_components.jar"/>
@@ -144,6 +177,11 @@
<work nested="lib/ext/ApacheJMeter_jdbc.jar"/>
<work nested="lib/ext/ApacheJMeter_ldap.jar"/>
<work nested="lib/ext/ApacheJMeter_tcp.jar"/>
+
+ <nag from="Geir Magnusson Jr. <geirm@apache.org>"
+ to="jmeter-dev@jakarta.apache.org">
+ <regexp pattern="/FAILURES!!!|OK \(0 tests\)/" subject="JMeter Unit Test Failure"/>
+ </nag>
</project>
<project name="jakarta-jmeter-javadoc">
@@ -177,6 +215,10 @@
<work nested="lib/xalan.jar"/>
<work nested="lib/xercesImpl.jar"/>
<work nested="lib/xml-apis.jar"/>
+
+ <!-- Export the JMeter jars -->
+ <home nested="." />
+ <jar name="dist/jakarta-jmeter-@@DATE@@_api.zip" />
</project>