Applied patch for NAR-145

1 files changed, 120 insertions, 120 deletions

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 af35d18..57baf4b 100644
--- a/src/main/resources/org/apache/maven/plugin/nar/aol.properties
+++ b/src/main/resources/org/apache/maven/plugin/nar/aol.properties
@@ -166,34 +166,34 @@ amd64.Windows.icl.executable.extension=exe
 #
 # Windows g++
 #
-x86.Windows.g++.cpp.compiler=g++
-x86.Windows.g++.cpp.defines=Windows
-x86.Windows.g++.cpp.options=-Wall
-x86.Windows.g++.cpp.includes=**/*.cc **/*.cpp **/*.cxx
-x86.Windows.g++.cpp.excludes=
-
-x86.Windows.g++.c.compiler=gcc
-x86.Windows.g++.c.defines=Windows
-x86.Windows.g++.c.options=-Wall
-x86.Windows.g++.c.includes=**/*.c
-x86.Windows.g++.c.excludes=
-
-x86.Windows.g++.fortran.compiler=gfortran
-x86.Windows.g++.fortran.defines=Windows
-x86.Windows.g++.fortran.options=-Wall
-x86.Windows.g++.fortran.includes=**/*.f **/*.for **/*.f90
-x86.Windows.g++.fortran.excludes=
-
-x86.Windows.g++.java.include=include;include/win32
-x86.Windows.g++.java.runtimeDirectory=lib
-
-x86.Windows.g++.lib.prefix=lib
-x86.Windows.g++.shared.prefix=
-x86.Windows.g++.static.extension=a
-x86.Windows.g++.shared.extension=dll
-x86.Windows.g++.plugin.extension=dll
-x86.Windows.g++.jni.extension=dll
-x86.Windows.g++.executable.extension=
+x86.Windows.gpp.cpp.compiler=g++
+x86.Windows.gpp.cpp.defines=Windows
+x86.Windows.gpp.cpp.options=-Wall
+x86.Windows.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx
+x86.Windows.gpp.cpp.excludes=
+
+x86.Windows.gpp.c.compiler=gcc
+x86.Windows.gpp.c.defines=Windows
+x86.Windows.gpp.c.options=-Wall
+x86.Windows.gpp.c.includes=**/*.c
+x86.Windows.gpp.c.excludes=
+
+x86.Windows.gpp.fortran.compiler=gfortran
+x86.Windows.gpp.fortran.defines=Windows
+x86.Windows.gpp.fortran.options=-Wall
+x86.Windows.gpp.fortran.includes=**/*.f **/*.for **/*.f90
+x86.Windows.gpp.fortran.excludes=
+
+x86.Windows.gpp.java.include=include;include/win32
+x86.Windows.gpp.java.runtimeDirectory=lib
+
+x86.Windows.gpp.lib.prefix=lib
+x86.Windows.gpp.shared.prefix=
+x86.Windows.gpp.static.extension=a
+x86.Windows.gpp.shared.extension=dll
+x86.Windows.gpp.plugin.extension=dll
+x86.Windows.gpp.jni.extension=dll
+x86.Windows.gpp.executable.extension=
 
 # FIXME to be removed when NAR-6
 x86.Windows.gcc.static.extension=a
@@ -220,7 +220,7 @@ i386.Linux.gpp.c.excludes=
 
 i386.Linux.gpp.fortran.compiler=gfortran
 i386.Linux.gpp.fortran.defines=Linux GNU_GCC
-i386.Linux.gpp.fortran.options=-Wall 
+i386.Linux.gpp.fortran.options=-Wall
 i386.Linux.gpp.fortran.includes=**/*.f **/*.for **/*.f90
 i386.Linux.gpp.fortran.excludes=
 
@@ -241,7 +241,7 @@ i386.Linux.gcc.shared.extension=so*
 i386.Linux.gcc.plugin.extension=so
 i386.Linux.gcc.jni.extension=so
 
-#i386.Linux.g++.arch.includes=lib/**/*.a lib/**/*.so
+#i386.Linux.gpp.arch.includes=lib/**/*.a lib/**/*.so
 
 #
 # Linux icc (C linker)
@@ -417,14 +417,14 @@ amd64.Linux.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx
 amd64.Linux.gpp.cpp.excludes=
 
 amd64.Linux.gpp.c.compiler=gcc
