sebb 2003/11/13 10:55:07
Modified: . build.xml
Log:
Added lib/opt directory, which can be used for optional jars, such as bsh and bsf;
updated comments and removed some duplicate property definitions
Revision Changes Path
1.129 +25 -13 jakarta-jmeter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- build.xml 12 Nov 2003 15:38:55 -0000 1.128
+++ build.xml 13 Nov 2003 18:55:07 -0000 1.129
@@ -47,6 +47,7 @@
Jars that are not required by the dist target do not need to be added to the Gump
project file.
-->
+
<!-- Renamed targets -->
<target name="all-docs">
<echo message="Target has been renamed to docs-all"/>
@@ -123,10 +124,6 @@
</findbugs>
</target>
-<!--
- <sourcePath path="${src.core}" />
- -->
-
<!-- Where the Sources live -->
<property name="src.dir" value="src"/>
@@ -176,15 +173,24 @@
<!-- Path prefix to allow Anakia to find stylesheets if running under Eclipse -->
<!--
Anakia looks for stylesheets relative to the java launch directory.
- Use the External Tools properties page to define the variable
+ Use the External Tools properties page to define the variable
as the relative path to the directory where this build file is found.
+ For example:
+ eclipse.anakia=workspace/jmeter
+
+ An alternative is to define it as a command-line argument on the Main page;
+ this allows one to use a macro name, so is more portable.
+ For example:
+ -Declipse.anakia=workspace/${project_name}
+ WARNING: you must ensure that you have selected a file or directory in
+ the Navigator pane before attempting to run the build, or Eclipse will
+ complain that it cannot resolve the variable name, and it can mark the
+ launch configuration as having failed.
-->
<property name="eclipse.anakia" value="."/>
<!-- Where the build result .jars will be placed -->
<property name="dest.jar" value="lib/ext"/>
- <property name="lib.dir" value="lib"/>
- <property name="lib.dir" value="lib"/>
<property name="dest.jar.jmeter" value="bin"/>
<!-- Where the API documentation lives -->
@@ -196,6 +202,9 @@
<!-- Directory where these 3rd party libraries will live -->
<property name="lib.dir" value="lib"/>
+
+ <!-- Directory where Optional 3rd party libraries will live -->
+ <property name="lib.opt" value="lib/opt"/>
<!-- Other stuff -->
<property name="extras.dir" value="extras"/>
@@ -231,28 +240,30 @@
<include name="${avalon-excalibur.jar}"/>
<include name="${avalon-framework.jar}"/>
<include name="${jakarta-oro.jar}"/>
+ <include name="${commons-collections.jar}"/>
<include name="${junit.jar}"/>
<include name="${logkit.jar}"/>
<include name="${xalan.jar}"/>
<include name="${xerces.jar}"/>
<include name="${xml-apis.jar}"/>
+ <include name="${jdom.jar}"/>
<include name="${js.jar}"/>
<include name="${soap.jar}"/>
<include name="${tidy.jar}"/>
- <include name="${commons-collections.jar}"/>
<include name="${lib.dir}/*.html"/>
- <include name="${jdom.jar}"/>
</patternset>
<!-- Additional, optional jars, not included in distribution -->
- <property name="bsf.jar" value="${lib.dir}/bsfasf.jar"/>
- <property name="bsh.jar" value="${lib.dir}/bsh-1.3.0.jar"/>
+ <property name="bsf.jar" value="${lib.opt}/bsf.jar"/>
+ <property name="bsh.jar" value="${lib.opt}/bsh-1.3.0.jar"/>
<!-- Build classpath -->
<path id="classpath">
<fileset dir="${lib.dir}" includes="*.jar"/>
+ <pathelement location="${bsh.jar}"/>
+ <pathelement location="${bsf.jar}"/>
</path>
-
+
<!-- Anakia classpath -->
<!--
N.B. On some OSes - e.g. VMS - multiple "." are converted to other characters
@@ -506,6 +517,7 @@
<fileset dir="${src.core}" includes="org/apache/jmeter/resources/">
<exclude name="*eucJP*"/>
</fileset>
+ <!--TODO: this surely belongs outside the jar file? -->
<fileset dir="${src.core}" includes="org/apache/jmeter/help.txt"/>
</jar>
<jar jarfile="${dest.jar.jmeter}/ApacheJMeter.jar" includes="**/NewDriver*"
manifest="${src.core}/MANIFEST" basedir="${build.core}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
