summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--PATCHES5
-rw-r--r--pom.xml17
-rw-r--r--src/net/sf/antcontrib/cpptasks/CompilerEnum.java8
-rw-r--r--src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java12
4 files changed, 35 insertions, 7 deletions
diff --git a/PATCHES b/PATCHES
index 52ed529..744ccfc 100644
--- a/PATCHES
+++ b/PATCHES
@@ -1,5 +1,8 @@
*** Changes marked with FREEHEP.
-cpptasks-20051015-patched-1.0-SNAPSHOT
+cpptasks-20051015-patched-1.1-SNAPSHOT
+- [gcc.GccCCompiler] added gfortran compiler
+- [CompilerEnum] added gfortran compiler
+cpptasks-20051015-patched-1.0
- [DevStudioCompatibleCCompiler] changed /GX into /EHsc (for VC8, and backward compatible with VC7 and VC6).
- [CommandLineLinker] use absolute paths for filenames if they are shorter than relative paths to overcome windows file length limit.
- [gcc.AbstractLdLinker] no -Bstatic for Darwin.
diff --git a/pom.xml b/pom.xml
index bdb6287..55e35c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<groupId>net.sf.antcontrib</groupId>
<artifactId>cpptasks</artifactId>
<name>CPPTasks (modified)</name>
- <version>20051015-patched-1.0</version>
+ <version>20051015-patched-1.1-SNAPSHOT</version>
<description>Library to call native compilers and linkers.</description>
<url>http://java.freehep.org/</url>
@@ -26,11 +26,12 @@
<repository>
<id>freehep-maven</id>
<name>FreeHEP Maven Repository</name>
- <url>sftp://svn.freehep.org/nfs/slac/g/jas/maven2</url>
+ <url>scp://svn.freehep.org/nfs/slac/g/jas/maven2</url>
</repository>
</distributionManagement>
<build>
+ <defaultGoal>install</defaultGoal>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
@@ -77,9 +78,9 @@
</dependencies>
</profile>
<profile>
- <id>jdk1.5+</id>
+ <id>jdk1.5</id>
<activation>
- <jdk>1.5+</jdk>
+ <jdk>1.5</jdk>
</activation>
<dependencies>
<dependency>
@@ -96,5 +97,11 @@
<artifactId>ant</artifactId>
<version>1.6.5</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-</project> \ No newline at end of file
+</project>
diff --git a/src/net/sf/antcontrib/cpptasks/CompilerEnum.java b/src/net/sf/antcontrib/cpptasks/CompilerEnum.java
index 105892e..9bfb35b 100644
--- a/src/net/sf/antcontrib/cpptasks/CompilerEnum.java
+++ b/src/net/sf/antcontrib/cpptasks/CompilerEnum.java
@@ -66,7 +66,11 @@ import org.apache.tools.ant.types.EnumeratedAttribute;
* </tr>
* <tr>
* <td>g77</td>
- * <td>GNU FORTRAN compiler</td>
+ * <td>GNU FORTRAN 77 compiler</td>
+ * </tr>
+ * <tr>
+ * <td>gfortran</td>
+ * <td>GNU FORTRAN 95 compiler</td>
* </tr>
* <tr>
* <td>msvc</td>
@@ -186,7 +190,9 @@ public class CompilerEnum extends EnumeratedAttribute {
new ProcessorEnumValue("gcc", GccCCompiler.getInstance()),
new ProcessorEnumValue("g++", GccCCompiler.getGppInstance()),
new ProcessorEnumValue("c++", GccCCompiler.getCppInstance()),
+// FREEHEP
new ProcessorEnumValue("g77", GccCCompiler.getG77Instance()),
+ new ProcessorEnumValue("gfortran", GccCCompiler.getGFortranInstance()),
new ProcessorEnumValue("msvc", DevStudioCCompiler.getInstance()),
new ProcessorEnumValue("bcc", BorlandCCompiler.getInstance()),
new ProcessorEnumValue("msrc", DevStudioResourceCompiler
diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java b/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
index 0881055..49a3e35 100644
--- a/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
+++ b/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java
@@ -59,6 +59,11 @@ public final class GccCCompiler extends GccCompatibleCCompiler {
sourceExtensions, headerExtensions, false,
new GccCCompiler("g77", sourceExtensions, headerExtensions, true,
null, false, null), false, null);
+// FREEHEP
+ private static final GccCCompiler gfortranInstance = new GccCCompiler("gfortran",
+ sourceExtensions, headerExtensions, false,
+ new GccCCompiler("gfortran", sourceExtensions, headerExtensions, true,
+ null, false, null), false, null);
private static final GccCCompiler gppInstance = new GccCCompiler("g++",
sourceExtensions, headerExtensions, false,
new GccCCompiler("g++", sourceExtensions, headerExtensions, true,
@@ -79,6 +84,13 @@ public final class GccCCompiler extends GccCompatibleCCompiler {
public static GccCCompiler getG77Instance() {
return g77Instance;
}
+// FREEHEP
+ /**
+ * Gets g95 adapter
+ */
+ public static GccCCompiler getGFortranInstance() {
+ return gfortranInstance;
+ }
/**
* Gets gpp adapter
*/