-amd64.Linux.gpp.c.defines=Linux GNU_GCC 
+amd64.Linux.gpp.c.defines=Linux GNU_GCC
 amd64.Linux.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC
 amd64.Linux.gpp.c.includes=**/*.c
 amd64.Linux.gpp.c.excludes=
 
 amd64.Linux.gpp.fortran.compiler=gfortran
 amd64.Linux.gpp.fortran.defines=Linux GNU_GCC
-amd64.Linux.gpp.fortran.options=-Wall 
+amd64.Linux.gpp.fortran.options=-Wall
 amd64.Linux.gpp.fortran.includes=**/*.f **/*.for **/*.f90
 amd64.Linux.gpp.fortran.excludes=
 
@@ -445,41 +445,41 @@ amd64.Linux.gcc.shared.extension=so*
 amd64.Linux.gcc.plugin.extension=so
 amd64.Linux.gcc.jni.extension=so
 
-#amd64.Linux.g++.arch.includes=lib/**/*.a lib/**/*.so
+#amd64.Linux.gpp.arch.includes=lib/**/*.a lib/**/*.so
 
 #
 # MacOSX ("Mac OS X" => MacOSX) PowerPC
 #
 ppc.MacOSX.linker=g++
 
-ppc.MacOSX.g++.cpp.compiler=g++
-ppc.MacOSX.g++.cpp.defines=Darwin GNU_GCC 
-ppc.MacOSX.g++.cpp.options=-Wall -Wno-long-long -Wpointer-arith
-ppc.MacOSX.g++.cpp.includes=**/*.cc **/*.cpp **/*.cxx **/*.mm
-ppc.MacOSX.g++.cpp.excludes=
-
-ppc.MacOSX.g++.c.compiler=gcc
-ppc.MacOSX.g++.c.defines=Darwin GNU_GCC
-ppc.MacOSX.g++.c.options=-Wall -Wno-long-long -Wpointer-arith
-ppc.MacOSX.g++.c.includes=**/*.c **/*.m
-ppc.MacOSX.g++.c.excludes=
-
-ppc.MacOSX.g++.fortran.compiler=gfortran
-ppc.MacOSX.g++.fortran.defines=Darwin GNU_GCC 
-ppc.MacOSX.g++.fortran.options=-Wall -fno-automatic -fno-second-underscore
-ppc.MacOSX.g++.fortran.includes=**/*.f **/*.for **/*.f90
-ppc.MacOSX.g++.fortran.excludes=
-
-ppc.MacOSX.g++.java.include=include
-ppc.MacOSX.g++.java.runtimeDirectory=IGNORED
-
-ppc.MacOSX.g++.lib.prefix=lib
-ppc.MacOSX.g++.shared.prefix=lib
-ppc.MacOSX.g++.static.extension=a
-ppc.MacOSX.g++.shared.extension=dylib
-ppc.MacOSX.g++.plugin.extension=bundle
-ppc.MacOSX.g++.jni.extension=jnilib
-ppc.MacOSX.g++.executable.extension=
+ppc.MacOSX.gpp.cpp.compiler=g++
+ppc.MacOSX.gpp.cpp.defines=Darwin GNU_GCC
+ppc.MacOSX.gpp.cpp.options=-Wall -Wno-long-long -Wpointer-arith
+ppc.MacOSX.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx **/*.mm
+ppc.MacOSX.gpp.cpp.excludes=
+
+ppc.MacOSX.gpp.c.compiler=gcc
+ppc.MacOSX.gpp.c.defines=Darwin GNU_GCC
+ppc.MacOSX.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith
+ppc.MacOSX.gpp.c.includes=**/*.c **/*.m
+ppc.MacOSX.gpp.c.excludes=
+
+ppc.MacOSX.gpp.fortran.compiler=gfortran
+ppc.MacOSX.gpp.fortran.defines=Darwin GNU_GCC
+ppc.MacOSX.gpp.fortran.options=-Wall -fno-automatic -fno-second-underscore
+ppc.MacOSX.gpp.fortran.includes=**/*.f **/*.for **/*.f90
+ppc.MacOSX.gpp.fortran.excludes=
+
+ppc.MacOSX.gpp.java.include=include
+ppc.MacOSX.gpp.java.runtimeDirectory=IGNORED
+
+ppc.MacOSX.gpp.lib.prefix=lib
+ppc.MacOSX.gpp.shared.prefix=lib
+ppc.MacOSX.gpp.static.extension=a
+ppc.MacOSX.gpp.shared.extension=dylib
+ppc.MacOSX.gpp.plugin.extension=bundle
+ppc.MacOSX.gpp.jni.extension=jnilib
+ppc.MacOSX.gpp.executable.extension=
 
 # FIXME to be removed when NAR-6
 ppc.MacOSX.gcc.static.extension=a
@@ -487,41 +487,41 @@ ppc.MacOSX.gcc.shared.extension=dylib
 ppc.MacOSX.gcc.plugin.extension=bundle
 ppc.MacOSX.gcc.jni.extension=jnilib
 
-#ppc.MacOSX.g++.arch.includes=lib/**/*.a lib/**/*.so lib/**/*.dylib lib/**/*.jnilib
+#ppc.MacOSX.gpp.arch.includes=lib/**/*.a lib/**/*.so lib/**/*.dylib lib/**/*.jnilib
 
 #
 # MacOSX ("Mac OS X" => MacOSX) Intel (32 bits)
 #
 i386.MacOSX.linker=g++
 
