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 MwldLinker.java MwccCompiler.java CcCompiler.java
Date Sat, 10 Nov 2001 16:49:16 GMT
costin      01/11/10 08:49:16

  Modified:    jk/jkant/java/org/apache/jk/ant/compilers MwldLinker.java
                        MwccCompiler.java CcCompiler.java
  Log:
  Update to the new API.
  
  Revision  Changes    Path
  1.3       +4 -3      jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java
  
  Index: MwldLinker.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers/MwldLinker.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MwldLinker.java	2001/11/07 23:08:58	1.2
  +++ MwldLinker.java	2001/11/10 16:49:16	1.3
  @@ -90,7 +90,7 @@
   
       /** Link using libtool.
        */
  -    public boolean link(String srcList[]) throws BuildException {
  +    public boolean link(Vector srcList) throws BuildException {
           Commandline cmd = new Commandline();
           File linkOpt = new File(buildDir, "link.opt");
           File linkDef = new File(buildDir, "link.def");
  @@ -137,8 +137,9 @@
               linkOptPw.println(libBase + "\\lib\\nwpre.obj");
   
               // write the objects to link with to the .opt file
  -            for( int i=0; i<srcList.length; i++ ) {
  -                File srcF = (File)project.resolveFile(srcList[i]);
  +            for( int i=0; i<srcList.size(); i++ ) {
  +		Source source=(Source)srcList.elementAt(i);
  +                File srcF = source.getFile();
                   String name=srcF.getName();
                   String targetNA[]=co_mapper.mapFileName( name );
                   if( targetNA!=null )
  
  
  
  1.5       +4 -2      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MwccCompiler.java	2001/11/09 16:44:20	1.4
  +++ MwccCompiler.java	2001/11/10 16:49:16	1.5
  @@ -73,7 +73,7 @@
    *
    * @author Mike Anderson
    */
  -public class MwccCompiler extends BaseCompiler {
  +public class MwccCompiler extends CompilerAdapter {
       
       public MwccCompiler() {
           super();
  @@ -88,7 +88,9 @@
   
       /** Compile  using mwccnlm.
        */
  -    public void compileSingleFile(String source) throws BuildException {
  +    public void compileSingleFile(Source sourceObj) throws BuildException {
  +	File f=sourceObj.getFile();
  +	String source=f.toString();
           String [] includeList = ( includes==null ) ?
               new String[] {} : includes.getIncludePatterns(project);
   
  
  
  
  1.4       +4 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CcCompiler.java	2001/11/09 16:44:20	1.3
  +++ CcCompiler.java	2001/11/10 16:49:16	1.4
  @@ -69,7 +69,7 @@
    *
    * @author Costin Manolache
    */
  -public class CcCompiler extends BaseCompiler {
  +public class CcCompiler extends CompilerAdapter {
       
       public CcCompiler() {
   	super();
  @@ -79,7 +79,9 @@
        *  a 'normal' platform - no need for libtool
        */
   
  -    public void compileSingleFile(String source) throws BuildException {
  +    public void compileSingleFile(Source sourceObj) throws BuildException {
  +	File f=sourceObj.getFile();
  +	String source=f.toString();
   	Commandline cmd = new Commandline();
   
   	String cc=project.getProperty("build.native.cc");
  
  
  

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