Update for bug 1715475. Extended the file types that will be bid on by the CC, aCC, and xlC compilers so that it will include '.s' files.

git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/cpptasks/trunk@139 32d7a393-a5a9-423c-abd3-5d954feb1f2f

3 files changed, 35 insertions, 12 deletions

diff --git a/src/main/java/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java
index e556e6b..b978f67 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/hp/aCCCompiler.java
@@ -1,6 +1,6 @@
 /*
  * 
- * Copyright 2001-2004 The Ant-Contrib project
+ * Copyright 2001-2007 The Ant-Contrib project
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -31,8 +31,13 @@ import org.apache.tools.ant.types.Environment;
  * @author Curt Arnold
  */
 public final class aCCCompiler extends GccCompatibleCCompiler {
-    private static final aCCCompiler instance = new aCCCompiler("aCC", false,
-            null);
+    private final static String[] headerExtensions = new String[]{".h", ".hpp",
+            ".inl"};
+    private final static String[] sourceExtensions = new String[]{".c", ".cc",
+            ".cxx", ".cpp", ".c++", ".i", ".s"};
+    
+    private static final aCCCompiler instance = new aCCCompiler("aCC", 
+            sourceExtensions, headerExtensions, false, null);
     /**
      * Gets singleton instance of this class
      */
@@ -45,8 +50,11 @@ public final class aCCCompiler extends GccCompatibleCCompiler {
      * Private constructor. Use GccCCompiler.getInstance() to get singleton
      * instance of this class.
      */
-    private aCCCompiler(String command, boolean newEnvironment, Environment env) {
-        super(command, "-help", false, null, newEnvironment, env);
+    private aCCCompiler(String command, String[] sourceExtensions, 
+            String[] headerExtensions, boolean newEnvironment, 
+            Environment env) {
+        super(command, "-help", sourceExtensions, headerExtensions, false, 
+                null, newEnvironment, env);
     }
     public void addImpliedArgs(Vector args, boolean debug,
             boolean multithreaded, boolean exceptions, LinkType linkType,
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java
index 56b7674..781b6de 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/ibm/VisualAgeCCompiler.java
@@ -30,8 +30,13 @@ import org.apache.tools.ant.types.Environment;
  * @author Curt Arnold
  */
 public final class VisualAgeCCompiler extends GccCompatibleCCompiler {
+    private final static String[] headerExtensions = new String[]{".h", ".hpp",
+            ".inl"};
+    private final static String[] sourceExtensions = new String[]{".c", ".cc",
+            ".cxx", ".cpp", ".i", ".s"};
+    
     private static final VisualAgeCCompiler instance = new VisualAgeCCompiler(
-            "xlC", false, null);
+            "xlC", sourceExtensions, headerExtensions, false, null);
     /**
      * Gets singleton instance of this class
      */
@@ -44,9 +49,11 @@ public final class VisualAgeCCompiler extends GccCompatibleCCompiler {
      * Private constructor. Use getInstance() to get singleton instance of this
      * class.
      */
-    private VisualAgeCCompiler(String command, boolean newEnvironment,
+    private VisualAgeCCompiler(String command, String[] sourceExtensions, 
+            String[] headerExtensions, boolean newEnvironment, 
             Environment env) {
-        super(command, "-help", false, null, newEnvironment, env);
+        super(command, "-help", sourceExtensions, headerExtensions, false, 
+                null, newEnvironment, env);
     }
     public void addImpliedArgs(final Vector args, 
     		final boolean debug,
diff --git a/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
index 2c37eff..2212871 100644
--- a/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
+++ b/src/main/java/net/sf/antcontrib/cpptasks/sun/ForteCCCompiler.java
@@ -1,6 +1,6 @@
 /*
  * 
- * Copyright 2001-2004 The Ant-Contrib project
+ * Copyright 2001-2007 The Ant-Contrib project
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -29,7 +29,13 @@ import net.sf.antcontrib.cpptasks.OptimizationEnum;
  * @author Curt Arnold
  */
 public final class ForteCCCompiler extends GccCompatibleCCompiler {
-    private static final ForteCCCompiler instance = new ForteCCCompiler("CC");
+    private final static String[] headerExtensions = new String[]{".h", ".hpp",
+            ".inl"};
+    private final static String[] sourceExtensions = new String[]{".c", ".cc",
+            ".cxx", ".cpp", ".c++", ".i", ".s"};
+    
+    private static final ForteCCCompiler instance = new ForteCCCompiler("CC", 
+            sourceExtensions, headerExtensions);
     /**
      * Gets singleton instance of this class
      */
@@ -42,8 +48,10 @@ public final class ForteCCCompiler extends GccCompatibleCCompiler {
      * Private constructor. Use ForteCCCompiler.getInstance() to get singleton
      * instance of this class.
      */
-    private ForteCCCompiler(String command) {
-        super(command, "-V", false, null, false, null);
+    private ForteCCCompiler(String command, String[] sourceExtensions, 
+            String[] headerExtensions) {
+        super(command, "-V", sourceExtensions, headerExtensions, false, null, 
+                false, null);
     }
     public void addImpliedArgs(final Vector args, 
     		final boolean debug,