summaryrefslogtreecommitdiff
path: root/src/main/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/resources')
-rw-r--r--src/main/resources/META-INF/plexus/components.xml42
-rw-r--r--src/main/resources/org/apache/maven/plugin/nar/aol.properties64
2 files changed, 92 insertions, 14 deletions
diff --git a/src/main/resources/META-INF/plexus/components.xml b/src/main/resources/META-INF/plexus/components.xml
index a857d5d..fc35483 100644
--- a/src/main/resources/META-INF/plexus/components.xml
+++ b/src/main/resources/META-INF/plexus/components.xml
@@ -1,3 +1,22 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
<component-set>
<components>
<component>
@@ -6,22 +25,22 @@
<implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
<configuration>
<phases>
- <generate-sources>org.freehep:freehep-nar-plugin:nar-download,
- org.freehep:freehep-nar-plugin:nar-system-generate</generate-sources>
- <process-sources>org.freehep:freehep-nar-plugin:nar-unpack</process-sources>
+ <generate-sources>org.apache.maven.plugins:maven-nar-plugin:nar-download,
+ org.apache.maven.plugins:maven-nar-plugin:nar-system-generate</generate-sources>
+ <process-sources>org.apache.maven.plugins:maven-nar-plugin:nar-unpack</process-sources>
<process-resources>org.apache.maven.plugins:maven-resources-plugin:resources,
- org.freehep:freehep-nar-plugin:nar-resources</process-resources>
+ org.apache.maven.plugins:maven-nar-plugin:nar-resources</process-resources>
<compile>org.apache.maven.plugins:maven-compiler-plugin:compile,
- org.freehep:freehep-nar-plugin:nar-javah</compile>
- <process-classes>org.freehep:freehep-nar-plugin:nar-compile</process-classes>
+ org.apache.maven.plugins:maven-nar-plugin:nar-javah</compile>
+ <process-classes>org.apache.maven.plugins:maven-nar-plugin:nar-compile</process-classes>
<process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
<test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile,
- org.freehep:freehep-nar-plugin:nar-testCompile</test-compile>
+ org.apache.maven.plugins:maven-nar-plugin:nar-testCompile</test-compile>
<test>org.apache.maven.plugins:maven-surefire-plugin:test,
- org.freehep:freehep-nar-plugin:nar-test</test>
- <package>org.freehep:freehep-nar-plugin:nar-package,
+ org.apache.maven.plugins:maven-nar-plugin:nar-test</test>
+ <package>org.apache.maven.plugins:maven-nar-plugin:nar-package,
org.apache.maven.plugins:maven-jar-plugin:jar</package>
- <integration-test>org.freehep:freehep-nar-plugin:nar-integration-test</integration-test>
+ <integration-test>org.apache.maven.plugins:maven-nar-plugin:nar-integration-test</integration-test>
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
</phases>
@@ -45,14 +64,13 @@
<component>
<role>org.codehaus.plexus.archiver.Archiver</role>
<role-hint>nar-library</role-hint>
- <implementation>org.freehep.maven.nar.NarArchiver</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
</component>
<component>
<role>org.codehaus.plexus.archiver.UnArchiver</role>
<role-hint>nar-library</role-hint>
- <implementation>org.freehep.maven.nar.NarUnArchiver</implementation>
+ <implementation>org.apache.maven.plugin.nar.NarUnArchiver</implementation>
<instantiation-strategy>per-lookup</instantiation-strategy>
</component>
</components>
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 11a9e61..642ecac 100644
--- a/src/main/resources/org/apache/maven/plugin/nar/aol.properties
+++ b/src/main/resources/org/apache/maven/plugin/nar/aol.properties
@@ -1,8 +1,26 @@
#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+#
# AOL (Architecture-OperatingSystem-Linker) Default Values
#
# @author Mark Donszelmann
-# @version $Id$
#
#
@@ -337,7 +355,7 @@ ppc.MacOSX.gcc.jni.extension=jnilib
#ppc.MacOSX.g++.arch.includes=lib/**/*.a lib/**/*.so lib/**/*.dylib lib/**/*.jnilib
#
-# MacOSX ("Mac OS X" => MacOSX) Intel
+# MacOSX ("Mac OS X" => MacOSX) Intel (32 bits)
#
i386.MacOSX.linker=g++
@@ -379,6 +397,48 @@ i386.MacOSX.gcc.jni.extension=jnilib
#i386.MacOSX.g++.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 -Wconversion
+x86_64.MacOSX.g++.cpp.includes=**/*.cc **/*.cpp **/*.cxx
+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 -Wconversion
+x86_64.MacOSX.g++.c.includes=**/*.c
+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
+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=
+
+# FIXME to be removed when NARPLUGIN-137
+x86_64.MacOSX.gcc.static.extension=a
+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
+
+#
# Solaris
#
sparc.SunOS.linker=CC