costin      01/11/02 13:21:24

  Modified:    jk/native build.xml
  Added:       jk/native build.properties.sample
  Log:
  Added 'jakarta-style' build.properties.
  
  Added debug, optimize and profile options to the <so> task.
  
  XXX we need a better name, <so> is too unix specific.
  
  Revision  Changes    Path
  1.7       +29 -6     jakarta-tomcat-connectors/jk/native/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/build.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.xml 2001/10/30 21:06:39     1.6
  +++ build.xml 2001/11/02 21:21:24     1.7
  @@ -1,7 +1,11 @@
   <?xml version="1.0" ?>
   
   <project name="jk_native" default="main" basedir=".">
  -
  +  
  +  <property file="${user.home}/.ant.properties" />
  +  <property file="${user.home}/build.properties" />
  +  <property file="build.properties" />
  +    
     <!-- Experimental -->
   
     <path id="jkant" >
  @@ -12,9 +16,15 @@
     <property name="native.dir" location="." />
     <property name="apxs13" value="/usr/sbin/apxs" />
     <property name="apxs20" value="/opt/apache2/bin/apxs" />
  -
  +  
     <property name="apache2.home" location="/opt/apache2" />
     <property name="apache13.home" location="/usr" />
  +  
  +  <property name="so.debug" value="true" />
  +  <property name="so.optimize" value="false" />
  +  <property name="so.profile" value="false" />
  +
  +  <!-- ==================== Targets ==================== -->
   
     <target name="main" depends="init,apache20,jni">
     </target>
  @@ -25,7 +35,12 @@
     </target>
   
     <target name="jni" >
  -    <so sofile="jni_connect" buildDir="jni" >
  +    <so sofile="jni_connect" 
  +     buildDir="jni" 
  +     optimize="${so.optimize}"
  +     debug="${so.debug}"
  +     profile="${so.profile}"
  +     >
         <jniConfig />
         <src dir="${native.dir}">
        <include name="jni/*.c" />
  @@ -45,7 +60,11 @@
     </target>
   
     <target name="apache20" >
  -    <so sofile="mod_jk" buildDir="apache-2.0">
  +    <so sofile="mod_jk" 
  +     buildDir="apache-2.0"
  +     optimize="${so.optimize}"
  +     debug="${so.debug}"
  +     profile="${so.profile}" >
         <def name="CHUNK_SIZE" value="4096" 
           info="Read/Write buffer size" />
         <def name="REUSE_WORKER" 
  @@ -70,7 +89,11 @@
     </target>
   
     <target name="apache13">
  -    <so sofile="mod_jk" buildDir="apache-1.3">
  +    <so sofile="mod_jk" 
  +     buildDir="apache-1.3"
  +     optimize="${so.optimize}"
  +     debug="${so.debug}"
  +     profile="${so.profile}">
         <apacheConfig apxs="${apxs13}" />
         <src dir=".">
        <include name="apache-1.3/mod_jk.c" />
  @@ -100,4 +123,4 @@
       </delete>
     </target>
   
  -</project>
  \ No newline at end of file
  +</project>
  
  
  
  1.1                  jakarta-tomcat-connectors/jk/native/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  
  # Location where Apache2.0 is installed. 
  # We assume include and lib are below this
  apache2.home=/opt/apache2
  
  # Same for Apache1.3
  apache13.home=/usr
    
  # Compile-time options
  so.debug=true
  so.optimize=false
  so.profile=false
  
  
  

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

Reply via email to