[Ant-contrib-developers] CVS: cpptasks/src/net/sf/antcontrib/cpptasks/borland BorlandCCompiler.java,1.6,1.7 BorlandLibrarian.java,1.8,1.9 BorlandLinker.java,1.9,1.10 BorlandProcessor.java,1.7,1.8 BorlandResourceCompiler.java,1.6,1.7

[Curt A. <ca...@us...>]

Update of /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/borland
In directory usw-pr-cvs1:/tmp/cvs-serv13651/src/net/sf/antcontrib/cpptasks/borland

Modified Files:
	BorlandCCompiler.java BorlandLibrarian.java BorlandLinker.java 
	BorlandProcessor.java BorlandResourceCompiler.java 
Log Message:
Initial add of untested Sun Forte, IBM Visual Age for AIX, other Intel compilers

Index: BorlandCCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/borland/BorlandCCompiler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BorlandCCompiler.java	3 May 2002 07:32:53 -0000	1.6
--- BorlandCCompiler.java	8 May 2002 07:50:51 -0000	1.7
***************
*** 73,81 ****
      private static final BorlandCCompiler instance = new BorlandCCompiler();
  
-     private String identifier;
- 
      private BorlandCCompiler() {
!       super(new String[] { ".c", ".cc", ".cpp", ".cxx", ".c++" },
!             new String[] { ".h", ".hpp", ".inl" }, ".obj", false );
      }
  
--- 73,79 ----
      private static final BorlandCCompiler instance = new BorlandCCompiler();
  
      private BorlandCCompiler() {
!       super("bcc32", "-?",  new String[] { ".c", ".cc", ".cpp", ".cxx", ".c++" },
!             new String[] { ".h", ".hpp", ".inl" }, ".obj", false, null );
      }
  
***************
*** 85,92 ****
      }
  
