tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/native build.xml
Date Thu, 20 Dec 2001 00:39:24 GMT
costin      01/12/19 16:39:24

  Modified:    jk       build.properties.sample build.xml
               jk/native build.xml
  Log:
  Few more fixes.
  
  Revision  Changes    Path
  1.7       +2 -0      jakarta-tomcat-connectors/jk/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.properties.sample,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- build.properties.sample	2001/12/20 00:15:43	1.6
  +++ build.properties.sample	2001/12/20 00:39:24	1.7
  @@ -20,6 +20,8 @@
   # Location of Apache2, Apache1.3, Netscape, IIS
   apache2.home=/opt/apache2
   apache13.home=/opt/apache13
  +iplanet.home=/opt/iplanet6
  +
   
   # APR location - by default the version included in Apache2 is used.
   # Don't edit unless you install 'standalone' apr.
  
  
  
  1.17      +22 -9     jakarta-tomcat-connectors/jk/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build.xml	2001/12/20 00:15:43	1.16
  +++ build.xml	2001/12/20 00:39:24	1.17
  @@ -53,7 +53,7 @@
           <echo message="Tomcat4:  ${tomcat4.detect} ${catalina.home}" />
           <echo message="Tomcat41: ${tomcat41.detect} ${tomcat41.home}" />
           <echo message="Apache13: ${apache13.detect} ${apache13.home}" />
  -        <echo message="Apache20: ${apache20.detect} ${apache20.home}" />
  +        <echo message="Apache2: ${apache2.detect} ${apache2.home}" />
           <echo message="iPlanet:  ${iplanet.detect} ${iplanet.home}" />
           <echo message="IIS:      ${iis.detect} ${iis.home}" />
       </target>
  @@ -71,9 +71,22 @@
   	    <fileset dir="conf" includes="*" />
   	</copy>
   
  -        <available property="tomcat33.detect" file="${tomcat33.home}/lib/common/tomcat_core.jar"
/>
  -        <available property="tomcat4.detect" file="${catalina.home}/server/lib/catalina.jar"
/>
  -        <available property="tomcat41.detect" file="${tomcat41.home}/server/webapps"
