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/native2 build.properties.sample
Date Thu, 20 Dec 2001 19:30:26 GMT
costin      01/12/20 11:30:26

  Modified:    jk       build.properties.sample build.xml
  Removed:     jk/native build.properties.sample
               jk/native2 build.properties.sample
  Log:
  Few more changes.
  
  Consolidate all build.properties in the top dir ( so user has to change
   a single file ).
  
  Add 'install' option that will copy the files in tomcat ( for development it's
  faster to use symlinks ).
  
  Added code to detect 4.0/4.1 and build with 4.1 if available.
  
  ( now the compile fails if you have 4.1 detected - comment it
  in build.properties ).
  
  Revision  Changes    Path
  1.9       +20 -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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- build.properties.sample	2001/12/20 17:53:48	1.8
  +++ build.properties.sample	2001/12/20 19:30:25	1.9
  @@ -21,6 +21,7 @@
   apache2.home=/opt/apache2
   apache13.home=/opt/apache13
   iplanet.home=/opt/iplanet6
  +# iplanet.home=d:/tools/sdk/netscape
   
   
   # APR location - by default the version included in Apache2 is used.
  @@ -28,4 +29,23 @@
   apr.include=${apache2.home}/include
   apr.lib=${apache2.home}/lib
   
  +# Compile-time options for native code
  +so.debug=true
  +so.optimize=false
  +so.profile=false
  +
  +# Settings for building NetWare binaries.  Uncomment these and modify for your
  +# environment to build NetWare binaries.
  +#
  +# novellndk.dir=d:/tools/nwsdk
  +# build.compiler.base=d:/tools/mw/6.0
  +# build.compiler.cc=${build.compiler.base}/bin/mwccnlm
  +# build.compiler.ld=${build.compiler.base}/bin/mwldnlm
  +
  +# Settings for building Windows binaries.  Uncomment these and modify for your
  +# environment to build Windows binaries.
  +#
  +# build.compiler.base=c:/Program Files/Microsoft Visual Studio/VC98
  +# build.compiler.cc=${build.compiler.base}/bin/cl
  +# build.compiler.ld=${build.compiler.base}/bin/link
   
  
  
  
  1.19      +70 -40    jakarta-tomcat-connectors/jk/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/build.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- build.xml	2001/12/20 17:53:48	1.18
  +++ build.xml	2001/12/20 19:30:25	1.19
  @@ -23,29 +23,7 @@
   	      location="../../jakarta-tomcat-4.0/build" />
       <property name="tomcat41.home" 
   	      location="../../jakarta-tomcat-4.1/build" />
  -
  -    <path id="build-main.classpath">
  -        <pathelement location="${tomcat40.home}/server/lib/catalina.jar"/>
  -        <pathelement location="${tomcat40.home}/common/lib/servlet.jar"/>
  -        <pathelement location="${tomcat33.home}/lib/common/tomcat_core.jar"/>
  -        <pathelement location="${tomcat33.home}/lib/common/core_util.jar"/>
  -        <pathelement 
  -           location="${tomcat33.home}/lib/container/tomcat_modules.jar"/>
  -        <pathelement 
  -           location="${tomcat33.home}/lib/container/tomcat_util.jar"/>
  -    </path>
  -
  -    <path id="build-tomcat33.classpath">
  -	<pathelement location="${tomcat-util.jar}"/>
  -        <pathelement location="${tomcat33.home}/lib/common/servlet.jar"/>
  -        <pathelement location="${tomcat33.home}/lib/common/tomcat_core.jar"/>
  -        <pathelement location="${tomcat33.home}/lib/common/core_util.jar"/>
  -        <pathelement 
  -           location="${tomcat33.home}/lib/container/tomcat_modules.jar"/> 
  -        <pathelement 
  -           location="${tomcat33.home}/lib/container/tomcat_util.jar"/>
  -   </path>
  - 
  +    
       <!-- ==================== Detection and reports ==================== -->
   
       <target name="report"  >
  @@ -56,29 +34,16 @@
           <echo message="Apache2: ${apache2.detect} ${apache2.home}" />
           <echo message="iPlanet:  ${iplanet.detect} ${iplanet.home}" />
           <echo message="IIS:      ${iis.detect} ${iis.home}" />
  +        <echo message="Using catalina.home:      ${catalina.home}" />
       </target>
  -
  -    <target name="prepare">
  -        <mkdir dir="${jk.build}"/>
  -        <mkdir dir="${jk.build}/WEB-INF"/>
  -        <mkdir dir="${jk.build}/WEB-INF/conf"/>
  -	<mkdir dir="${jk.build}/WEB-INF/classes"/>
  -        <mkdir dir="${jk.build}/WEB-INF/classes/META-INF" />
  -	<mkdir dir="${jk.build}/WEB-INF/lib"/>
  -        <copy file="conf/web.xml" tofile="${jk.build}/WEB-INF/web.xml" />
  -	<copy todir="${jk.build}/WEB-INF" file="interceptors.xml"/>
  -	<copy todir="${jk.build}/WEB-INF/conf" >
  -	    <fileset dir="conf" includes="*" />
  -	</copy>
   
  +    <target name="detect" >
           <available property="tomcat33.detect" 
                      file="${tomcat33.home}/lib/common/tomcat_core.jar" />
           <available property="tomcat40.detect" 
                      file="${tomcat40.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" 
  @@ -89,6 +54,48 @@
                      file="${iplanet.home}" />
       </target>
   
  +    <target name="cpath" depends="guess_catalina40,guess_catalina41" />
  +    <!-- If both 4.0 and 4.1 are present ( developer machine ), use 4.1 jars.
  +         If only 4.0 is present or
  +         If only 4.1 is present - use what's available.
  +     -->
  +
  +    <target name="guess_catalina40" unless="tomcat41.detect">
  +        <property name="catalina.home" 
  +                  location="${tomcat40.home}" />
  +    </target>
  +
  +    <target name="guess_catalina41" if="tomcat41.detect">
  +        <property name="catalina.home" 
  +                  location="${tomcat41.home}" />
  +    </target>
  +
  +    <target name="prepare" depends="detect,cpath" >
  +        <mkdir dir="${jk.build}"/>
  +        <mkdir dir="${jk.build}/WEB-INF"/>
  +        <mkdir dir="${jk.build}/WEB-INF/conf"/>
  +	<mkdir dir="${jk.build}/WEB-INF/classes"/>
  +        <mkdir dir="${jk.build}/WEB-INF/classes/META-INF" />
  +	<mkdir dir="${jk.build}/WEB-INF/lib"/>
  +        <copy file="conf/web.xml" tofile="${jk.build}/WEB-INF/web.xml" />
  +	<copy todir="${jk.build}/WEB-INF" file="interceptors.xml"/>
  +	<copy todir="${jk.build}/WEB-INF/conf" >
  +	    <fileset dir="conf" includes="*" />
  +	</copy>
  +
  +        <path id="build-main.classpath">
  +            <pathelement location="${catalina.home}/server/lib/catalina.jar"/>
  +            <pathelement location="${catalina.home}/common/lib/servlet.jar"/>
  +            <pathelement location="${tomcat33.home}/lib/common/tomcat_core.jar"/>
  +            <pathelement location="${tomcat33.home}/lib/common/core_util.jar"/>
  +            <pathelement 
  +                         location="${tomcat33.home}/lib/container/tomcat_modules.jar"/>
  +            <pathelement 
  +                         location="${tomcat33.home}/lib/container/tomcat_util.jar"/>
  +        </path>
  +
  +    </target>
  +
       <target name="build-main" 
               depends="prepare,report,jkutil,jkjava,jkant" />
   
  @@ -153,7 +160,7 @@
       </target>
   
       <!-- It's better to call it directly with individual tags -->
  -    <target name="native" >
  +    <target name="native" depends="jkant" >
   	<ant  dir="native" antfile="build.xml"  />
   	<ant  dir="native2" antfile="build.xml"  />
       </target>
  @@ -169,7 +176,7 @@
               <fileset dir="${jk.build}" >
                   <include name="WEB-INF/lib/**" />
                   <include name="WEB-INF/conf/**" />
  -                <include name="WEB-INF/*.xml" />
  +                <include name="WEB-INF/interceptors.xml" />
               </fileset>
           </copy>
       </target>
  @@ -183,9 +190,32 @@
       </target>
   
       <target name="install-t41" if="tomcat41.detect" > 
  +        <!-- 4.0 style --> 
  +        <copy todir="${tomcat41.home}/server/lib" 
  +              file="${jk.build}/WEB-INF/lib/tomcat-util.jar"/>
  +        <copy todir="${tomcat41.home}/server/lib" 
  +              file="${jk.build}/WEB-INF/lib/ajp.jar"/>
  +        <echo message="Don't forget to add the connector to ${tomcat41.home}/conf/server.xml"
/>
  +
  +        <!-- 3.3 style -->
  +        <mkdir dir="${tomcat41.home}/server/webapps/jk" />
  +        <copy todir="${tomcat41.home}/server/webapps/jk" >
  +            <fileset dir="${jk.build}" >
  +                <include name="WEB-INF/lib/**" />
  +                <include name="WEB-INF/conf/**" />
  +                <include name="WEB-INF/web.xml" />
  +            </fileset>
  +        </copy>
  +        
  +        <copy file="conf/webapp_41.xml" 
  +              tofile="${tomcat41.home}/webapps/jk.xml" />
       </target>
   
       <target name="install-a20" if="apache2.detect" > 
  +        <!--
  +    <copy file="${jk.build}/WEB-INF/jk/mod_jk.so" 
  +              tofile="${apache2.home}/modules/mod_jk.so" />
  +        -->
       </target>
   
       <target name="install-a13" if="apache13.detect" > 
  
  
  

--
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