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 GcjCompiler.java LibtoolLinker.java
Date Fri, 09 Nov 2001 18:18:18 GMT
costin      01/11/09 10:18:18

  Modified:    jk/jkant/java/org/apache/jk/ant SoTask.java
               jk/jkant/java/org/apache/jk/ant/compilers GcjCompiler.java
                        LibtoolLinker.java
  Log:
  Few fixes.
  
  Revision  Changes    Path
  1.16      +3 -2      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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- SoTask.java	2001/11/09 16:44:20	1.15
  +++ SoTask.java	2001/11/09 18:18:17	1.16
  @@ -409,8 +409,10 @@
   	findSourceFiles();
   	compileList=new Vector();
   
  +	File baseDir=src.getDir( project );
  +	
           for (int i = 0; i < srcList.length; i++) {
  -	    File srcFile = (File)project.resolveFile(srcList[i]);
  +	    File srcFile = new File( baseDir, srcList[i]);
               if (!srcFile.exists()) {
                   throw new BuildException("Source \"" + srcFile.getPath() +
                                            "\" does not exist!", location);
  @@ -516,7 +518,6 @@
       {
   	createStreamHandler();
           Execute exe = new Execute(streamhandler, null);
  -
           exe.setAntRun(project);
   
           exe.setWorkingDirectory(buildDir);
  
  
  
  1.2       +19 -2     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- GcjCompiler.java	2001/11/09 16:44:20	1.1
  +++ GcjCompiler.java	2001/11/09 18:18:18	1.2
  @@ -89,16 +89,33 @@
   
   	cmd.setExecutable( "gcj" );
   	cmd.createArgument().setValue("-c");
  -	cmd.createArgument().setValue("-O2");
   
  +	addDebug(cmd);
  +	addOptimize( cmd );
  +
  +	addIncludes( cmd );
  +	
   	cmd.createArgument().setValue( source );
   	project.log( "Compiling " + source);
  -	
  +
  +	if( debug > 0 )
  +	    project.log( "Command: " + cmd ); 
   	int result=execute( cmd );
   	if( result!=0 ) {
   	    displayError( result, source, cmd );
   	}
   	closeStreamHandler();
       }
  +
  +    protected void addIncludes(Commandline cmd) {
  +	String [] includeList = ( includes==null ) ?
  +	    new String[] {} : includes.getIncludePatterns(project); 
  +	for( int i=0; i<includeList.length; i++ ) {
  +	    cmd.createArgument().setValue("-I");
  +	    cmd.createArgument().setValue(includeList[i] );
  +	}
  +    }
  +
  +
   }
   
  
  
  
  1.3       +5 -1      jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/LibtoolLinker.java
  
  Index: LibtoolLinker.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/LibtoolLinker.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LibtoolLinker.java	2001/11/02 21:13:10	1.2
  +++ LibtoolLinker.java	2001/11/09 18:18:18	1.3
  @@ -71,7 +71,11 @@
    */
   public class LibtoolLinker extends SoTask implements LinkerAdapter {
       SoTask so;
  -    
  +    protected static GlobPatternMapper lo_mapper=new GlobPatternMapper();
  +    static {
  +	lo_mapper.setFrom("*.c");
  +	lo_mapper.setTo("*.lo");
  +    }
       public LibtoolLinker() {
   	so=this;
       };
  
  
  

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