tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers MwccCompiler.java LibtoolCompiler.java GcjCompiler.java CompilerAdapter.java CcCompiler.java
Date Sun, 11 Nov 2001 01:09:59 GMT
nacho       01/11/10 17:09:59

  Modified:    jk/jkant/java/org/apache/jk/ant/compilers MwccCompiler.java
                        LibtoolCompiler.java GcjCompiler.java
                        CompilerAdapter.java CcCompiler.java
  Log:
  Translated options for debugns and optimkization to CcCompiler,
  and made all cc-like depend on cCCompiler instead of CompilerAdapter
  
  Revision  Changes    Path
  1.6       +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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MwccCompiler.java	2001/11/10 16:49:16	1.5
  +++ MwccCompiler.java	2001/11/11 01:09:59	1.6
  @@ -73,7 +73,7 @@
    *
    * @author Mike Anderson
    */
  -public class MwccCompiler extends CompilerAdapter {
  +public class MwccCompiler extends CcCompiler {
       
       public MwccCompiler() {
           super();
  
  
  
  1.6       +1 -1      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LibtoolCompiler.java	2001/11/10 16:51:06	1.5
  +++ LibtoolCompiler.java	2001/11/11 01:09:59	1.6
  @@ -73,7 +73,7 @@
    *
    * @author Costin Manolache
    */
  -public class LibtoolCompiler extends CompilerAdapter {
  +public class LibtoolCompiler extends CcCompiler {
   
       public LibtoolCompiler() {
   	super();
  
  
  
  1.4       +1 -1      jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/GcjCompiler.java
  
  Index: GcjCompiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/GcjCompiler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- GcjCompiler.java	2001/11/10 16:48:38	1.3
  +++ GcjCompiler.java	2001/11/11 01:09:59	1.4
  @@ -68,7 +68,7 @@
    * 
    * @author Costin Manolache
    */
  -public class GcjCompiler extends CompilerAdapter {
  +public class GcjCompiler extends CcCompiler {
       static GlobPatternMapper co_mapperS=new GlobPatternMapper();
       static {
   	co_mapperS.setFrom("*.java");
  
  
  
  1.5       +1 -26     jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/CompilerAdapter.java
  
  Index: CompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/CompilerAdapter.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CompilerAdapter.java	2001/11/10 16:35:01	1.4
  +++ CompilerAdapter.java	2001/11/11 01:09:59	1.5
  @@ -95,11 +95,7 @@
       }
   
       public GlobPatternMapper getOMapper() {
  -	GlobPatternMapper co_mapper=new GlobPatternMapper();
  -	co_mapper.setFrom("*.c");
  -	co_mapper.setTo("*.o");
  -
  -	return co_mapper;
  +        return null;
       }
   
       public void execute() throws BuildException {
  @@ -179,32 +175,11 @@
       }
   
       protected void addDebug(Commandline cmd) {
  -	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" );
  -	}
       }
   
       protected void addOptimize( Commandline cmd ) {
  -	if( optimize )
  -	    cmd.createArgument().setValue("-O3" );
       }
   
       protected void addProfile( Commandline cmd ) {
  -	if( profile ) {
  -	    cmd.createArgument().setValue("-pg" );
  -	    // bb.in 
  -	    // cmd.createArgument().setValue("-ax" );
  -	}
       }
   }
  
  
  
  1.5       +38 -0     jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/CcCompiler.java
  
  Index: CcCompiler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/CcCompiler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CcCompiler.java	2001/11/10 16:49:16	1.4
  +++ CcCompiler.java	2001/11/11 01:09:59	1.5
  @@ -75,6 +75,14 @@
   	super();
       };
   
  +    public GlobPatternMapper getOMapper() {
  +	GlobPatternMapper co_mapper=new GlobPatternMapper();
  +	co_mapper.setFrom("*.c");
  +	co_mapper.setTo("*.o");
  +
  +	return co_mapper;
  +    }
  +
       /** Compile  using 'standard' gcc flags. This assume a 'current' gcc on
        *  a 'normal' platform - no need for libtool
        */
  @@ -108,5 +116,35 @@
   	}
   	closeStreamHandler();
       }
  +    protected void addDebug(Commandline cmd) {
  +	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" );
  +	}
  +    }
  +    protected void addOptimize( Commandline cmd ) {
  +	if( optimize )
  +	    cmd.createArgument().setValue("-O3" );
  +    }
  +
  +    protected void addProfile( Commandline cmd ) {
  +	if( profile ) {
  +	    cmd.createArgument().setValue("-pg" );
  +	    // bb.in 
  +	    // cmd.createArgument().setValue("-ax" );
  +	}
  +    }
  +
  +
   }
   
  
  
  

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