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/jkant/java/org/apache/jk/ant/compilers LibtoolCompiler.java MwccCompiler.java
Date Thu, 08 Nov 2001 19:30:31 GMT
costin      01/11/08 11:30:31

  Modified:    jk       build.properties.sample
               jk/native build.xml
               jk/jkant/java/org/apache/jk/ant SoTask.java
               jk/jkant/java/org/apache/jk/ant/compilers
                        LibtoolCompiler.java MwccCompiler.java
  Log:
  Make the includes a PatternSet, this allows if/unless on including ( or not )
  a particular path.
  
  Revision  Changes    Path
  1.4       +3 -3      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.properties.sample	2001/10/26 21:19:34	1.3
  +++ build.properties.sample	2001/11/08 19:30:31	1.4
  @@ -2,7 +2,7 @@
   # sample build.properties for ajp connector.
   # edit to taste...
   #
  -# $Id: build.properties.sample,v 1.3 2001/10/26 21:19:34 costin Exp $
  +# $Id: build.properties.sample,v 1.4 2001/11/08 19:30:31 costin Exp $
   #
   
   # Directory where catalina is installed
  @@ -14,12 +14,12 @@
   #
   # tomcat 4 internals
   #
  -catalina.jar = ../../jakarta-tomcat-4.0/build/server/lib/catalina.jar
  +catalina.jar = ${catalina.home}/server/lib/catalina.jar
   
   #
   # servlet api 2.3
   #
  -servlet.jar = ../../jakarta-servletapi-4/dist/lib/servlet.jar
  +servlet.jar = ${catalina.home}/common/lib/servlet.jar
   
   #
   # utils.
  
  
  
  1.11      +40 -26    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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- build.xml	2001/11/07 23:11:08	1.10
  +++ build.xml	2001/11/08 19:30:31	1.11
  @@ -1,6 +1,8 @@
   <?xml version="1.0" ?>
   
   <project name="jk_native" default="main" basedir=".">
  +
  +  <description>Build the native component of jk.</description>
     
     <property file="${user.home}/.ant.properties" />
     <property file="${user.home}/build.properties" />
  @@ -49,9 +51,9 @@
   	<include name="common/jk_pool.c" />
         </src>
         <includes>
  -	<pathelement location="${native.dir}/common" />
  -	<pathelement location="${java.home}/../include" />
  -	<pathelement location="${apache2.home}/include" />
  +	<include name="${native.dir}/common" />
  +	<include name="${java.home}/../include" />
  +	<include name="${apache2.home}/include" />
         </includes>
         <depends>
   	<fileset dir="${native.dir}/common" includes="*.h" />
  @@ -70,7 +72,8 @@
         <def name="REUSE_WORKER" 
   	   unless="option_no_reuse_worker"
   	   info="Reuse the worker endpoint, using per thread data" />
  -
  +      <def name="USE_APACHE_MD5" 
  +	   info="Use the MD5 implementation that is part of apache2" />
         <apacheConfig apxs="${apxs20}" />
         <jniConfig />
         <src dir=".">
  @@ -78,15 +81,16 @@
   	<include name="common/*.c" />
         </src>
         <includes>
  -	<pathelement location="${native.dir}/common" />
  -	<pathelement location="${apache2.home}/include" />
  -	<pathelement location="${java.home}/../include" />
  +	<include name="${native.dir}/common" />
  +	<include name="${apache2.home}/include" />
  +	<include name="${java.home}/../include" />
         </includes>
         <depends>
   	<fileset dir="${native.dir}/common" includes="*.h" />
         </depends>
       </so>
     </target>
  +  
   
     <target name="apache13" depends="init">
       <so sofile="mod_jk" 
  @@ -95,6 +99,35 @@
   	debug="${so.debug}"
   	profile="${so.profile}">
         <apacheConfig apxs="${apxs13}" />
  +
  +      <src dir=".">
  +	<include name="apache-1.3/mod_jk.c" />
  +	<include name="common/*.c" />
  +        <exclude name="common/jk_jni_worker.c" />
  +        <exclude name="jk_nwmain.c" 
  +		 unless="netware" />
  +      </src>
  +      <includes>
  +	<include name="${native.dir}/common" />
  +	<include name="${build.compiler.base}/include" />
  +	<include name="${apache13.home}/include/apache" />
  +	<include name="${apache13.home}/include" />
  +
  +        <!-- Platform specific includes -->
  +	<include name="${apache13.home}/os/netware" 
  +		 if="netware" />
  +	<include name="${novellndk.dir}/include/nlm" 
  +		 if="netware" />
  +	<include name="${novellndk.dir}/include" 
  +		 if="netware" />
  +	<include name="${novellndk.dir}/include/winsock" 
  +		 if="netware" />
  +      </includes>
  +      <depends>
  +	<fileset dir="${native.dir}/common" includes="*.h" />
  +      </depends>
  +
  +      <!-- Platform-specific tags -->
         <def name="N_PLAT_NLM"
                if="netware"
   	   info="Building for NetWare platform" />
  @@ -107,25 +140,6 @@
         <def name="USE_SPRINTF"
                if="netware"
   	   info="Use the sprintf function to build strings" />
  -      <src dir=".">
  -	<include name="apache-1.3/mod_jk.c" />
  -	<include name="common/*.c" />
  -        <exclude name="common/jk_jni_worker.c" />
  -      </src>
  -      <includes>
  -	<pathelement location="${native.dir}/common" />
  -	<pathelement location="${novellndk.dir}/include/nlm" />
  -	<pathelement location="${novellndk.dir}/include" />
  -	<pathelement location="${build.compiler.base}/include" />
  -	<pathelement location="${native.dir}/common" />
  -	<pathelement location="${apache13.home}/include/apache" />
  -	<pathelement location="${apache13.home}/include" />
  -	<pathelement location="${apache13.home}/os/netware" />
  -	<pathelement location="${novellndk.dir}/include/winsock" />
  -      </includes>
  -      <depends>
  -	<fileset dir="${native.dir}/common" includes="*.h" />
  -      </depends>
         <nlmmodule value="apache" if="netware" />
         <import fileName="${novellndk.dir}/imports/clib.imp" if="netware" />
         <import fileName="${novellndk.dir}/imports/lib0.imp" if="netware" />
  
  
  
  1.14      +3 -3      jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/SoTask.java
  
  Index: SoTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/SoTask.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SoTask.java	2001/11/07 23:07:48	1.13
  +++ SoTask.java	2001/11/08 19:30:31	1.14
  @@ -101,7 +101,7 @@
       protected String apxs;
       // or FileSet ?
       protected FileSet src;
  -    protected Path includes;
  +    protected PatternSet includes;
       protected Path depends;
       protected Path libs;
       protected String module;
  @@ -278,8 +278,8 @@
       /**
        * Include files
        */
  -    public Path createIncludes() {
  -	includes=new Path(project);
  +    public PatternSet createIncludes() {
  +	includes=new PatternSet(); //Path(project);
   	return includes;
       }
   
  
  
  
  1.3       +21 -5     jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/LibtoolCompiler.java
  
  Index: LibtoolCompiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/LibtoolCompiler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LibtoolCompiler.java	2001/11/02 21:13:10	1.2
  +++ LibtoolCompiler.java	2001/11/08 19:30:31	1.3
  @@ -102,7 +102,7 @@
        */
       public void executeLibtoolCompile(String source) throws BuildException {
   	String [] includeList = ( includes==null ) ?
  -	    new String[] {} : includes.list(); 
  +	    new String[] {} : includes.getIncludePatterns(project); 
   
   	Commandline cmd = new Commandline();
   
  @@ -171,15 +171,31 @@
   
   	cmd.createArgument().setValue( "-c" );
   
  -	if( optG )
  +	if( optG ) {
   	    cmd.createArgument().setValue("-g" );
  +	    cmd.createArgument().setValue("-W");
  +	    cmd.createArgument().setValue("-Wall");
  +	    
  +	    cmd.createArgument().setValue("-Wtraditional");
  +	    cmd.createArgument().setValue("-Wredundant-decls");
  +	    cmd.createArgument().setValue("-Wmissing-declarations");
  +	    cmd.createArgument().setValue("-Wmissing-prototypes");
  +	    cmd.createArgument().setValue("-Wconversions");
  +	    cmd.createArgument().setValue("-Wcast-align");
  +
  +	    cmd.createArgument().setValue("-pedantic" );
  +	}
  +	
   	
   	if( optimize )
  -	    cmd.createArgument().setValue("-O2" );
  +	    cmd.createArgument().setValue("-O3" );
   	
  -	if( profile )
  +	if( profile ) {
   	    cmd.createArgument().setValue("-pg" );
  -	
  +	    // bb.in 
  +	    // cmd.createArgument().setValue("-ax" );
  +	}
  +
   	if( localCflags != null )
   	    cmd.createArgument().setLine( localCflags );
   
  
  
  
  1.3       +1 -1      jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwccCompiler.java
  
  Index: MwccCompiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwccCompiler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MwccCompiler.java	2001/11/07 23:08:58	1.2
  +++ MwccCompiler.java	2001/11/08 19:30:31	1.3
  @@ -104,7 +104,7 @@
        */
       public void executeMwccCompile(String source) throws BuildException {
           String [] includeList = ( includes==null ) ?
  -            new String[] {} : includes.list();
  +            new String[] {} : includes.getIncludePatterns(project);
   
           Commandline cmd = new Commandline();
   
  
  
  

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