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/it/executable/pom.xml | 63 +++++++
src/it/executable/src/main/c/Executable.c | 8 +
src/it/it-parent/pom.xml | 58 +++++++
.../maven/plugin/nar/AbstractCompileMojo.java | 1 -
.../maven/plugin/nar/AbstractDependencyMojo.java | 1 -
.../apache/maven/plugin/nar/AbstractNarMojo.java | 1 -
.../maven/plugin/nar/AttachedNarArtifact.java | 1 -
src/main/java/org/apache/maven/plugin/nar/C.java | 1 -
.../java/org/apache/maven/plugin/nar/Compiler.java | 3 +-
src/main/java/org/apache/maven/plugin/nar/Cpp.java | 3 +-
.../org/apache/maven/plugin/nar/Executable.java | 1 -
.../java/org/apache/maven/plugin/nar/Fortran.java | 1 -
.../java/org/apache/maven/plugin/nar/Java.java | 1 -
.../java/org/apache/maven/plugin/nar/Javah.java | 1 -
src/main/java/org/apache/maven/plugin/nar/Lib.java | 1 -
.../java/org/apache/maven/plugin/nar/Library.java | 1 -
.../java/org/apache/maven/plugin/nar/Linker.java | 1 -
.../org/apache/maven/plugin/nar/NarArchiver.java | 1 -
.../org/apache/maven/plugin/nar/NarArtifact.java | 1 -
.../maven/plugin/nar/NarArtifactHandler.java | 1 -
.../apache/maven/plugin/nar/NarAssemblyMojo.java | 1 -
.../apache/maven/plugin/nar/NarCompileMojo.java | 1 -
.../org/apache/maven/plugin/nar/NarConstants.java | 1 -
.../apache/maven/plugin/nar/NarDownloadMojo.java | 1 -
.../java/org/apache/maven/plugin/nar/NarInfo.java | 1 -
.../maven/plugin/nar/NarIntegrationTestMojo.java | 31 ++--
.../org/apache/maven/plugin/nar/NarJavahMojo.java | 1 -
.../org/apache/maven/plugin/nar/NarLogger.java | 1 -
.../org/apache/maven/plugin/nar/NarManager.java | 2 -
.../apache/maven/plugin/nar/NarPackageMojo.java | 1 -
.../apache/maven/plugin/nar/NarResourcesMojo.java | 1 -
.../apache/maven/plugin/nar/NarSystemGenerate.java | 1 -
.../maven/plugin/nar/NarTestCompileMojo.java | 1 -
.../org/apache/maven/plugin/nar/NarTestMojo.java | 1 -
.../org/apache/maven/plugin/nar/NarUnArchiver.java | 1 -
.../org/apache/maven/plugin/nar/NarUnpackMojo.java | 1 -
.../java/org/apache/maven/plugin/nar/NarUtil.java | 1 -
src/main/java/org/apache/maven/plugin/nar/OS.java | 1 -
.../java/org/apache/maven/plugin/nar/SysLib.java | 1 -
.../java/org/apache/maven/plugin/nar/Test.java | 1 -
src/main/resources/META-INF/plexus/components.xml | 42 +++--
.../org/apache/maven/plugin/nar/aol.properties | 64 ++++++-
src/site/apt/HelloWorld.apt | 9 +-
src/site/apt/aol.apt | 110 +++++++++++-
src/site/apt/configuration.apt | 2 +-
src/site/apt/cpptasks.apt | 6 +-
src/site/apt/faq.apt | 2 +-
src/site/apt/intro.apt | 8 +-
src/site/apt/lifecycle.apt | 2 +-
src/site/apt/narDependencies.apt | 2 +-
src/site/apt/narLibrary.apt | 13 +-
src/site/apt/philosophy.apt | 8 +-
src/site/apt/usage.apt | 17 +-
src/site/site.xml | 42 +++--
src/unfiled/performance.txt | 33 ++++
src/xdocs/nar-dependencies.xml | 35 +++-
src/xdocs/properties.xml | 191 +++++++++++----------
57 files changed, 561 insertions(+), 226 deletions(-)
create mode 100644 src/it/executable/pom.xml
create mode 100644 src/it/executable/src/main/c/Executable.c
create mode 100644 src/it/it-parent/pom.xml
create mode 100644 src/unfiled/performance.txt
(limited to 'src')
diff --git a/src/it/executable/pom.xml b/src/it/executable/pom.xml
new file mode 100644
index 0000000..00bf1c8
--- /dev/null
+++ b/src/it/executable/pom.xml
@@ -0,0 +1,63 @@
+
+
+
+
+
+ 4.0.0
+
+
+ org.apache.maven.its.nar
+ it-parent
+ 1.0-SNAPSHOT
+ ../it-parent/pom.xml
+
+
+ executable
+ nar
+
+ Maven NAR Executable Test
+ 1.0-SNAPSHOT
+
+ Simple test executable
+
+ http://maven.apache.org/
+
+
+ true
+
+
+
+ integration-test
+
+
+ maven-nar-plugin
+ true
+
+
+
+ executable
+ true
+
+
+
+
+
+
+
diff --git a/src/it/executable/src/main/c/Executable.c b/src/it/executable/src/main/c/Executable.c
new file mode 100644
index 0000000..d640602
--- /dev/null
+++ b/src/it/executable/src/main/c/Executable.c
@@ -0,0 +1,8 @@
+#include
+
+int main(int argc, char *argv[]) {
+ printf("Helloworld\n");
+ return 0;
+}
+
+
diff --git a/src/it/it-parent/pom.xml b/src/it/it-parent/pom.xml
new file mode 100644
index 0000000..003cca1
--- /dev/null
+++ b/src/it/it-parent/pom.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+ 4.0.0
+ org.apache.maven.its.nar
+ it-parent
+ 1.0-SNAPSHOT
+ pom
+
+
+ 2.0.6
+ UTF-8
+
+
+
+
+ local.central
+ @localRepositoryUrl@
+
+ true
+
+
+ true
+
+
+
+
+
+ local.central
+ @localRepositoryUrl@
+
+ true
+
+
+ true
+
+
+
+
diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractCompileMojo.java b/src/main/java/org/apache/maven/plugin/nar/AbstractCompileMojo.java
index d3ba643..9f182d7 100644
--- a/src/main/java/org/apache/maven/plugin/nar/AbstractCompileMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/AbstractCompileMojo.java
@@ -27,7 +27,6 @@ import org.apache.tools.ant.Project;
/**
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/AbstractCompileMojo.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
*/
public abstract class AbstractCompileMojo extends AbstractDependencyMojo {
diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractDependencyMojo.java b/src/main/java/org/apache/maven/plugin/nar/AbstractDependencyMojo.java
index 230a960..3020938 100644
--- a/src/main/java/org/apache/maven/plugin/nar/AbstractDependencyMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/AbstractDependencyMojo.java
@@ -24,7 +24,6 @@ import org.apache.maven.plugin.MojoFailureException;
/**
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/AbstractDependencyMojo.java c867ab546be1 2007/07/05 21:26:30 duns $
*/
public abstract class AbstractDependencyMojo extends AbstractNarMojo {
diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java b/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java
index eecb322..066d80a 100644
--- a/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/AbstractNarMojo.java
@@ -28,7 +28,6 @@ import org.apache.maven.project.MavenProject;
/**
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/AbstractNarMojo.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
*/
public abstract class AbstractNarMojo extends AbstractMojo implements NarConstants {
diff --git a/src/main/java/org/apache/maven/plugin/nar/AttachedNarArtifact.java b/src/main/java/org/apache/maven/plugin/nar/AttachedNarArtifact.java
index b874295..48c5f52 100644
--- a/src/main/java/org/apache/maven/plugin/nar/AttachedNarArtifact.java
+++ b/src/main/java/org/apache/maven/plugin/nar/AttachedNarArtifact.java
@@ -29,7 +29,6 @@ import org.apache.maven.artifact.versioning.VersionRange;
* NarArtifact with its own type, classifier and artifactHandler.
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/AttachedNarArtifact.java 54f05023f537 2007/07/24 05:44:30 duns $
*/
public class AttachedNarArtifact extends DefaultArtifact {
diff --git a/src/main/java/org/apache/maven/plugin/nar/C.java b/src/main/java/org/apache/maven/plugin/nar/C.java
index f438ba8..9a672f7 100644
--- a/src/main/java/org/apache/maven/plugin/nar/C.java
+++ b/src/main/java/org/apache/maven/plugin/nar/C.java
@@ -23,7 +23,6 @@ package org.apache.maven.plugin.nar;
* C compiler tag
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/C.java 631dc18040bb 2007/07/17 14:21:11 duns $
*/
public class C extends Compiler {
diff --git a/src/main/java/org/apache/maven/plugin/nar/Compiler.java b/src/main/java/org/apache/maven/plugin/nar/Compiler.java
index f95d17b..86c3b88 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Compiler.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Compiler.java
@@ -43,8 +43,7 @@ import org.codehaus.plexus.util.StringUtils;
/**
* Abstract Compiler class
*
- * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Compiler.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
+ * @author Mark Donszelmann
*/
public abstract class Compiler {
diff --git a/src/main/java/org/apache/maven/plugin/nar/Cpp.java b/src/main/java/org/apache/maven/plugin/nar/Cpp.java
index 5d0310d..2926f60 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Cpp.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Cpp.java
@@ -22,8 +22,7 @@ package org.apache.maven.plugin.nar;
/**
* Cpp compiler tag
*
- * @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Cpp.java 631dc18040bb 2007/07/17 14:21:11 duns $
+ * @author Mark Donszelmann
*/
public class Cpp extends Compiler {
public Cpp() {
diff --git a/src/main/java/org/apache/maven/plugin/nar/Executable.java b/src/main/java/org/apache/maven/plugin/nar/Executable.java
index 6261268..c74b24e 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Executable.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Executable.java
@@ -24,7 +24,6 @@ import java.util.List;
/**
*
* @author Mark Donszelmann (Mark.Donszelmann@gmail.com)
- * @version $Id$
*/
public interface Executable {
diff --git a/src/main/java/org/apache/maven/plugin/nar/Fortran.java b/src/main/java/org/apache/maven/plugin/nar/Fortran.java
index b579683..d994c78 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Fortran.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Fortran.java
@@ -23,7 +23,6 @@ package org.apache.maven.plugin.nar;
* Fortran compiler tag
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Fortran.java 0c1f0fc112ac 2007/09/12 18:18:23 duns $
*/
public class Fortran extends Compiler {
diff --git a/src/main/java/org/apache/maven/plugin/nar/Java.java b/src/main/java/org/apache/maven/plugin/nar/Java.java
index 9bdc956..513dc8a 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Java.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Java.java
@@ -35,7 +35,6 @@ import org.apache.maven.plugin.MojoFailureException;
* Java specifications for NAR
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Java.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
*/
public class Java {
diff --git a/src/main/java/org/apache/maven/plugin/nar/Javah.java b/src/main/java/org/apache/maven/plugin/nar/Javah.java
index ecf1bcc..6909846 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Javah.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Javah.java
@@ -45,7 +45,6 @@ import org.codehaus.plexus.util.StringUtils;
* Sets up the javah configuration
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Javah.java eeac31f37379 2007/07/24 04:02:00 duns $
*/
public class Javah {
diff --git a/src/main/java/org/apache/maven/plugin/nar/Lib.java b/src/main/java/org/apache/maven/plugin/nar/Lib.java
index 2969d9f..b501174 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Lib.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Lib.java
@@ -37,7 +37,6 @@ import org.apache.tools.ant.Project;
* Keeps info on a library
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Lib.java eda4d0bbde3d 2007/07/03 16:52:10 duns $
*/
public class Lib {
diff --git a/src/main/java/org/apache/maven/plugin/nar/Library.java b/src/main/java/org/apache/maven/plugin/nar/Library.java
index 9e3c80b..5026d4d 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Library.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Library.java
@@ -27,7 +27,6 @@ import java.util.List;
* Sets up a library to create
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Library.java 19804ec9b6b9 2007/09/04 23:36:51 duns $
*/
public class Library implements Executable {
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 c93464b..253c047 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Linker.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Linker.java
@@ -45,7 +45,6 @@ import org.codehaus.plexus.util.FileUtils;
* Linker tag
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Linker.java 22df3eb318cc 2007/09/06 18:55:15 duns $
*/
public class Linker {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarArchiver.java b/src/main/java/org/apache/maven/plugin/nar/NarArchiver.java
index 2f2c78e..2272f15 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarArchiver.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarArchiver.java
@@ -24,7 +24,6 @@ import org.codehaus.plexus.archiver.zip.AbstractZipArchiver;
/**
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarArchiver.java eda4d0bbde3d 2007/07/03 16:52:10 duns $
*/
public class NarArchiver extends AbstractZipArchiver {
}
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarArtifact.java b/src/main/java/org/apache/maven/plugin/nar/NarArtifact.java
index 38df9f0..0608e56 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarArtifact.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarArtifact.java
@@ -25,7 +25,6 @@ import org.apache.maven.artifact.DefaultArtifact;
/**
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarArtifact.java eda4d0bbde3d 2007/07/03 16:52:10 duns $
*/
public class NarArtifact extends DefaultArtifact {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarArtifactHandler.java b/src/main/java/org/apache/maven/plugin/nar/NarArtifactHandler.java
index 9499481..ec3c269 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarArtifactHandler.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarArtifactHandler.java
@@ -25,7 +25,6 @@ import org.apache.maven.artifact.handler.ArtifactHandler;
/**
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarArtifactHandler.java 76e8ff7ad2b0 2007/07/24 04:15:54 duns $
*/
public class NarArtifactHandler implements ArtifactHandler {
public String getPackaging() {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarAssemblyMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarAssemblyMojo.java
index 7ce7100..ecf82ac 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarAssemblyMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarAssemblyMojo.java
@@ -38,7 +38,6 @@ import org.codehaus.plexus.util.FileUtils;
* @requiresProject
* @requiresDependencyResolution
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarAssemblyMojo.java c867ab546be1 2007/07/05 21:26:30 duns $
*/
public class NarAssemblyMojo extends AbstractDependencyMojo {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
index 3b21612..af66950 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
@@ -50,7 +50,6 @@ import org.codehaus.plexus.util.StringUtils;
* @phase compile
* @requiresDependencyResolution compile
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarCompileMojo.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
*/
public class NarCompileMojo extends AbstractCompileMojo {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarConstants.java b/src/main/java/org/apache/maven/plugin/nar/NarConstants.java
index 0643c78..3eaa127 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarConstants.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarConstants.java
@@ -21,7 +21,6 @@ package org.apache.maven.plugin.nar;
/**
* @author Mark Donszelmann
- * @version $Id$
*/
public interface NarConstants {
public final static String NAR_EXTENSION = "nar";
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarDownloadMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarDownloadMojo.java
index b81caa6..08c5546 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarDownloadMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarDownloadMojo.java
@@ -34,7 +34,6 @@ import org.apache.maven.plugin.MojoFailureException;
* @requiresProject
* @requiresDependencyResolution
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarDownloadMojo.java c867ab546be1 2007/07/05 21:26:30 duns $
*/
public class NarDownloadMojo extends AbstractDependencyMojo {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarInfo.java b/src/main/java/org/apache/maven/plugin/nar/NarInfo.java
index 9deabc9..1074104 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarInfo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarInfo.java
@@ -34,7 +34,6 @@ import org.apache.maven.plugin.logging.Log;
/**
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarInfo.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
*/
public class NarInfo {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java
index 3fadb9c..f3d1d62 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarIntegrationTestMojo.java
@@ -73,16 +73,15 @@ import org.codehaus.plexus.util.StringUtils;
* directories but disable the running of the tests by the
* maven-surefire-plugin.
*
- * @author Jason van Zyl (modified by Mark Donszelmann, noted by FREEHEP)
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarIntegrationTestMojo.java eeac31f37379 2007/07/24 04:02:00 duns $,
- * 2.3 maven repository maven-surefire-plugin
+ * @author Jason van Zyl (modified by Mark Donszelmann, noted by DUNS)
+ * @version 2.3 maven repository maven-surefire-plugin and changes by DUNS
* @requiresDependencyResolution test
* @goal nar-integration-test
* @phase integration-test
*/
-// FREEHEP, changed class name, inheritence, goal and phase
+// DUNS, changed class name, inheritence, goal and phase
public class NarIntegrationTestMojo extends AbstractCompileMojo {
- // FREEHEP added test for JNI module
+ // DUNS added test for JNI module
private boolean testJNIModule() {
for (Iterator i = getLibraries().iterator(); i.hasNext();) {
Library lib = (Library) i.next();
@@ -92,7 +91,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
return false;
}
- // FREEHEP added to get names
+ // DUNS added to get names
/**
* @parameter expression="${project}"
* @readonly
@@ -100,7 +99,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
*/
private MavenProject project;
- // FREEHEP added because of naming conflict
+ // DUNS added because of naming conflict
/**
* Skip running of NAR plugins (any) altogether.
*
@@ -148,7 +147,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
* @parameter expression="${project.build.outputDirectory}"
* @required
*/
- // FREEHEP
+ // DUNS
// private File classesDirectory;
/**
* The directory containing generated test classes of the project being
@@ -225,7 +224,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
* @required
* @readonly
*/
- // FREEHEP removed, already in superclass
+ // DUNS removed, already in superclass
// private ArtifactRepository localRepository;
/**
* List of System properties to pass to the JUnit tests.
@@ -473,7 +472,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
}
private boolean verifyParameters() throws MojoFailureException {
- // FREEHEP, shouldSkip() does not work...
+ // DUNS, shouldSkip() does not work...
if (skipNAR) {
getLog()
.info(
@@ -649,7 +648,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
testSourceDirectory.getAbsolutePath() });
} else {
String junitDirectoryTestSuite;
- // FREEHEP NP check
+ // DUNS NP check
if (junitArtifact != null
&& junitArtifact.getBaseVersion().startsWith("4")) {
junitDirectoryTestSuite = "org.apache.maven.surefire.junit4.JUnit4DirectoryTestSuite";
@@ -690,7 +689,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
ForkConfiguration fork = new ForkConfiguration();
- // FREEHEP
+ // DUNS
if (project.getPackaging().equals("nar")
|| (getNarManager().getNarDependencies("test").size() > 0))
forkMode = "pertest";
@@ -722,7 +721,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
fork.setWorkingDirectory(basedir);
}
- // BEGINFREEHEP
+ // BEGINDUNS
if (argLine == null)
argLine = "";
@@ -800,7 +799,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
if (getOS().equals(OS.WINDOWS)) {
environmentVariables.put("SystemRoot", NarUtil.getEnv("SystemRoot", "SystemRoot", "C:\\Windows"));
}
- // ENDFREEHEP
+ // ENDDUNS
fork.setArgLine(argLine);
@@ -872,7 +871,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
Artifact originatingArtifact = artifactFactory.createBuildArtifact(
"dummy", "dummy", "1.0", "jar");
- // FREEHEP, use access method rather than "localRepository" field.
+ // DUNS, use access method rather than "localRepository" field.
return artifactResolver.resolveTransitively(Collections
.singleton(providerArtifact), originatingArtifact,
getLocalRepository(), remoteRepositories, metadataSource,
@@ -906,7 +905,7 @@ public class NarIntegrationTestMojo extends AbstractCompileMojo {
systemProperties.setProperty("basedir", basedir.getAbsolutePath());
- // FREEHEP, use access method rather than "localRepository" field.
+ // DUNS, use access method rather than "localRepository" field.
systemProperties.setProperty("localRepository", getLocalRepository()
.getBasedir());
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarJavahMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarJavahMojo.java
index 5c0cee7..bc5e263 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarJavahMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarJavahMojo.java
@@ -30,7 +30,6 @@ import org.apache.maven.plugin.MojoFailureException;
* @goal nar-javah
* @phase compile
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarJavahMojo.java eeac31f37379 2007/07/24 04:02:00 duns $
*/
public class NarJavahMojo extends AbstractCompileMojo {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarLogger.java b/src/main/java/org/apache/maven/plugin/nar/NarLogger.java
index 442af5e..d107739 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarLogger.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarLogger.java
@@ -28,7 +28,6 @@ import org.apache.tools.ant.Project;
* Logger to connect the Ant logging to the Maven logging.
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarLogger.java 9589202406dd 2007/07/23 17:42:54 duns $
*/
public class NarLogger implements BuildListener {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarManager.java b/src/main/java/org/apache/maven/plugin/nar/NarManager.java
index 4872cd7..1e75117 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarManager.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarManager.java
@@ -47,9 +47,7 @@ import org.codehaus.plexus.util.FileUtils;
/**
* @author Mark Donszelmann (Mark.Donszelmann@gmail.com)
- * @version $Id$
*/
-
public class NarManager {
private Log log;
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarPackageMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarPackageMojo.java
index 24c9fa3..6376769 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarPackageMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarPackageMojo.java
@@ -37,7 +37,6 @@ import org.codehaus.plexus.archiver.zip.ZipArchiver;
* @phase package
* @requiresProject
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarPackageMojo.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
*/
public class NarPackageMojo extends AbstractCompileMojo {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarResourcesMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarResourcesMojo.java
index 54e042a..90c19c0 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarResourcesMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarResourcesMojo.java
@@ -41,7 +41,6 @@ import org.codehaus.plexus.util.SelectorUtils;
* @phase process-resources
* @requiresProject
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarResourcesMojo.java 2126b860c9c5 2007/07/31 23:19:30 duns $
*/
public class NarResourcesMojo extends AbstractCompileMojo {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarSystemGenerate.java b/src/main/java/org/apache/maven/plugin/nar/NarSystemGenerate.java
index 50cf773..207a490 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarSystemGenerate.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarSystemGenerate.java
@@ -36,7 +36,6 @@ import org.apache.maven.plugin.MojoFailureException;
* @phase generate-sources
* @requiresProject
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarSystemGenerate.java d43b38443d0b 2007/09/13 18:31:01 duns $
*/
public class NarSystemGenerate extends AbstractCompileMojo {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java
index b23f86c..995a76f 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java
@@ -44,7 +44,6 @@ import org.apache.tools.ant.Project;
* @phase test-compile
* @requiresDependencyResolution test
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarTestCompileMojo.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
*/
public class NarTestCompileMojo extends AbstractCompileMojo {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarTestMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarTestMojo.java
index 6412f80..cb98d65 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarTestMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarTestMojo.java
@@ -40,7 +40,6 @@ import org.codehaus.plexus.util.StringUtils;
* @phase test
* @requiresProject
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarTestMojo.java 51709c87671c 2007/08/08 22:49:17 duns $
*/
public class NarTestMojo extends AbstractCompileMojo {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarUnArchiver.java b/src/main/java/org/apache/maven/plugin/nar/NarUnArchiver.java
index c8ce9e1..271f3ae 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarUnArchiver.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarUnArchiver.java
@@ -24,7 +24,6 @@ import org.codehaus.plexus.archiver.zip.AbstractZipUnArchiver;
/**
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarUnArchiver.java eda4d0bbde3d 2007/07/03 16:52:10 duns $
*/
public class NarUnArchiver extends AbstractZipUnArchiver {
}
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarUnpackMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarUnpackMojo.java
index a8de23c..4a3553d 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarUnpackMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarUnpackMojo.java
@@ -35,7 +35,6 @@ import org.codehaus.plexus.archiver.manager.ArchiverManager;
* @requiresProject
* @requiresDependencyResolution
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarUnpackMojo.java eda4d0bbde3d 2007/07/03 16:52:10 duns $
*/
public class NarUnpackMojo extends AbstractDependencyMojo {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarUtil.java b/src/main/java/org/apache/maven/plugin/nar/NarUtil.java
index 05ec1db..8e21ae3 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarUtil.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarUtil.java
@@ -42,7 +42,6 @@ import org.codehaus.plexus.util.cli.Commandline;
/**
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/NarUtil.java 0ee9148b7c6a 2007/09/20 18:42:29 duns $
*/
public class NarUtil {
diff --git a/src/main/java/org/apache/maven/plugin/nar/OS.java b/src/main/java/org/apache/maven/plugin/nar/OS.java
index 79822e6..2f8180a 100644
--- a/src/main/java/org/apache/maven/plugin/nar/OS.java
+++ b/src/main/java/org/apache/maven/plugin/nar/OS.java
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.nar;
/**
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/OS.java bf894e19f5aa 2007/07/07 15:33:36 duns $
*/
public interface OS {
diff --git a/src/main/java/org/apache/maven/plugin/nar/SysLib.java b/src/main/java/org/apache/maven/plugin/nar/SysLib.java
index c377f7e..a2bfe07 100644
--- a/src/main/java/org/apache/maven/plugin/nar/SysLib.java
+++ b/src/main/java/org/apache/maven/plugin/nar/SysLib.java
@@ -30,7 +30,6 @@ import org.apache.tools.ant.Project;
* Keeps info on a system library
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/SysLib.java eda4d0bbde3d 2007/07/03 16:52:10 duns $
*/
public class SysLib {
diff --git a/src/main/java/org/apache/maven/plugin/nar/Test.java b/src/main/java/org/apache/maven/plugin/nar/Test.java
index 4e88be1..3f4edaa 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Test.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Test.java
@@ -28,7 +28,6 @@ import org.apache.maven.plugin.MojoFailureException;
* Sets up a test to create
*
* @author Mark Donszelmann
- * @version $Id: plugin/src/main/java/org/freehep/maven/nar/Test.java c867ab546be1 2007/07/05 21:26:30 duns $
*/
public class Test implements Executable {
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
#
diff --git a/src/site/apt/HelloWorld.apt b/src/site/apt/HelloWorld.apt
index 90f5123..7d1f2aa 100644
--- a/src/site/apt/HelloWorld.apt
+++ b/src/site/apt/HelloWorld.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
@@ -13,7 +13,7 @@ There are also some unit test which are run and call the same method.
The following examples are available:
- [helloworldexe] A C routine.
+ [executable] A C routine.
[helloworldstaticexe] A C routine statically linked with the C-runtime library.
@@ -53,9 +53,6 @@ There are also some unit test which are run and call the same method.
[]
- These examples are now all run as tests when you try to run maven on the freehep-nar-plugin from its top-level directory.
+ These examples are now all run as integration tests when you try to run maven on the maven-nar-plugin from its top-level directory with the profile "run-its".
- For the sources of these tests, see:
-{{{http://java.freehep.org/svn/repobrowser.svn?path=%2ffreehep%2ftrunk%2fmaven-plugins%2ffreehep-nar-plugin%2ftests&revision=HEAD&name=freehep&bypassEmpty=true}
-the SVN repository}}.
diff --git a/src/site/apt/aol.apt b/src/site/apt/aol.apt
index 0acaa96..8ce59f7 100644
--- a/src/site/apt/aol.apt
+++ b/src/site/apt/aol.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
@@ -10,6 +10,13 @@ AOL Properties
Below a copy of the AOL Properties file which is used by the NAR plugin for AOL dependent default settings:
+--
+#
+# AOL (Architecture-OperatingSystem-Linker) Default Values
+#
+# @author Mark Donszelmann
+# @version $Id$
+#
+
#
# Windows ("Windows *" => Windows)
#
@@ -37,6 +44,7 @@ x86.Windows.msvc.java.include=include;include/win32
x86.Windows.msvc.java.runtimeDirectory=lib
x86.Windows.msvc.lib.prefix=
+x86.Windows.msvc.shared.prefix=
x86.Windows.msvc.shared.extension=dll
x86.Windows.msvc.static.extension=lib
x86.Windows.msvc.plugin.extension=dll
@@ -66,16 +74,23 @@ x86.Windows.g++.fortran.options=-Wall
x86.Windows.g++.fortran.includes=**/*.f **/*.for
x86.Windows.g++.fortran.excludes=
-x86.Windows.g++.java.include=include;include/Windows
+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=so
-x86.Windows.g++.plugin.extension=so
-x86.Windows.g++.jni.extension=so
+x86.Windows.g++.shared.extension=dll
+x86.Windows.g++.plugin.extension=dll
+x86.Windows.g++.jni.extension=dll
x86.Windows.g++.executable.extension=
+# FIXME to be removed when NARPLUGIN-137
+x86.Windows.gcc.static.extension=a
+x86.Windows.gcc.shared.extension=dll
+x86.Windows.gcc.plugin.extension=dll
+x86.Windows.gcc.jni.extension=dll
+
#
# Linux
#
@@ -103,12 +118,19 @@ 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=
+# FIXME to be removed when NARPLUGIN-137
+i386.Linux.gcc.static.extension=a
+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
#
@@ -136,6 +158,7 @@ i386.Linux.icc.java.include=include;include/linux
i386.Linux.icc.java.runtimeDirectory=jre/lib/i386/client
i386.Linux.icc.lib.prefix=lib
+i386.Linux.icc.shared.prefix=lib
i386.Linux.icc.static.extension=a
i386.Linux.icc.shared.extension=so
i386.Linux.icc.plugin.extension=so
@@ -168,6 +191,7 @@ i386.Linux.icpc.java.include=include;include/linux
i386.Linux.icpc.java.runtimeDirectory=jre/lib/i386/client
i386.Linux.icpc.lib.prefix=lib
+i386.Linux.icpc.shared.prefix=lib
i386.Linux.icpc.static.extension=a
i386.Linux.icpc.shared.extension=so
i386.Linux.icpc.plugin.extension=so
@@ -200,6 +224,7 @@ i386.Linux.ecc.java.include=include;include/linux
i386.Linux.ecc.java.runtimeDirectory=jre/lib/i386/client
i386.Linux.ecc.lib.prefix=lib
+i386.Linux.ecc.shared.prefix=lib
i386.Linux.ecc.static.extension=a
i386.Linux.ecc.shared.extension=so
i386.Linux.ecc.plugin.extension=so
@@ -232,6 +257,7 @@ i386.Linux.ecpc.java.include=include;include/linux
i386.Linux.ecpc.java.runtimeDirectory=jre/lib/i386/client
i386.Linux.ecpc.lib.prefix=lib
+i386.Linux.ecpc.shared.prefix=lib
i386.Linux.ecpc.static.extension=a
i386.Linux.ecpc.shared.extension=so
i386.Linux.ecpc.plugin.extension=so
@@ -265,16 +291,23 @@ 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=
+# FIXME to be removed when NARPLUGIN-137
+amd64.Linux.gcc.static.extension=a
+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
#
-# MacOSX ("Mac OS X" => MacOSX)
+# MacOSX ("Mac OS X" => MacOSX) PowerPC
#
ppc.MacOSX.linker=g++
@@ -300,16 +333,23 @@ 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=
+# FIXME to be removed when NARPLUGIN-137
+ppc.MacOSX.gcc.static.extension=a
+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
#
-# MacOSX ("Mac OS X" => MacOSX) Intel
+# MacOSX ("Mac OS X" => MacOSX) Intel (32 bits)
#
i386.MacOSX.linker=g++
@@ -335,14 +375,63 @@ 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=
+# FIXME to be removed when NARPLUGIN-137
+i386.MacOSX.gcc.static.extension=a
+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
+#
+# 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
#
@@ -372,12 +461,19 @@ sparc.SunOS.CC.java.runtimeDirectory=jre/lib/sparc/server
sparc.SunOS.CC.linker.systemLibs=pthread:shared
sparc.SunOS.CC.lib.prefix=lib
+sparc.SunOS.CC.shared.prefix=lib
sparc.SunOS.CC.static.extension=a
sparc.SunOS.CC.shared.extension=so
sparc.SunOS.CC.plugin.extension=so
sparc.SunOS.CC.jni.extension=so
sparc.SunOS.CC.executable.extension=
+# FIXME to be removed when NARPLUGIN-137
+sparc.SunOS.cc.static.extension=a
+sparc.SunOS.cc.shared.extension=so
+sparc.SunOS.cc.plugin.extension=so
+sparc.SunOS.cc.jni.extension=so
+
#sparc.SunOS.CC.arch.includes=lib/**/*.a lib/**/*.so
+--
diff --git a/src/site/apt/configuration.apt b/src/site/apt/configuration.apt
index 6b01b91..e0e246a 100644
--- a/src/site/apt/configuration.apt
+++ b/src/site/apt/configuration.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
diff --git a/src/site/apt/cpptasks.apt b/src/site/apt/cpptasks.apt
index 55704cb..462daa9 100644
--- a/src/site/apt/cpptasks.apt
+++ b/src/site/apt/cpptasks.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
@@ -80,9 +80,9 @@ with some minor extensions:
- [src/net/sf/antcontrib/cpptasks/DependencyInfo.java] cpptasks speedup
+--
- You can find the latest of our mods in our svn repository:
+ You can find the latest of our mods in our git repository:
+--
-svn co svn://svn.freehep.org/svn/misc/trunk/cpptasks
+git clone git://github.com/duns/cpptasks-parallel.git
+--
diff --git a/src/site/apt/faq.apt b/src/site/apt/faq.apt
index ec1796f..86e2560 100644
--- a/src/site/apt/faq.apt
+++ b/src/site/apt/faq.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
diff --git a/src/site/apt/intro.apt b/src/site/apt/intro.apt
index 4b641a1..1c62bd9 100644
--- a/src/site/apt/intro.apt
+++ b/src/site/apt/intro.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
@@ -170,7 +170,7 @@ os and linker (x86.Windows.msvc for example).
All include files from <<>> are copied to be included
in the noarch nar file.
- << TBD If you set freehep.nar.includefilesonly to true the compilation step will be
+ << TBD If you set maven.nar.includefilesonly to true the compilation step will be
skipped. This flag can be used if you want to distribute a library that only contains pure
abstract classes in include files.>>
@@ -192,7 +192,7 @@ sources, as specified in the patterns in <<>>,
<<>> and <<>>, where AOL is a dotted qualifier of the architecture,
os and linker (x86.Windows.msvc for example).
- <>
@@ -214,7 +214,7 @@ The following jar and nar files are created:
* \-\-\-\.nar, a compressed jar file containing machine
specific parts of the distribution, such as the libraries. This file is specific to a particular
- Architecture-OS-Linker (AOL) combination <>. Type specifies if this nar is either of type shared, static or jni.
[]
diff --git a/src/site/apt/lifecycle.apt b/src/site/apt/lifecycle.apt
index 3fd11cd..2adff1f 100644
--- a/src/site/apt/lifecycle.apt
+++ b/src/site/apt/lifecycle.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
diff --git a/src/site/apt/narDependencies.apt b/src/site/apt/narDependencies.apt
index 526bc7c..e4150b5 100644
--- a/src/site/apt/narDependencies.apt
+++ b/src/site/apt/narDependencies.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
diff --git a/src/site/apt/narLibrary.apt b/src/site/apt/narLibrary.apt
index 98d4a11..8f9c6ff 100644
--- a/src/site/apt/narLibrary.apt
+++ b/src/site/apt/narLibrary.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
@@ -25,9 +25,8 @@ following to your POM file:
...
- org.freehep
- freehep-nar-plugin
- 2.0-alpha-2-SNAPSHOT
+ maven-nar-plugin
+ 2.1-SNAPSHOT
@@ -41,9 +40,9 @@ import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
-import org.freehep.maven.nar.Linker;
-import org.freehep.maven.nar.NarManager;
-import org.freehep.maven.nar.NarUtil;
+import org.apache.maven.plugin.nar.Linker;
+import org.apache.maven.plugin.nar.NarManager;
+import org.apache.maven.plugin.nar.NarUtil;
/**
* Description...
diff --git a/src/site/apt/philosophy.apt b/src/site/apt/philosophy.apt
index ce41e2b..a2902bd 100644
--- a/src/site/apt/philosophy.apt
+++ b/src/site/apt/philosophy.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
@@ -129,8 +129,7 @@ platform the NAR Plugin is running on. An example is below:
+--
...
- org.freehep
- freehep-nar-plugin
+ maven-nar-plugin
false
@@ -176,8 +175,7 @@ shared library, which depends on a native math library (nmath).
- org.freehep
- freehep-nar-plugin
+ maven-nar-plugin
nar-version-number
true
diff --git a/src/site/apt/usage.apt b/src/site/apt/usage.apt
index c64b9f3..d384b1a 100644
--- a/src/site/apt/usage.apt
+++ b/src/site/apt/usage.apt
@@ -1,5 +1,5 @@
---
-FreeHEP NAR Plugin
+Maven NAR Plugin
---
---
Mark Donszelmann
@@ -20,8 +20,7 @@ and link native code.
- org.freehep
- freehep-nar-plugin
+ maven-nar-plugin
nar-version-number
true
@@ -40,8 +39,7 @@ and link native code.
- org.freehep
- freehep-nar-plugin
+ maven-nar-plugin
true
@@ -72,8 +70,7 @@ to disable exceptions and not link with C++.
- org.freehep
- freehep-nar-plugin
+ maven-nar-plugin
true
@@ -127,8 +124,7 @@ The example also shows how to configure the
...
- org.freehep
- freehep-nar-plugin
+ maven-nar-plugin
true
@@ -182,8 +178,7 @@ assemblies would be "pom".
...
- org.freehep
- freehep-nar-plugin
+ maven-nar-plugin
x86-Windows-msvc
diff --git a/src/site/site.xml b/src/site/site.xml
index c2b6814..bb92917 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -1,29 +1,38 @@
-
+
+
+
- FreeHEP NAR Plugin
-
-
+ Maven NAR Plugin
+ http://maven.apache.org/images/apache-maven-project.png
http://java.freehep.org/freehep-nar-plugin
-
-
- FreeHEP
- http://java.freehep.org/images/sm-freehep.gif
- http://java.freehep.org
-
-
+
-
-
@@ -43,8 +52,9 @@
-
-
+
+
+
@@ -26,7 +45,7 @@
maven -Dverbose |
- Output NAR debug stetements |
+ Output NAR debug statements |
@@ -45,7 +64,7 @@
- freehep.nar.arch |
+ maven.nar.arch |
Architecture [arch] (ex: x86, i386, sparc, ...) |
${os.arch}
@@ -53,7 +72,7 @@
|
- freehep.nar.os |
+ maven.nar.os |
Operating System [os] (ex: Linux, win32, MacOSX, SunOs, ...) |
${os.name} (Note: no spaces)
@@ -61,10 +80,10 @@
|
- [arch.[os.]]freehep.nar.linker |
+ [arch.[os.]]maven.nar.linker |
Linker [linker]
(ex: msvc, g++, CC, ...), but you may use any name here and override it in
- the property arch.os.linker.freehep.nar.linker to the real linker name. |
+ the property arch.os.linker.maven.nar.linker to the real linker name.
Architecture-OS specific, see below. |
@@ -79,106 +98,106 @@
- freehep.nar.src |
+ maven.nar.src |
Source file directory |
src/main/cpp |
- freehep.nar.cpp.src.includes |
+ maven.nar.cpp.src.includes |
C++ file pattern to include |
**/*.h **/*.hh **/*.cc **/*.cpp **/*.cxx |
- freehep.nar.cpp.src.excludes |
+ maven.nar.cpp.src.excludes |
C++ file pattern to exclude |
|
- freehep.nar.c.src.includes |
+ maven.nar.c.src.includes |
C file pattern to include |
**/*.h **/*.c |
- freehep.nar.c.src.excludes |
+ maven.nar.c.src.excludes |
C file pattern to exclude |
|
- freehep.nar.fortran.src.includes |
+ maven.nar.fortran.src.includes |
Fortran file pattern to include |
**/*.f **/*.for |
- freehep.nar.fortran.src.excludes |
+ maven.nar.fortran.src.excludes |
Fortran file pattern to exclude |
|
- freehep.nar.test.src |
+ maven.nar.test.src |
Test source file directory |
src/test/cpp |
- freehep.nar.compile.includepath |
+ maven.nar.compile.includepath |
Include path for compilation |
src/main/include |
- freehep.nar.compile.sysincludepath |
+ maven.nar.compile.sysincludepath |
System include path for compilation |
|
- freehep.nar.compile.withjava |
+ maven.nar.compile.withjava |
Adds the Java Virtual Machine include files for compilation |
false (automatic if the nar:jni goal is run and headers are generated) |
- freehep.nar.test.compile.includepath |
+ maven.nar.test.compile.includepath |
Include path for compilation of tests |
src/test/include |
- freehep.nar.link.withjava |
+ maven.nar.link.withjava |
Enables the linking with the Java Virtual Machine |
- ${freehep.nar.compile.withjava} |
+ ${maven.nar.compile.withjava} |
- freehep.nar.jni.classpath |
+ maven.nar.jni.classpath |
Classpath to add for nar:jni goal |
|
- freehep.nar.tests |
+ maven.nar.tests |
List of test (executables) to be generated |
|
- freehep.nar.includefilesonly |
+ maven.nar.includefilesonly |
Generates only common NAR file. Machine-OS specific NAR file will not be made. |
false |
- freehep.nar.aol |
+ maven.nar.aol |
Architecture-OS-Linker [aol] name, used for naming the machine specific NAR
and used for the destination directory |
@@ -187,7 +206,7 @@
|
- freehep.nar.dest |
+ maven.nar.dest |
Output directory |
${maven.build.dir}/nar
@@ -195,7 +214,7 @@
|
- freehep.nar.test.dest |
+ maven.nar.test.dest |
Test output directory |
${maven.build.dir}/test-nar
@@ -214,26 +233,26 @@
|
- [arch.[os.[linker.]freehep.nar.cpp.compiler |
+ [arch.[os.[linker.]maven.nar.cpp.compiler |
C++ Compiler |
Architecture-OS-Linker specific, see below |
- [arch.[os.[linker.]freehep.nar.c.compiler |
+ [arch.[os.[linker.]maven.nar.c.compiler |
C Compiler |
Architecture-OS-Linker specific, see below |
- [arch.[os.[linker.]freehep.nar.fortran.compiler |
+ [arch.[os.[linker.]maven.nar.fortran.compiler |
Fortran Compiler |
Architecture-OS-Linker specific, see below |
- arch.os.linker.freehep.nar.linker |
+ arch.os.linker.maven.nar.linker |
Real linker name |
Architecture-OS-Linker specific, see below |
@@ -251,67 +270,67 @@
- [arch.[os.[linker.]freehep.nar.rtti |
+ [arch.[os.[linker.]maven.nar.rtti |
Enable Runtime Type Identification |
true |
- [arch.[os.[linker.]freehep.nar.exceptions |
+ [arch.[os.[linker.]maven.nar.exceptions |
Enable Exception Handling |
true |
- [arch.[os.[linker.]freehep.nar.runtime |
+ [arch.[os.[linker.]maven.nar.runtime |
Use static or dynamic runtime library |
dynamic |
- [arch.[os.[linker.]freehep.nar.optmize |
+ [arch.[os.[linker.]maven.nar.optmize |
Set optimization level |
none |
- [arch.[os.[linker.]freehep.nar.multithreaded |
+ [arch.[os.[linker.]maven.nar.multithreaded |
Enable multithreading |
false |
- [arch.[os.[linker.]freehep.nar.incremental |
+ [arch.[os.[linker.]maven.nar.incremental |
Enable incremental linking |
false |
- [arch.[os.[linker.]freehep.nar.failonerror |
+ [arch.[os.[linker.]maven.nar.failonerror |
Abort if an error is detected |
true |
- [arch.[os.[linker.]freehep.nar.libtool |
+ [arch.[os.[linker.]maven.nar.libtool |
Use libtool to compile and link |
false |
- [arch.[os.[linker.]freehep.nar.debug |
+ [arch.[os.[linker.]maven.nar.debug |
Generate debugging code |
false |
- [arch.[os.[linker.]freehep.nar.outtype |
+ [arch.[os.[linker.]maven.nar.outtype |
Type of library to be generated (use "jni" for native shareable code with java) |
static |
- [arch.[os.[linker.]freehep.nar.test.outtype |
+ [arch.[os.[linker.]maven.nar.test.outtype |
Type of test output to be generated |
executable |
@@ -329,7 +348,7 @@
- [arch.[os.[linker.]freehep.nar.compiler.arg.start|mid|end |
+ [arch.[os.[linker.]maven.nar.compiler.arg.start|mid|end |
Space delimited list of optional compiler arguments.
@@ -340,7 +359,7 @@
|
- [arch.[os.[linker.]freehep.nar.cpp.compiler.arg.start|mid|end |
+ [arch.[os.[linker.]maven.nar.cpp.compiler.arg.start|mid|end |
Space delimited list of optional cpp compiler arguments.
@@ -351,7 +370,7 @@
|
- [arch.[os.[linker.]freehep.nar.c.compiler.arg.start|mid|end |
+ [arch.[os.[linker.]maven.nar.c.compiler.arg.start|mid|end |
Space delimited list of optional c compiler arguments.
@@ -362,7 +381,7 @@
|
- [arch.[os.[linker.]freehep.nar.fortran.compiler.arg.start|mid|end |
+ [arch.[os.[linker.]maven.nar.fortran.compiler.arg.start|mid|end |
Space delimited list of optional fortran compiler arguments.
@@ -373,7 +392,7 @@
|
- [arch.[os.[linker.]freehep.nar.linker.arg.start|mid|end |
+ [arch.[os.[linker.]maven.nar.linker.arg.start|mid|end |
Space delimited list of optional linker arguments.
@@ -384,7 +403,7 @@
|
- [arch.[os.[linker.]freehep.nar.linker.test.arg.start|mid|end |
+ [arch.[os.[linker.]maven.nar.linker.test.arg.start|mid|end |
Space delimited list of optional linker arguments for creating the test output.
@@ -406,7 +425,7 @@
|
- [arch.[os.[linker.]freehep.nar.java.home |
+ [arch.[os.[linker.]maven.nar.java.home |
Java Home (jdk) |
${java.home}/..
@@ -414,19 +433,19 @@
|
- [arch.[os.[linker.]freehep.nar.java.include |
+ [arch.[os.[linker.]maven.nar.java.include |
Directory to look for include files for jni |
- ${freehep.nar.java.home}/include |
+ ${maven.nar.java.home}/include |
- [arch.[os.[linker.]freehep.nar.java.include.os |
+ [arch.[os.[linker.]maven.nar.java.include.os |
OS specific directory to look for include files for jni |
Architecture-OS-Linker specific, see below |
- [arch.[os.[linker.]freehep.nar.java.vm |
+ [arch.[os.[linker.]maven.nar.java.vm |
Location to the jvm |
Architecture-OS-Linker specific, see below |
@@ -444,31 +463,31 @@
- [arch.[os.[linker.]freehep.nar.lib.prefix |
+ [arch.[os.[linker.]maven.nar.lib.prefix |
Prefix for library name |
Architecture-OS-Linker specific, see below |
- [arch.[os.[linker.]freehep.nar.static.extension |
+ [arch.[os.[linker.]maven.nar.static.extension |
Extension for static library |
Architecture-OS-Linker specific, see below |
- [arch.[os.[linker.]freehep.nar.shared.extension |
+ [arch.[os.[linker.]maven.nar.shared.extension |
Extension for shared library |
Architecture-OS-Linker specific, see below |
- [arch.[os.[linker.]freehep.nar.plugin.extension |
+ [arch.[os.[linker.]maven.nar.plugin.extension |
Extension for plugin library |
Architecture-OS-Linker specific, see below |
- [arch.[os.[linker.]freehep.nar.executable.extension |
+ [arch.[os.[linker.]maven.nar.executable.extension |
Extension for executable output |
Architecture-OS-Linker specific, see below |
@@ -485,33 +504,33 @@
- freehep.nar.libs.type |
+ maven.nar.libs.type |
Type for libraries |
static |
- freehep.nar.libs |
+ maven.nar.libs |
List of library modules to link against [X] |
|
- freehep.nar.lib.X.libs |
+ maven.nar.lib.X.libs |
List of library names to link against |
X |
- freehep.nar.lib.X.dir |
+ maven.nar.lib.X.dir |
Directory where to look for X |
- ${freehep.nar.dest}/lib |
+ ${maven.nar.dest}/lib |
- freehep.nar.lib.X.type |
+ maven.nar.lib.X.type |
Type of library X |
- ${freehep.nar.libs.type} |
+ ${maven.nar.libs.type} |
@@ -519,7 +538,7 @@
- [arch.[os.[linker.]freehep.nar.arch.includes |
+ [arch.[os.[linker.]maven.nar.arch.includes |
Include these files and libraries in the arch specific nar file |
Architecture-OS-Linker specific, see below |
@@ -547,7 +566,7 @@
- freehep.nar.linker |
+ maven.nar.linker |
msvc |
g++ |
g++ |
@@ -556,7 +575,7 @@
- freehep.nar.java.home |
+ maven.nar.java.home |
|
|
|
@@ -565,7 +584,7 @@
- freehep.nar.java.include.os prefixed with freehep.nar.java.home |
+ maven.nar.java.include.os prefixed with maven.nar.java.home |
include/win32 |
include/linux |
include/linux |
@@ -574,7 +593,7 @@
- freehep.nar.java.vm prefixed with freehep.nar.java.home |
+ maven.nar.java.vm prefixed with maven.nar.java.home |
lib |
jre/lib/i386/client |
jre/lib/amd64/server |
@@ -583,7 +602,7 @@
- freehep.nar.multithreaded |
+ maven.nar.multithreaded |
true |
|
|
@@ -592,7 +611,7 @@
- freehep.nar.cpp.compiler |
+ maven.nar.cpp.compiler |
msvc |
g++ |
g++ |
@@ -601,7 +620,7 @@
- freehep.nar.c.compiler |
+ maven.nar.c.compiler |
msvc |
gcc |
gcc |
@@ -610,7 +629,7 @@
- freehep.nar.fortran.compiler |
+ maven.nar.fortran.compiler |
df |
g77 |
g77 |
@@ -619,7 +638,7 @@
- freehep.nar.compiler.arg.start |
+ maven.nar.compiler.arg.start |
-DWIN32 |
-DLinux |
-DLinux |
@@ -628,7 +647,7 @@
- freehep.nar.linker.arg.start |
+ maven.nar.linker.arg.start |
|
|
|
@@ -637,7 +656,7 @@
- freehep.nar.arch.includes |
+ maven.nar.arch.includes |
lib/**/*.lib lib/**/*.dll |
lib/**/*.a lib/**/*.so |
lib/**/*.a lib/**/*.so |
@@ -646,7 +665,7 @@
- freehep.nar.lib.prefix |
+ maven.nar.lib.prefix |
|
lib |
lib |
@@ -655,7 +674,7 @@
- freehep.nar.static.extension |
+ maven.nar.static.extension |
.lib |
.a |
.a |
@@ -664,7 +683,7 @@
- freehep.nar.shared.extension |
+ maven.nar.shared.extension |
.dll |
.so |
.so |
@@ -673,7 +692,7 @@
- freehep.nar.plugin.extension |
+ maven.nar.plugin.extension |
.dll |
.so |
.so |
@@ -682,7 +701,7 @@
- freehep.nar.executable.extension |
+ maven.nar.executable.extension |
.exe |
|
|
@@ -708,21 +727,21 @@
- freehep.nar.cpp.compiler |
+ maven.nar.cpp.compiler |
g++ |
icpc |
ecpc |
- freehep.nar.c.compiler |
+ maven.nar.c.compiler |
gcc |
icc |
ecc |
- freehep.nar.fortran.compiler |
+ maven.nar.fortran.compiler |
g77 |
ifort |
ifort (should this be efc?) |
--
cgit v1.2.3