tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmand...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jk/jkant/java/org/apache/jk/ant/compilers MwccCompiler.java MwldLinker.java
Date Wed, 07 Nov 2001 23:08:58 GMT
mmanders    01/11/07 15:08:58

  Modified:    jk/jkant/java/org/apache/jk/ant/compilers MwccCompiler.java
                        MwldLinker.java
  Log:
  Modified to set a "netware" property if this compiler/linker is being used.  Added support
for generating debug builds.
  
  Revision  Changes    Path
  1.2       +6 -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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MwccCompiler.java	2001/11/07 15:23:28	1.1
  +++ MwccCompiler.java	2001/11/07 23:08:58	1.2
  @@ -64,7 +64,7 @@
   import java.util.*;
   
   /**
  - *  Compile using libtool.
  + *  Compile using MetroWerks.
    * 
    *  It extends SoTask so we can debug it or use it independently of <so>.
    *  For normal use you should use the generic task, and system-specific
  @@ -82,7 +82,9 @@
   
       public void setSoTask(SoTask so ) {
           this.so=so;
  +        so.setExtension(".nlm");
           so.duplicateTo( this );
  +        project.setProperty("netware", "true");
       }
   
       public void execute() throws BuildException {
  @@ -142,6 +144,9 @@
                   localCflags+=" " + extra_cflags;
               }
           }
  +
  +        if (optG)
  +            localCflags += " -g";
   
           // create a cc.opt file 
           PrintWriter ccpw = null;
  
  
  
  1.2       +17 -9     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MwldLinker.java	2001/11/07 15:23:28	1.1
  +++ MwldLinker.java	2001/11/07 23:08:58	1.2
  @@ -78,7 +78,9 @@
   
       public void setSoTask(SoTask so ) {
           this.so=so;
  +        so.setExtension(".nlm");
           so.duplicateTo( this );
  +        project.setProperty("netware", "true");
       }
   
       public void execute() throws BuildException {
  @@ -86,12 +88,6 @@
           link(this.srcList);
       }
   
  -    protected static GlobPatternMapper cobj_mapper=new GlobPatternMapper();
  -    static {
  -	cobj_mapper.setFrom("*.c");
  -	cobj_mapper.setTo("*.obj");
  -    }
  -
       /** Link using libtool.
        */
       public boolean link(String srcList[]) throws BuildException {
  @@ -128,6 +124,15 @@
               linkOptPw.println("-map " + soFile + ".map");
               linkOptPw.println("-threadname \"Tomcat JKThread\"");
               linkOptPw.println("-stacksize 64000");
  +
  +            // add debug information in if requested
  +            if (optG)
  +            {
  +                linkOptPw.println("-g");
  +                linkOptPw.println("-sym internal");
  +                linkOptPw.println("-sym codeview4");
  +                linkOptPw.println("-osym " + soFile + ".NCV");
  +            }
               // add the default startup code to the list of objects
               linkOptPw.println(libBase + "\\lib\\nwpre.obj");
   
  @@ -144,16 +149,18 @@
               // write the dependant modules to the .def file
               Enumeration mods = modules.elements();
               while( mods.hasMoreElements() ) {
  -                NLMData mod = (NLMData) mods.nextElement();
  +                JkData mod = (JkData) mods.nextElement();
                   String name = mod.getValue();
  +                if( name==null ) continue;
                   linkDefPw.println("module " + name);
               }
   
               // write the imports to link with to the .def file
               Enumeration imps = imports.elements();
               while( imps.hasMoreElements() ) {
  -                NLMData imp = (NLMData) imps.nextElement();
  +                JkData imp = (JkData) imps.nextElement();
                   String name = imp.getValue();
  +                if( name==null ) continue;
                   if (imp.isFile())
                       linkDefPw.println("Import @" + name);
                   else
  @@ -163,8 +170,9 @@
               // write the exports to link with to the .def file
               Enumeration exps = exports.elements();
               while( exps.hasMoreElements() ) {
  -                NLMData exp = (NLMData) exps.nextElement();
  +                JkData exp = (JkData) exps.nextElement();
                   String name = exp.getValue();
  +                if( name==null ) continue;
                   if (exp.isFile())
                       linkDefPw.println("Export @" + name);
                   else
  
  
  

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