-     protected String getCommand() {
-       return "bcc32";
-     }
- 
      protected File[] getEnvironmentIncludePath() {
          return BorlandProcessor.getEnvironmentPath("bcc32",'I',
--- 83,86 ----
***************
*** 110,124 ****
      }
  
-     public String getIdentifier() {
-       if(identifier == null) {
-         identifier = getIdentifier(new String[] { "bcc32", "-?" },"Borland C++ Compiler failure");
-       }
-       return identifier;
-     }
- 
-     public String toString() {
-       return getIdentifier();
-     }
- 
      protected void addImpliedArgs(Vector args,
        boolean debug,
--- 104,107 ----
***************
*** 146,153 ****
      }
  
- 
-     public net.sf.antcontrib.cpptasks.compiler.Compiler[] getCompilers() {
-       return BorlandProcessor.getCompilers();
-     }
  
      public Linker getLinker(LinkType type) {
--- 129,132 ----

Index: BorlandLibrarian.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/borland/BorlandLibrarian.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** BorlandLibrarian.java	3 May 2002 07:32:53 -0000	1.8
--- BorlandLibrarian.java	8 May 2002 07:50:51 -0000	1.9
***************
*** 77,81 ****
  public class BorlandLibrarian extends CommandLineLinker
  {
-     private static String identifier;
      private static final BorlandLibrarian instance = new BorlandLibrarian();
  
--- 77,80 ----
***************
*** 86,90 ****
      private BorlandLibrarian()
      {
!         super(new String[] { ".obj" }, new String[0], ".lib", false);
      }
  
--- 85,90 ----
      private BorlandLibrarian()
      {
!         super("tlib",null,
!           new String[] { ".obj" }, new String[0], ".lib", false, null);
      }
  
***************
*** 99,114 ****
  
  
-     protected String getCommand() {
-       return "tlib";
-     }
      protected String getCommandFileSwitch(String cmdFile) {
        return BorlandProcessor.getCommandFileSwitch(cmdFile);
      }
-     public String getIdentifier() {
-       if(identifier == null) {
-         identifier = getIdentifier(new String[] { "tlib" },"Borland Librarian");
-       }
-       return identifier;
-     }
  
      public int getMaximumCommandLength() {
--- 99,105 ----
***************
*** 132,139 ****
  
      protected void addIncremental(boolean incremental, Vector args) {
-     }
- 
-     public Compiler[] getCompilers() {
-       return BorlandProcessor.getCompilers();
      }
  
--- 123,126 ----

Index: BorlandLinker.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/borland/BorlandLinker.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** BorlandLinker.java	3 May 2002 07:32:53 -0000	1.9
--- BorlandLinker.java	8 May 2002 07:50:51 -0000	1.10
***************
*** 82,91 ****
          new BorlandLinker(".dll");
  
-     private static String identifier;
- 
      private BorlandLinker(String outputSuffix)
      {
!         super(new String[] { ".obj", ".lib",".res" },
!           new String[] { ".map", ".pdb", ".lnk" }, outputSuffix, false);
      }
  
--- 82,90 ----
          new BorlandLinker(".dll");
  
      private BorlandLinker(String outputSuffix)
      {
!         super("ilink32", "/bogus", new String[] { ".obj", ".lib",".res" },
!           new String[] { ".map", ".pdb", ".lnk" }, outputSuffix,
!           false, null);
      }
  
***************
*** 141,152 ****
      }
  
-     public net.sf.antcontrib.cpptasks.compiler.Compiler[] getCompilers() {
-       return BorlandProcessor.getCompilers();
-     }
- 
-     protected String getCommand() {
-       return "ilink32";
-     }
- 
      protected String getStartupObject(LinkType linkType) {
        if(linkType.isSharedLibrary()) {
--- 140,143 ----
***************
*** 175,185 ****
          args.addElement("/Tpd");
        }
-     }
- 
-     public String getIdentifier() {
-       if(identifier == null) {
-         identifier = getIdentifier(new String[] { "ilink32", "/bogus" },"Borland Linker failure");
-       }
-       return identifier;
      }
  
--- 166,169 ----

Index: BorlandProcessor.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/borland/BorlandProcessor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BorlandProcessor.java	3 May 2002 07:32:53 -0000	1.7
--- BorlandProcessor.java	8 May 2002 07:50:51 -0000	1.8
***************
*** 207,217 ****
      }
  
-     public static net.sf.antcontrib.cpptasks.compiler.Compiler[] getCompilers() {
-       Compiler[] compilers = new Compiler[] {
-       	BorlandCCompiler.getInstance(),
-       	BorlandResourceCompiler.getInstance() };
-       return compilers;
-     }
- 
      public static String[] getLibraryPatterns(String[] libnames) {
        StringBuffer buf = new StringBuffer();
--- 207,210 ----

Index: BorlandResourceCompiler.java
===================================================================
RCS file: /cvsroot/ant-contrib/cpptasks/src/net/sf/antcontrib/cpptasks/borland/BorlandResourceCompiler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BorlandResourceCompiler.java	3 May 2002 07:32:53 -0000	1.6
--- BorlandResourceCompiler.java	8 May 2002 07:50:51 -0000	1.7
***************
*** 76,84 ****
        new BorlandResourceCompiler();
  
-     private String identifier;
- 
      private BorlandResourceCompiler() {
!       super(new String[] { ".rc" },
!             new String[] { ".h", ".hpp", ".inl" } , ".res", false);
      }
  
--- 76,84 ----
        new BorlandResourceCompiler();
  
      private BorlandResourceCompiler() {
!       super("brc32", "c:\\__bogus\\__bogus.rc" ,
!             new String[] { ".rc" },
!             new String[] { ".h", ".hpp", ".inl" } , ".res",
!             false, null);
      }
  
***************
*** 118,125 ****
  
  
-     protected String getCommand() {
-       return "brc32";
-     }
- 
      protected File[] getEnvironmentIncludePath() {
        return BorlandProcessor.getEnvironmentPath("brc32",'i',
--- 118,121 ----
***************
*** 158,171 ****
  
  
-     public String getIdentifier() {
-       if(identifier == null) {
-         identifier = getIdentifier(new String[] { "brc32", "c:\\__bogus\\__bogus.rc" },"Borland Resource Compiler failure");
-       }
-       return identifier;
-     }
- 
-     public String toString() {
-       return getIdentifier();
-     }
  
      protected void addImpliedArgs(Vector args,
--- 154,157 ----
***************
*** 180,187 ****
      }
  
- 
-     public Compiler[] getCompilers() {
-       return BorlandProcessor.getCompilers();
-     }
  
      public Linker getLinker(LinkType type) {
--- 166,169 ----