diff options
| author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-25 22:28:55 +0100 |
|---|---|---|
| committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-25 22:28:55 +0100 |
| commit | e38d012eb2885c08b67ede65cbce13d8f8ea9f93 (patch) | |
| tree | 9b8aa1fe8a2f0a406b8b5e0aba28e9f13690a172 | |
| parent | c2c0d9ade4c219650ca7885a20e859f96bc2ba4e (diff) | |
| download | cpptasks-parallel-e38d012eb2885c08b67ede65cbce13d8f8ea9f93.tar.gz cpptasks-parallel-e38d012eb2885c08b67ede65cbce13d8f8ea9f93.tar.bz2 cpptasks-parallel-e38d012eb2885c08b67ede65cbce13d8f8ea9f93.tar.xz cpptasks-parallel-e38d012eb2885c08b67ede65cbce13d8f8ea9f93.zip | |
Fixed NAR-108
6 files changed, 11 insertions, 1 deletions
@@ -4,6 +4,7 @@ Modified version of ant contrib cpptasks, used in the freehep/maven-nar-plugin. * cpptasks-1.0-beta-5-parallel-1-SNAPSHOT +- added .f90 as extension for the fortran compiler, see NAR-108 - merged with cpptasks-1.0b5.tar.gz - See NAR-103 for tests that have been changed diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java index 3497aaf..33f5018 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java @@ -45,6 +45,7 @@ public final class GccCCompiler extends GccCompatibleCCompiler { ".ii", /* preprocessed C++ */ ".f", /* FORTRAN */ ".for", /* FORTRAN */ + ".f90", /* FORTRAN 90 */ ".m", /* Objective-C */ ".mm", /* Objected-C++ */ ".s" /* Assembly */ diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java index fc7bbfc..0fce11b 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/GccCompatibleCCompiler.java @@ -34,7 +34,7 @@ public abstract class GccCompatibleCCompiler extends CommandLineCCompiler { private final static String[] headerExtensions = new String[]{".h", ".hpp", ".inl"}; private final static String[] sourceExtensions = new String[]{".c", ".cc", - ".cpp", ".cxx", ".c++", ".i", ".f", ".for"}; + ".cpp", ".cxx", ".c++", ".i", ".f", ".for", ".f90"}; /** * Private constructor. Use GccCCompiler.getInstance() to get singleton * instance of this class. diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java index 86a8ac7..c22a2ae 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/GccCCompiler.java @@ -50,6 +50,7 @@ public final class GccCCompiler extends GccCompatibleCCompiler { ".ii", /* preprocessed C++ */ ".f", /* FORTRAN */ ".for", /* FORTRAN */ + ".f90", /* FORTRAN */ ".m", /* Objective-C */ ".mm", /* Objected-C++ */ ".s" /* Assembly */ diff --git a/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java index 44dd968..d359a8e 100644 --- a/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java +++ b/src/main/java/net/sf/antcontrib/cpptasks/gcc/cross/sparc_sun_solaris2/GccCCompiler.java @@ -46,6 +46,7 @@ public final class GccCCompiler extends GccCompatibleCCompiler { ".ii", /* preprocessed C++ */ ".f", /* FORTRAN */ ".for", /* FORTRAN */ + ".f90", /* FORTRAN 90 */ ".m", /* Objective-C */ ".mm", /* Objected-C++ */ ".s" /* Assembly */ diff --git a/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestGccCCompiler.java b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestGccCCompiler.java index 3abe409..79dc1b2 100644 --- a/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestGccCCompiler.java +++ b/src/test/java/net/sf/antcontrib/cpptasks/gcc/TestGccCCompiler.java @@ -77,4 +77,10 @@ public class TestGccCCompiler extends TestGccCompatibleCCompiler { new File("foo.FoR")); assertTrue(parser instanceof FortranParser); } + public void testCreateFortranParser3() { + Parser parser = GccCCompiler.getInstance().createParser( + new File("foo.f90")); + assertTrue(parser instanceof FortranParser); + } + } |