jsalvata    2003/01/14 16:45:46

  Modified:    .        build.xml
  Log:
  Provide build property to make attempts at building with JDK1.2.x easier.
  
  Revision  Changes    Path
  1.85      +9 -8      jakarta-jmeter/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/build.xml,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- build.xml 12 Jan 2003 01:53:07 -0000      1.84
  +++ build.xml 15 Jan 2003 00:45:45 -0000      1.85
  @@ -66,6 +66,7 @@
     <!-- Compilation parameters -->
     <property name="optimize" value="on"/>
     <property name="deprecation" value="off"/>
  +  <property name="target.java.version" value="1.2"/>
   
     <!-- List of Unix executable files in the binary distribution -->
     <property name="dist.executables" value="bin/jmeter bin/jmeter-server"/>
  @@ -154,7 +155,7 @@
       <replaceregexp file="${src.core}/org/apache/jmeter/util/JMeterUtils.java"
        match="VERSION=&quot;.*?&quot;"
        replace="VERSION=&quot;${version}&quot;"/>
  -    <javac srcdir="${src.core}" destdir="${build.core}" optimize="${optimize}" 
debug="on" target="1.3" deprecation="${deprecation}">
  +    <javac srcdir="${src.core}" destdir="${build.core}" optimize="${optimize}" 
debug="on" target="${target.java.version}" deprecation="${deprecation}">
         <include name="**/*.java"/>
         <exclude name="org/apache/jmeter/util/JsseSSLManager.java" 
unless="jsse.present"/>
         <exclude name="org/apache/jmeter/util/IaikSSLManager.java" 
unless="isasilk.present"/>
  @@ -170,7 +171,7 @@
   
     <target name="compile-components" depends="compile-jorphan,compile-core" 
description="Compile generic (protocol-independent) components.">
       <mkdir dir="${build.components}"/>
  -    <javac srcdir="${src.components}" destdir="${build.components}" 
optimize="${optimize}" debug="on" target="1.3" deprecation="${deprecation}">
  +    <javac srcdir="${src.components}" destdir="${build.components}" 
optimize="${optimize}" debug="on" target="${target.java.version}" 
deprecation="${deprecation}">
         <include name="**/*.java"/>
         <exclude name="org/apache/jmeter/visualizers/MailerVisualizer.java" 
unless="javamail.complete"/>
         <exclude name="org/apache/jmeter/visualizers/MailerModel.java" 
unless="javamail.complete"/>
  @@ -185,7 +186,7 @@
   
     <target name="compile-functions" depends="compile-jorphan,compile-core" 
description="Compile functions.">
       <mkdir dir="${build.functions}"/>
  -    <javac srcdir="${src.functions}" destdir="${build.functions}" 
optimize="${optimize}" debug="on" target="1.3" deprecation="${deprecation}">
  +    <javac srcdir="${src.functions}" destdir="${build.functions}" 
optimize="${optimize}" debug="on" target="${target.java.version}" 
deprecation="${deprecation}">
         <include name="**/*.java"/>
         <classpath>
           <path refid="classpath"/>
  @@ -197,7 +198,7 @@
   
     <target name="compile-http" depends="compile-jorphan,compile-core" 
description="Compile components specific to HTTP sampling.">
       <mkdir dir="${build.http}"/>
  -    <javac srcdir="${src.http}" destdir="${build.http}" optimize="${optimize}" 
debug="on" target="1.3" deprecation="${deprecation}">
  +    <javac srcdir="${src.http}" destdir="${build.http}" optimize="${optimize}" 
debug="on" target="${target.java.version}" deprecation="${deprecation}">
         <include name="**/*.java"/>
         <classpath>
           <path refid="classpath"/>
  @@ -209,7 +210,7 @@
   
     <target name="compile-ftp" depends="compile-jorphan,compile-core" 
description="Compile components specific to FTP sampling.">
       <mkdir dir="${build.ftp}"/>
  -    <javac srcdir="${src.ftp}" destdir="${build.ftp}" optimize="${optimize}" 
debug="on" target="1.3" deprecation="${deprecation}">
  +    <javac srcdir="${src.ftp}" destdir="${build.ftp}" optimize="${optimize}" 
debug="on" target="${target.java.version}" deprecation="${deprecation}">
         <include name="**/*.java"/>
         <classpath>
           <path refid="classpath"/>
  @@ -221,7 +222,7 @@
   
     <target name="compile-jdbc" depends="compile-jorphan,compile-core" 
description="Compile components specific to JDBC sampling.">
       <mkdir dir="${build.jdbc}"/>
  -    <javac srcdir="${src.jdbc}" destdir="${build.jdbc}" optimize="${optimize}" 
debug="on" target="1.3" deprecation="${deprecation}">
  +    <javac srcdir="${src.jdbc}" destdir="${build.jdbc}" optimize="${optimize}" 
debug="on" target="${target.java.version}" deprecation="${deprecation}">
         <include name="**/*.java"/>
         <classpath>
           <path refid="classpath"/>
  @@ -233,7 +234,7 @@
   
     <target name="compile-java" depends="compile-jorphan,compile-core" 
description="Compile components specific to Java sampling.">
       <mkdir dir="${build.java}"/>
  -    <javac srcdir="${src.java}" destdir="${build.java}" optimize="${optimize}" 
debug="on" target="1.3" deprecation="${deprecation}">
  +    <javac srcdir="${src.java}" destdir="${build.java}" optimize="${optimize}" 
debug="on" target="${target.java.version}" deprecation="${deprecation}">
         <include name="**/*.java"/>
         <classpath>
           <path refid="classpath"/>
  @@ -247,7 +248,7 @@
   
     <target name="compile-jorphan" depends="init" description="Compile JOrphan 
utility classes.">
       <mkdir dir="${build.jorphan}"/>
  -    <javac srcdir="${src.jorphan}" destdir="${build.jorphan}" 
optimize="${optimize}" debug="on" target="1.3" deprecation="${deprecation}">
  +    <javac srcdir="${src.jorphan}" destdir="${build.jorphan}" 
optimize="${optimize}" debug="on" target="${target.java.version}" 
deprecation="${deprecation}">
         <include name="**/*.java"/>
         <classpath>
           <path refid="classpath"/>
  
  
  

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

Reply via email to