woolfel     2005/10/11 07:02:23

  Modified:    .        Tag: rel-2-1 build.xml
  Log:
  adding report tool tasks to the build
  peter
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.206.2.9 +27 -4     jakarta-jmeter/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/build.xml,v
  retrieving revision 1.206.2.8
  retrieving revision 1.206.2.9
  diff -u -r1.206.2.8 -r1.206.2.9
  --- build.xml 2 Oct 2005 01:12:31 -0000       1.206.2.8
  +++ build.xml 11 Oct 2005 14:02:23 -0000      1.206.2.9
  @@ -134,6 +134,7 @@
         <sourcePath path="${src.jorphan}" />
         <sourcePath path="${src.tcp}" />
         <sourcePath path="${src.jms}" />
  +      <sourcePath path="${src.report}" />
   
        <!--
         Uncomment the following 2 lines to include htmlparser in the analysis
  @@ -186,6 +187,7 @@
     <property name="src.monitor.components" value="src/monitor/components"/>
     <property name="src.monitor.model" value="src/monitor/model"/>
     <property name="src.jms" value="src/protocol/jms"/>
  +  <property name="src.report" value="src/reports"/>
   
     <!-- Where the documentation sources live -->
     <property name="src.docs" value="xdocs"/>
  @@ -211,6 +213,7 @@
       <pathelement location="${src.monitor.components}"/>
       <pathelement location="${src.monitor.model}"/>
       <pathelement location="${src.jms}"/>
  +    <pathelement location="${src.report}"/>
     </path>
   
     <!-- Temporary build directories: where the .class live -->
  @@ -232,6 +235,7 @@
     <property name="build.monitor.components" 
location="build/monitor/components"/>
     <property name="build.monitor.model" location="build/monitor/model"/>
     <property name="build.jms" location="build/protocol/jms"/>
  +  <property name="build.report" location="build/reports"/>
     <property name="build.test" location="build/test"/>
     
     <!-- Path prefix to allow Anakia to find stylesheets if running under 
Eclipse -->
  @@ -638,6 +642,19 @@
       </javac>
     </target>
   
  +  <target name="compile-report" 
depends="compile-jorphan,compile-core,compile-components" 
  +    description="Compile report components.">
  +    <mkdir dir="${build.report}"/>
  +    <javac srcdir="${src.report}" destdir="${build.report}" 
source="${src.java.version}" optimize="${optimize}" debug="on" 
target="${target.java.version}" deprecation="${deprecation}" 
encoding="${encoding}">
  +      <include name="**/*.java"/>
  +      <classpath>
  +        <path refid="classpath"/>
  +        <pathelement location="${build.jorphan}"/>
  +        <pathelement location="${build.core}"/>
  +      </classpath>
  +    </javac>
  +  </target>
  +
     <target name="compile-tcp" depends="compile-jorphan,compile-core" 
description="Compile components specific to TCP sampling.">
       <mkdir dir="${build.tcp}"/>
       <javac srcdir="${src.tcp}" destdir="${build.tcp}" 
source="${src.java.version}" optimize="${optimize}" debug="on" 
target="${target.java.version}" deprecation="${deprecation}" 
encoding="${encoding}">
  @@ -747,7 +764,7 @@
     </target>
   
     <target name="compile" 
  -  
depends="compile-core,compile-components,compile-functions,compile-protocols,compile-rmi,compile-htmlparser,compile-monitor,compile-junit,compile-jms"
  +  
depends="compile-core,compile-components,compile-functions,compile-protocols,compile-rmi,compile-htmlparser,compile-monitor,compile-junit,compile-jms,compile-report"
     description="Compile everything."/>
   
     <target name="package" depends="compile, package-only"
  @@ -835,6 +852,12 @@
         <fileset dir="${src.junit}" includes="**/*.properties" />
       </jar>
   
  +    <!-- report -->
  +    <jar jarfile="${dest.jar}/ApacheJMeter_report.jar">
  +      <fileset dir="${build.report}" includes="**/*.class" />
  +      <fileset dir="${src.report}" includes="**/*.properties" />
  +    </jar>
  +
       <!-- ldap -->
       <jar jarfile="${dest.jar}/ApacheJMeter_ldap.jar">
         <fileset dir="${build.ldap}" includes="**/*.class" />
  @@ -872,7 +895,7 @@
     </target>
   
     <target name="install" depends="package" description="Install JMeter. 
(Compiles code and creates jars)">
  -    <fixcrlf srcdir="." eol="lf" includes="**/jmeter,**/jmeter-server"/>
  +    <fixcrlf srcdir="." eol="lf" 
includes="**/jmeter,**/jmeter-server,**/jmeter-report"/>
     </target>
   
     <target name="all" depends="clean,install" 
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to