-i386.MacOSX.g++.cpp.compiler=g++
-i386.MacOSX.g++.cpp.defines=Darwin GNU_GCC 
-i386.MacOSX.g++.cpp.options=-Wall -Wno-long-long -Wpointer-arith
-i386.MacOSX.g++.cpp.includes=**/*.cc **/*.cpp **/*.cxx **/*.mm
-i386.MacOSX.g++.cpp.excludes=
-
-i386.MacOSX.g++.c.compiler=gcc
-i386.MacOSX.g++.c.defines=Darwin GNU_GCC 
-i386.MacOSX.g++.c.options=-Wall -Wno-long-long -Wpointer-arith
-i386.MacOSX.g++.c.includes=**/*.c **/*.m
-i386.MacOSX.g++.c.excludes=
-
-i386.MacOSX.g++.fortran.compiler=gfortran
-i386.MacOSX.g++.fortran.defines=Darwin GNU_GCC 
-i386.MacOSX.g++.fortran.options=-Wall -fno-automatic -fno-second-underscore
-i386.MacOSX.g++.fortran.includes=**/*.f **/*.for **/*.f90
-i386.MacOSX.g++.fortran.excludes=
-
-i386.MacOSX.g++.java.include=include
-i386.MacOSX.g++.java.runtimeDirectory=IGNORED
-
-i386.MacOSX.g++.lib.prefix=lib
-i386.MacOSX.g++.shared.prefix=lib
-i386.MacOSX.g++.static.extension=a
-i386.MacOSX.g++.shared.extension=dylib
-i386.MacOSX.g++.plugin.extension=bundle
-i386.MacOSX.g++.jni.extension=jnilib
-i386.MacOSX.g++.executable.extension=
+i386.MacOSX.gpp.cpp.compiler=g++
+i386.MacOSX.gpp.cpp.defines=Darwin GNU_GCC
+i386.MacOSX.gpp.cpp.options=-Wall -Wno-long-long -Wpointer-arith
+i386.MacOSX.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx **/*.mm
+i386.MacOSX.gpp.cpp.excludes=
+
+i386.MacOSX.gpp.c.compiler=gcc
+i386.MacOSX.gpp.c.defines=Darwin GNU_GCC
+i386.MacOSX.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith
+i386.MacOSX.gpp.c.includes=**/*.c **/*.m
+i386.MacOSX.gpp.c.excludes=
+
+i386.MacOSX.gpp.fortran.compiler=gfortran
+i386.MacOSX.gpp.fortran.defines=Darwin GNU_GCC
+i386.MacOSX.gpp.fortran.options=-Wall -fno-automatic -fno-second-underscore
+i386.MacOSX.gpp.fortran.includes=**/*.f **/*.for **/*.f90
+i386.MacOSX.gpp.fortran.excludes=
+
+i386.MacOSX.gpp.java.include=include
+i386.MacOSX.gpp.java.runtimeDirectory=IGNORED
+
+i386.MacOSX.gpp.lib.prefix=lib
+i386.MacOSX.gpp.shared.prefix=lib
+i386.MacOSX.gpp.static.extension=a
+i386.MacOSX.gpp.shared.extension=dylib
+i386.MacOSX.gpp.plugin.extension=bundle
+i386.MacOSX.gpp.jni.extension=jnilib
+i386.MacOSX.gpp.executable.extension=
 
 # FIXME to be removed when NAR-6
 i386.MacOSX.gcc.static.extension=a
@@ -529,41 +529,41 @@ i386.MacOSX.gcc.shared.extension=dylib
 i386.MacOSX.gcc.plugin.extension=bundle
 i386.MacOSX.gcc.jni.extension=jnilib
 
-#i386.MacOSX.g++.arch.includes=lib/**/*.a lib/**/*.so lib/**/*.dylib lib/**/*.jnilib
+#i386.MacOSX.gpp.arch.includes=lib/**/*.a lib/**/*.so lib/**/*.dylib lib/**/*.jnilib
 
 #
 # MacOSX ("Mac OS X" => MacOSX) Intel (64 bits)
 #
 x86_64.MacOSX.linker=g++
 