/>
  +        <available property="tomcat33.detect" 
  +                   file="${tomcat33.home}/lib/common/tomcat_core.jar" />
  +        <available property="tomcat4.detect" 
  +                   file="${catalina.home}/server/lib/catalina.jar" />
  +        <available property="tomcat41.detect" 
  +                   file="${tomcat41.home}/server/webapps" />
  +        <available property="tomcat41.detect" 
  +                   file="${tomcat41.home}/server/webapps" />
  +        <available property="apache13.detect" 
  +                   file="${apache13.home}" />
  +        <available property="apache2.detect" 
  +                   file="${apache2.home}" />
  +        <available property="iis.detect" 
  +                   file="${iis.home}" />
  +        <available property="iplanet.detect" 
  +                   file="${iplanet.home}" />
       </target>
   
       <target name="build-main" 
  @@ -147,19 +160,19 @@
       <target name="install" 
               depends="install-t33,install-t40,install-t41,install-a20,install-a13" />
   
  -    <target name="install-t33" if="tomcat33.detected" > 
  +    <target name="install-t33" if="tomcat33.detect" > 
       </target>
   
  -    <target name="install-t40" if="tomcat40.detected" > 
  +    <target name="install-t40" if="tomcat40.detect" > 
       </target>
   
  -    <target name="install-t41" if="tomcat41.detected" > 
  +    <target name="install-t41" if="tomcat41.detect" > 
       </target>
   
  -    <target name="install-a20" if="apache20.detected" > 
  +    <target name="install-a20" if="apache20.detect" > 
       </target>
   
  -    <target name="install-a13" if="apache13.detected" > 
  +    <target name="install-a13" if="apache13.detect" > 
       </target>
   
       <!-- ================ javadocs =================== -->
  
  
  
  1.24      +29 -14    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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- build.xml	2001/12/20 00:15:43	1.23
  +++ build.xml	2001/12/20 00:39:24	1.24
  @@ -33,19 +33,29 @@
   
     <!-- ==================== Targets ==================== -->
   
  -  <target name="main" depends="init,apache20,jni">
  +  <target name="main" depends="init,apache20,apache13,iis,netscape,jni">
     </target>
   
     <target name="init" >
       <taskdef resource="META-INF/ant.tasks" 
   	     classpathref="cp.jkant" />
  -    <available property="HAVE_APR" file="${apr.include}/apr.h" />
  +    <available property="apache13.detect" 
  +               file="${apache13.home}" />
  +    <available property="apache20.detect" 
  +               file="${apache20.home}" />
  +    <available property="iis.detect" 
  +               file="${iis.home}" />
  +    <available property="iplanet.detect" 
  +               file="${iplanet.home}" />
  +    <available property="HAVE_APR" 
  +               file="${apr.include}/apr.h" />
  +    <mkdir dir="${jk.build}/WEB-INF/jk" />
     </target>
   
     <target name="jni" depends="init">
  -    <mkdir dir="jni/obj" />
  +    <mkdir dir="${jk.build}/WEB-INF/jk/jni" />
       <so sofile="jni_connect" 
  -	buildDir="jni/obj" 
  +	buildDir="${jk.build}/WEB-INF/jk/jni" 
   	optimize="${so.optimize}"
   	debug="${so.debug}"
   	profile="${so.profile}"
  @@ -110,10 +120,10 @@
       </so>
     </target>
   
  -  <target name="apache20" depends="init">
  -    <mkdir dir="apache-2.0/obj" />
  +  <target name="apache20" depends="init" if="apache2.detect">
  +    <mkdir dir="${jk.build}/WEB-INF/jk/apache2" />
       <so sofile="mod_jk" 
  -	buildDir="apache-2.0/obj"
  +	buildDir="${jk.build}/WEB-INF/jk/apache2"
   	optimize="${so.optimize}"
   	debug="${so.debug}"
   	taskDebug="0"
  @@ -167,10 +177,10 @@
     </target>
     
   
  -  <target name="apache13" depends="init">
  -    <mkdir dir="apache-1.3/obj" />
  +  <target name="apache13" depends="init" if="apache13.detect">
  +    <mkdir dir="${jk.build}/WEB-INF/jk/apache13" />
       <so sofile="mod_jk" 
  -	buildDir="apache-1.3/obj"
  +	buildDir="${jk.build}/WEB-INF/jk/apache13"
   	optimize="${so.optimize}"
   	debug="${so.debug}"
   	profile="${so.profile}">
  @@ -244,10 +254,10 @@
       </so>
     </target>
   
  -  <target name="iis" depends="init">
  -    <mkdir dir="iis/obj" />
  +  <target name="iis" depends="init" if="iis.detect">
  +    <mkdir dir="${jk.build}/WEB-INF/jk/iis" />
       <so sofile="isapi_redirector" 
  -        buildDir="iis/obj"
  +        buildDir="${jk.build}/WEB-INF/jk/iis"
           optimize="${so.optimize}"
           debug="${so.debug}"
           profile="${so.profile}">
  @@ -288,8 +298,10 @@
       </so>
     </target>
   
  -  <target name="netscape" depends="init">
  +  <target name="netscape" depends="init" if="iplanet.detect">
       <mkdir dir="netscape/obj" />
  +    <property name="netscape.home" value="${iplanet.home}/plugins" />
  +    <available property="unix" file="/etc/passwd" />
       <so sofile="nsapi_redirector" 
   	buildDir="netscape/obj"
   	optimize="${so.optimize}"
  @@ -324,6 +336,9 @@
   
         <!-- Platform-specific tags -->
         <altSoFile value="nsapi_rd" if="netware" />
  +
  +      <def name="XP_UNIX" if="unix"
  +	   info="Building for unix platform" />
         
         <def name="N_PLAT_NLM" if="netware"
   	   info="Building for NetWare platform" />
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message