summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-12-08 15:56:59 +0100
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-12-08 15:56:59 +0100
commited40597a6de869bd1634ab6b27baf2c4478c89fa (patch)
tree4e61a189143f66111f983691e116fcbb9fe6acf6 /src/main
parent8984c192a541668463dd099693182415531918f8 (diff)
downloadmaven-nar-plugin-ed40597a6de869bd1634ab6b27baf2c4478c89fa.tar.gz
maven-nar-plugin-ed40597a6de869bd1634ab6b27baf2c4478c89fa.tar.bz2
maven-nar-plugin-ed40597a6de869bd1634ab6b27baf2c4478c89fa.tar.xz
maven-nar-plugin-ed40597a6de869bd1634ab6b27baf2c4478c89fa.zip
Fixed NAR-117
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/Linker.java14
-rw-r--r--src/main/resources/org/apache/maven/plugin/nar/aol.properties68
2 files changed, 82 insertions, 0 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/Linker.java b/src/main/java/org/apache/maven/plugin/nar/Linker.java
index 9b9edcb..dfdea08 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Linker.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Linker.java
@@ -233,6 +233,20 @@ public class Linker
throw new MojoFailureException( "Cannot deduce version number from: " + out );
}
}
+ else if ( name.equals( "icl" ) )
+ {
+ NarUtil.runCommand( "icl", new String[] { "/QV" }, null, null, out, err, dbg );
+ Pattern p = Pattern.compile( "\\d+\\.\\d+" );
+ Matcher m = p.matcher( err.toString() );
+ if ( m.find() )
+ {
+ version = m.group( 0 );
+ }
+ else
+ {
+ throw new MojoFailureException( "Cannot deduce version number from: " + out.toString() );
+ }
+ }
else
{
throw new MojoFailureException( "Cannot find version number for linker '" + name + "'" );
diff --git a/src/main/resources/org/apache/maven/plugin/nar/aol.properties b/src/main/resources/org/apache/maven/plugin/nar/aol.properties
index 5421123..d167255 100644
--- a/src/main/resources/org/apache/maven/plugin/nar/aol.properties
+++ b/src/main/resources/org/apache/maven/plugin/nar/aol.properties
@@ -96,6 +96,74 @@ amd64.Windows.msvc.executable.extension=exe
#amd64.Windows.msvc.arch.includes=lib/**/*.lib lib/**/*.dll
#
+# Windows x86 icl
+#
+x86.Windows.icl.cpp.compiler=icl
+x86.Windows.icl.cpp.defines=Windows _WIN32
+x86.Windows.icl.cpp.options=
+x86.Windows.icl.cpp.includes=**/*.cc **/*.cpp **/*.cxx
+x86.Windows.icl.cpp.excludes=
+
+x86.Windows.icl.c.compiler=icl
+x86.Windows.icl.c.defines=Windows _WIN32
+x86.Windows.icl.c.options=
+x86.Windows.icl.c.includes=**/*.c
+x86.Windows.icl.c.excludes=
+
+x86.Windows.icl.fortran.compiler=ifort
+x86.Windows.icl.fortran.defines=Windows _WIN32
+x86.Windows.icl.fortran.options=
+x86.Windows.icl.fortran.includes=**/*.f **/*.for **/*.f90
+x86.Windows.icl.fortran.excludes=
+
+x86.Windows.icl.java.include=include;include/windows
+x86.Windows.icl.java.runtimeDirectory=lib
+
+x86.Windows.icl.lib.prefix=
+x86.Windows.icl.shared.prefix=
+x86.Windows.icl.shared.extension=dll
+x86.Windows.icl.static.extension=lib
+x86.Windows.icl.plugin.extension=dll
+x86.Windows.icl.jni.extension=dll
+x86.Windows.icl.executable.extension=exe
+
+#x86.Windows.icl.arch.includes=lib/**/*.lib lib/**/*.dll
+
+#
+# Windows x64 icl
+#
+amd64.Windows.icl.cpp.compiler=icl
+amd64.Windows.icl.cpp.defines=Windows _WIN64
+amd64.Windows.icl.cpp.options=
+amd64.Windows.icl.cpp.includes=**/*.cc **/*.cpp **/*.cxx
+amd64.Windows.icl.cpp.excludes=
+
+amd64.Windows.icl.c.compiler=icl
+amd64.Windows.icl.c.defines=Windows _WIN64
+amd64.Windows.icl.c.options=
+amd64.Windows.icl.c.includes=**/*.c
+amd64.Windows.icl.c.excludes=
+
+amd64.Windows.icl.fortran.compiler=ifort
+amd64.Windows.icl.fortran.defines=Windows _WIN64
+amd64.Windows.icl.fortran.options=
+amd64.Windows.icl.fortran.includes=**/*.f **/*.for **/*.f90
+amd64.Windows.icl.fortran.excludes=
+
+amd64.Windows.icl.java.include=include;include/windows
+amd64.Windows.icl.java.runtimeDirectory=lib
+
+amd64.Windows.icl.lib.prefix=
+amd64.Windows.icl.shared.prefix=
+amd64.Windows.icl.shared.extension=dll
+amd64.Windows.icl.static.extension=lib
+amd64.Windows.icl.plugin.extension=dll
+amd64.Windows.icl.jni.extension=dll
+amd64.Windows.icl.executable.extension=exe
+
+#amd64.Windows.icl.arch.includes=lib/**/*.lib lib/**/*.dll
+
+#
# Windows g++
#
x86.Windows.g++.cpp.compiler=g++