From 4ba4c1e4029bbfd271d362413f4f4b874853763b Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Fri, 2 Oct 2009 15:09:21 +0200 Subject: Added simple test to be run with -Prun-its --- src/main/resources/META-INF/plexus/components.xml | 42 ++++++++++---- .../org/apache/maven/plugin/nar/aol.properties | 64 +++++++++++++++++++++- 2 files changed, 92 insertions(+), 14 deletions(-) (limited to 'src/main/resources') 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 @@ + + @@ -6,22 +25,22 @@ org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping - org.freehep:freehep-nar-plugin:nar-download, - org.freehep:freehep-nar-plugin:nar-system-generate - org.freehep:freehep-nar-plugin:nar-unpack + org.apache.maven.plugins:maven-nar-plugin:nar-download, + org.apache.maven.plugins:maven-nar-plugin:nar-system-generate + org.apache.maven.plugins:maven-nar-plugin:nar-unpack org.apache.maven.plugins:maven-resources-plugin:resources, - org.freehep:freehep-nar-plugin:nar-resources + org.apache.maven.plugins:maven-nar-plugin:nar-resources org.apache.maven.plugins:maven-compiler-plugin:compile, - org.freehep:freehep-nar-plugin:nar-javah - org.freehep:freehep-nar-plugin:nar-compile + org.apache.maven.plugins:maven-nar-plugin:nar-javah + org.apache.maven.plugins:maven-nar-plugin:nar-compile org.apache.maven.plugins:maven-resources-plugin:testResources org.apache.maven.plugins:maven-compiler-plugin:testCompile, - org.freehep:freehep-nar-plugin:nar-testCompile + org.apache.maven.plugins:maven-nar-plugin:nar-testCompile org.apache.maven.plugins:maven-surefire-plugin:test, - org.freehep:freehep-nar-plugin:nar-test - org.freehep:freehep-nar-plugin:nar-package, + org.apache.maven.plugins:maven-nar-plugin:nar-test + org.apache.maven.plugins:maven-nar-plugin:nar-package, org.apache.maven.plugins:maven-jar-plugin:jar - org.freehep:freehep-nar-plugin:nar-integration-test + org.apache.maven.plugins:maven-nar-plugin:nar-integration-test org.apache.maven.plugins:maven-install-plugin:install org.apache.maven.plugins:maven-deploy-plugin:deploy @@ -45,14 +64,13 @@ org.codehaus.plexus.archiver.Archiver nar-library - org.freehep.maven.nar.NarArchiver per-lookup org.codehaus.plexus.archiver.UnArchiver nar-library - org.freehep.maven.nar.NarUnArchiver + org.apache.maven.plugin.nar.NarUnArchiver per-lookup 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++ @@ -378,6 +396,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 # -- cgit v1.2.3