-x86_64.MacOSX.g++.cpp.compiler=g++
-x86_64.MacOSX.g++.cpp.defines=Darwin GNU_GCC 
-x86_64.MacOSX.g++.cpp.options=-Wall -Wno-long-long -Wpointer-arith
-x86_64.MacOSX.g++.cpp.includes=**/*.cc **/*.cpp **/*.cxx **/*.mm
-x86_64.MacOSX.g++.cpp.excludes=
-
-x86_64.MacOSX.g++.c.compiler=gcc
-x86_64.MacOSX.g++.c.defines=Darwin GNU_GCC 
-x86_64.MacOSX.g++.c.options=-Wall -Wno-long-long -Wpointer-arith
-x86_64.MacOSX.g++.c.includes=**/*.c **/*.m
-x86_64.MacOSX.g++.c.excludes=
-
-x86_64.MacOSX.g++.fortran.compiler=gfortran
-x86_64.MacOSX.g++.fortran.defines=Darwin GNU_GCC 
-x86_64.MacOSX.g++.fortran.options=-Wall -fno-automatic -fno-second-underscore
-x86_64.MacOSX.g++.fortran.includes=**/*.f **/*.for **/*.f90
-x86_64.MacOSX.g++.fortran.excludes=
-
-x86_64.MacOSX.g++.java.include=include
-x86_64.MacOSX.g++.java.runtimeDirectory=IGNORED
-
-x86_64.MacOSX.g++.lib.prefix=lib
-x86_64.MacOSX.g++.shared.prefix=lib
-x86_64.MacOSX.g++.static.extension=a
-x86_64.MacOSX.g++.shared.extension=dylib
-x86_64.MacOSX.g++.plugin.extension=bundle
-x86_64.MacOSX.g++.jni.extension=jnilib
-x86_64.MacOSX.g++.executable.extension=
+x86_64.MacOSX.gpp.cpp.compiler=g++
+x86_64.MacOSX.gpp.cpp.defines=Darwin GNU_GCC
+x86_64.MacOSX.gpp.cpp.options=-Wall -Wno-long-long -Wpointer-arith
+x86_64.MacOSX.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx **/*.mm
+x86_64.MacOSX.gpp.cpp.excludes=
+
+x86_64.MacOSX.gpp.c.compiler=gcc
+x86_64.MacOSX.gpp.c.defines=Darwin GNU_GCC
+x86_64.MacOSX.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith
+x86_64.MacOSX.gpp.c.includes=**/*.c **/*.m
+x86_64.MacOSX.gpp.c.excludes=
+
+x86_64.MacOSX.gpp.fortran.compiler=gfortran
+x86_64.MacOSX.gpp.fortran.defines=Darwin GNU_GCC
+x86_64.MacOSX.gpp.fortran.options=-Wall -fno-automatic -fno-second-underscore
+x86_64.MacOSX.gpp.fortran.includes=**/*.f **/*.for **/*.f90
+x86_64.MacOSX.gpp.fortran.excludes=
+
+x86_64.MacOSX.gpp.java.include=include
+x86_64.MacOSX.gpp.java.runtimeDirectory=IGNORED
+
+x86_64.MacOSX.gpp.lib.prefix=lib
+x86_64.MacOSX.gpp.shared.prefix=lib
+x86_64.MacOSX.gpp.static.extension=a
+x86_64.MacOSX.gpp.shared.extension=dylib
+x86_64.MacOSX.gpp.plugin.extension=bundle
+x86_64.MacOSX.gpp.jni.extension=jnilib
+x86_64.MacOSX.gpp.executable.extension=
 
 # FIXME to be removed when NAR-6
 x86_64.MacOSX.gcc.static.extension=a
@@ -571,7 +571,7 @@ x86_64.MacOSX.gcc.shared.extension=dylib
 x86_64.MacOSX.gcc.plugin.extension=bundle
 x86_64.MacOSX.gcc.jni.extension=jnilib
 
-#x86_64.MacOSX.g++.arch.includes=lib/**/*.a lib/**/*.so lib/**/*.dylib lib/**/*.jnilib
+#x86_64.MacOSX.gpp.arch.includes=lib/**/*.a lib/**/*.so lib/**/*.dylib lib/**/*.jnilib
 
 Here is the AOL for x86_64-MacOSX-icpc, pretty simple without any default compiler options, works for me ... if i make further changes or add new stuff i will let you know ...