summaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
authorVikas Rangarajan <vikas@vikas-linux.tva.tvworks.com>2010-03-22 15:48:57 -0700
committerVikas Rangarajan <vikas@vikas-linux.tva.tvworks.com>2010-03-22 15:48:57 -0700
commite8c35d105cf227a9a781ac4aac79dcd0c5024a6b (patch)
treeed979c6ccf8c0a9a5a6ec6ed67ff47242acfeeea /src/main/resources
parent2bb8e535ca23632a4df9ba291709cd1c536d39cd (diff)
downloadmaven-nar-plugin-e8c35d105cf227a9a781ac4aac79dcd0c5024a6b.tar.gz
maven-nar-plugin-e8c35d105cf227a9a781ac4aac79dcd0c5024a6b.tar.bz2
maven-nar-plugin-e8c35d105cf227a9a781ac4aac79dcd0c5024a6b.tar.xz
maven-nar-plugin-e8c35d105cf227a9a781ac4aac79dcd0c5024a6b.zip
Initial merge of local changes with master, main changes :
- New mojo for vcproj generation - Fixed aol to be url-friendly for maven deployments (g++->gpp) - Fail build early if specified include paths do not exist - Only add "include" subdirs of sourcedirs if they exist, to the include path - Removed duplication of source dirs in source path
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/META-INF/plexus/components.xml3
-rw-r--r--src/main/resources/org/apache/maven/plugin/nar/aol.properties116
2 files changed, 60 insertions, 59 deletions
diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml
index aa6d8b2..80850e4 100644
--- a/src/main/resources/META-INF/plexus/components.xml
+++ b/src/main/resources/META-INF/plexus/components.xml
@@ -35,7 +35,8 @@
</generate-resources>
<process-resources>org.apache.maven.plugins:maven-resources-plugin:resources,
org.apache.maven.plugins:maven-nar-plugin:nar-resources,
- org.apache.maven.plugins:maven-nar-plugin:nar-gnu-resources
+ org.apache.maven.plugins:maven-nar-plugin:nar-gnu-resources,
+ org.apache.maven.plugins:maven-nar-plugin:nar-vcproj
</process-resources>
<compile>org.apache.maven.plugins:maven-compiler-plugin:compile,
org.apache.maven.plugins:maven-nar-plugin:nar-javah,
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 08d23c4..85a5cb7 100644
--- a/src/main/resources/org/apache/maven/plugin/nar/aol.properties
+++ b/src/main/resources/org/apache/maven/plugin/nar/aol.properties
@@ -31,13 +31,13 @@ x86.Windows.linker=msvc
x86.Windows.msvc.cpp.compiler=msvc
x86.Windows.msvc.cpp.defines=Windows WIN32
x86.Windows.msvc.cpp.options=
-x86.Windows.msvc.cpp.includes=**/*.cc **/*.cpp **/*.cxx
+x86.Windows.msvc.cpp.includes=**/*.cc **/*.cpp **/*.cxx **/*.h
x86.Windows.msvc.cpp.excludes=
x86.Windows.msvc.c.compiler=msvc
x86.Windows.msvc.c.defines=Windows WIN32
x86.Windows.msvc.c.options=
-x86.Windows.msvc.c.includes=**/*.c
+x86.Windows.msvc.c.includes=**/*.c **/*.h
x86.Windows.msvc.c.excludes=
x86.Windows.msvc.fortran.compiler=df
@@ -206,34 +206,34 @@ x86.Windows.gcc.jni.extension=dll
#
i386.Linux.linker=g++
-i386.Linux.g++.cpp.compiler=g++
-i386.Linux.g++.cpp.defines=Linux GNU_GCC
-i386.Linux.g++.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
-i386.Linux.g++.cpp.includes=**/*.cc **/*.cpp **/*.cxx
-i386.Linux.g++.cpp.excludes=
-
-i386.Linux.g++.c.compiler=gcc
-i386.Linux.g++.c.defines=Linux GNU_GCC
-i386.Linux.g++.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
-i386.Linux.g++.c.includes=**/*.c
-i386.Linux.g++.c.excludes=
-
-i386.Linux.g++.fortran.compiler=gfortran
-i386.Linux.g++.fortran.defines=Linux GNU_GCC
-i386.Linux.g++.fortran.options=-Wall
-i386.Linux.g++.fortran.includes=**/*.f **/*.for **/*.f90
-i386.Linux.g++.fortran.excludes=
-
-i386.Linux.g++.java.include=include;include/linux
-i386.Linux.g++.java.runtimeDirectory=jre/lib/i386/client
-
-i386.Linux.g++.lib.prefix=lib
-i386.Linux.g++.shared.prefix=lib
-i386.Linux.g++.static.extension=a
-i386.Linux.g++.shared.extension=so*
-i386.Linux.g++.plugin.extension=so
-i386.Linux.g++.jni.extension=so
-i386.Linux.g++.executable.extension=
+i386.Linux.gpp.cpp.compiler=g++
+i386.Linux.gpp.cpp.defines=Linux GNU_GCC
+i386.Linux.gpp.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
+i386.Linux.gpp.cpp.includes=**/*.cc **/*.cpp **/*.cxx
+i386.Linux.gpp.cpp.excludes=
+
+i386.Linux.gpp.c.compiler=gcc
+i386.Linux.gpp.c.defines=Linux GNU_GCC
+i386.Linux.gpp.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion
+i386.Linux.gpp.c.includes=**/*.c
+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.includes=**/*.f **/*.for **/*.f90
+i386.Linux.gpp.fortran.excludes=
+
+i386.Linux.gpp.java.include=include;include/linux
+i386.Linux.gpp.java.runtimeDirectory=jre/lib/i386/client
+
+i386.Linux.gpp.lib.prefix=lib
+i386.Linux.gpp.shared.prefix=lib
+i386.Linux.gpp.static.extension=a
+i386.Linux.gpp.shared.extension=so*
+i386.Linux.gpp.plugin.extension=so
+i386.Linux.gpp.jni.extension=so
+i386.Linux.gpp.executable.extension=
# FIXME to be removed when NAR-6
i386.Linux.gcc.static.extension=a
@@ -410,34 +410,34 @@ i386.Linux.ecpc.executable.extension=
#
amd64.Linux.linker=g++
-amd64.Linux.g++.cpp.compiler=g++
-amd64.Linux.g++.cpp.defines=Linux GNU_GCC
-amd64.Linux.g++.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC
-amd64.Linux.g++.cpp.includes=**/*.cc **/*.cpp **/*.cxx
-amd64.Linux.g++.cpp.excludes=
-
-amd64.Linux.g++.c.compiler=gcc
-amd64.Linux.g++.c.defines=Linux GNU_GCC
-amd64.Linux.g++.c.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC
-amd64.Linux.g++.c.includes=**/*.c
-amd64.Linux.g++.c.excludes=
-
-amd64.Linux.g++.fortran.compiler=gfortran
-amd64.Linux.g++.fortran.defines=Linux GNU_GCC
-amd64.Linux.g++.fortran.options=-Wall
-amd64.Linux.g++.fortran.includes=**/*.f **/*.for **/*.f90
-amd64.Linux.g++.fortran.excludes=
-
-amd64.Linux.g++.java.include=include;include/linux
-amd64.Linux.g++.java.runtimeDirectory=jre/lib/amd64/server
-
-amd64.Linux.g++.lib.prefix=lib
-amd64.Linux.g++.shared.prefix=lib
-amd64.Linux.g++.static.extension=a
-amd64.Linux.g++.shared.extension=so*
-amd64.Linux.g++.plugin.extension=so
-amd64.Linux.g++.jni.extension=so
-amd64.Linux.g++.executable.extension=
+amd64.Linux.gpp.cpp.compiler=g++
+amd64.Linux.gpp.cpp.defines=Linux GNU_GCC
+amd64.Linux.gpp.cpp.options=-Wall -Wno-long-long -Wpointer-arith -Wconversion -fPIC
+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.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.includes=**/*.f **/*.for **/*.f90
+amd64.Linux.gpp.fortran.excludes=
+
+amd64.Linux.gpp.java.include=include;include/linux
+amd64.Linux.gpp.java.runtimeDirectory=jre/lib/amd64/server
+
+amd64.Linux.gpp.lib.prefix=lib
+amd64.Linux.gpp.shared.prefix=lib
+amd64.Linux.gpp.static.extension=a
+amd64.Linux.gpp.shared.extension=so
+amd64.Linux.gpp.plugin.extension=so
+amd64.Linux.gpp.jni.extension=so
+amd64.Linux.gpp.executable.extension=
# FIXME to be removed when NAR-6
amd64.Linux.gcc.static.extension=a