diff options
Diffstat (limited to 'src')
57 files changed, 561 insertions, 226 deletions
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 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +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. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.maven.its.nar</groupId> + <artifactId>it-parent</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../it-parent/pom.xml</relativePath> + </parent> + + <artifactId>executable</artifactId> + <packaging>nar</packaging> + + <name>Maven NAR Executable Test</name> + <version>1.0-SNAPSHOT</version> + <description> + Simple test executable + </description> + <url>http://maven.apache.org/</url> + + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> + + <build> + <defaultGoal>integration-test</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-nar-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <libraries> + <library> + <type>executable</type> + <run>true</run> + </library> + </libraries> + </configuration> + </plugin> + </plugins> + </build> +</project> 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 <stdio.h> + +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 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +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. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.maven.its.nar</groupId> + <artifactId>it-parent</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <properties> + <mavenVersion>2.0.6</mavenVersion> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <repositories> + <repository> + <id>local.central</id> + <url>@localRepositoryUrl@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </repository> + </repositories> + <pluginRepositories> + <pluginRepository> + <id>local.central</id> + <url>@localRepositoryUrl@</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + </pluginRepository> + </pluginRepositories> +</project> 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 <a href="Mark.Donszelmann@slac.stanford.edu">Mark Donszelmann</a> - * @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 <a href="Mark.Donszelmann@slac.stanford.edu">Mark Donszelmann</a> - * @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 @@ +<!-- +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 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 @@ -11,6 +11,13 @@ AOL Properties +-- # +# AOL (Architecture-OperatingSystem-Linker) Default Values +# +# @author Mark Donszelmann +# @version $Id$ +# + +# # Windows ("Windows *" => Windows) # x86.Windows.linker=msvc @@ -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,15 +375,64 @@ 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 # sparc.SunOS.linker=CC @@ -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 <<<COMPILER.includePaths>>> 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 <<<AOL.c.includes>>>, <<<AOL.nar.src.includes>>> and <<<AOL.fortran.includes>>>, where AOL is a dotted qualifier of the architecture, os and linker (x86.Windows.msvc for example). - <<TBD If you set freehep.nar.includefilesonly to true the compile-tests goal will be + <<TBD If you set maven.nar.includefilesonly to true the compile-tests goal will be skipped.>> @@ -214,7 +214,7 @@ The following jar and nar files are created: * \<Artifact\>-\<version\>-\<aol\>-\<type\>.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 <<TBD and is not generated if freehep.nar.includefilesonly + Architecture-OS-Linker (AOL) combination <<TBD and is not generated if maven.nar.includefilesonly is set>>. 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: <dependencies> ... <dependency> - <groupId>org.freehep</groupId> - <artifactId>freehep-nar-plugin</artifactId> - <version>2.0-alpha-2-SNAPSHOT</version> + <artifactId>maven-nar-plugin</artifactId> + <version>2.1-SNAPSHOT</version> </dependency> </dependencies> </project> @@ -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: +-- ... <plugin> - <groupId>org.freehep</groupId> - <artifactId>freehep-nar-plugin</artifactId> + <artifactId>maven-nar-plugin</artifactId> <configuration> <cpp> <exceptions>false</exceptions> @@ -176,8 +175,7 @@ shared library, which depends on a native math library (nmath). <build> <plugins> <plugin> - <groupId>org.freehep</groupId> - <artifactId>freehep-nar-plugin</artifactId> + <artifactId>maven-nar-plugin</artifactId> <version>nar-version-number</version> <extensions>true</extensions> </plugin> 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. <build> <plugins> <plugin> - <groupId>org.freehep</groupId> - <artifactId>freehep-nar-plugin</artifactId> + <artifactId>maven-nar-plugin</artifactId> <version>nar-version-number</version> <extensions>true</extensions> </plugin> @@ -40,8 +39,7 @@ and link native code. <build> <plugins> <plugin> - <groupId>org.freehep</groupId> - <artifactId>freehep-nar-plugin</artifactId> + <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> <libraries> @@ -72,8 +70,7 @@ to disable exceptions and not link with C++. <build> <plugins> <plugin> - <groupId>org.freehep</groupId> - <artifactId>freehep-nar-plugin</artifactId> + <artifactId>maven-nar-plugin</artifactId> <extensions>true</extensions> <configuration> <cpp> @@ -127,8 +124,7 @@ The example also shows how to configure the </plugin> ... <plugin> - <groupId>org.freehep</groupId> - <artifactId>freehep-nar-plugin</artifactId> + <artifactId>maven-nar-plugin</artifactId> <configuration> <java> <include>true</include> @@ -182,8 +178,7 @@ assemblies would be "pom". </plugin> ... <plugin> - <groupId>org.freehep</groupId> - <artifactId>freehep-nar-plugin</artifactId> + <artifactId>maven-nar-plugin</artifactId> <configuration> <classifiers> <classifier>x86-Windows-msvc</classifier> 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 @@ -<project name="freehep"> +<!-- +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. +--> + +<project name="maven-nar-plugin"> <bannerLeft> - <name>FreeHEP NAR Plugin</name> -<!-- <src>http://maven.apache.org/images/apache-maven-project.png</src> --> -<!-- FIXME, should this be substituted by some properties --> + <name>Maven NAR Plugin</name> + <src>http://maven.apache.org/images/apache-maven-project.png</src> <href>http://java.freehep.org/freehep-nar-plugin</href> </bannerLeft> - - <bannerRight> - <name>FreeHEP</name> - <src>http://java.freehep.org/images/sm-freehep.gif</src> - <href>http://java.freehep.org</href> - </bannerRight> - + <body> <links> <item name="NAR Plugin for Maven1" href="http://java.freehep.org/maven1.x/freehep-nar-plugin"/> - <item name="FreeHEP 1.x" href="http://java.freehep.org/freehep1.x"/> - <item name="FreeHEP 2.x" href="http://java.freehep.org/"/> <item name="Maven 2" href="http://maven.apache.org/maven2/"/> </links> <menu name="Overview"> <item name="Introduction" href="intro.html"/> <item name="Philosophy" href="philosophy.html"/> - <item name="Presentation (pdf)" href="NARPlugin.pdf"/> <item name="Presentation (ppt)" href="NARPlugin.ppt"/> </menu> @@ -43,8 +52,9 @@ <item name="APIDocs" href="apidocs/index.html"/> <item name="NAR Library" href="narLibrary.html"/> <item name="CPPTasks" href="cpptasks.html"/> - <item name="SVN Browse" href="http://java.freehep.org/svn/repobrowser.svn?path=%2ffreehep%2ftrunk%2fmaven-plugins%2ffreehep-nar-plugin/&revision=HEAD"/> - <item name="SVN Repository" href="source-repository.html"/> + <item name="Git Browse nar-plugin" href="http://github.com/duns/maven-nar-plugin"/> + <item name="Git Browse cpptasks" href="http://github.com/duns/cpptasks-parallel"/> + <item name="Git Repository" href="source-repository.html"/> </menu> <menu name="Examples"> <item name="HelloWorld" href="HelloWorld.html"/> diff --git a/src/unfiled/performance.txt b/src/unfiled/performance.txt new file mode 100644 index 0000000..5ba05ea --- /dev/null +++ b/src/unfiled/performance.txt @@ -0,0 +1,33 @@ +i386-MacOSX-g++: g++ 4.0.1 MacOS 10.4 2.3 GHz MacIntel +ppc-MacOSX-g++: g++ 4.0.1 MacOS 10.4 2 GHz PowerPC G5 +i386-Linux-g++3: g++ 3.3 / 3.4 Linux 2 GHz +i386-Linux-g++: g++ 4.1 Linux 2 GHz +x86-Windows-msvc: vc 8 WindowsXP 2.3 GHz + +8-core to local disk. + +Compile Times Maven NAR + +Geant4 Full Size + + Cores/CPUs 1 2 4 8 +Platform +i386-MacOSX-g++ 1800 1034 +ppc-MacOSX-g++ 3467 1992 +i386-Linux-g++3 826 340 (local disk) +i386-Linux-g++ 632 270 (local disk) +x86-Windows-msvc 1701 1035 +x86-Windows-g++ 5232 2894 + + +Geant4 75 Files + + Cores/CPUs 1 2 4 8 +Platform +i386-MacOSX-g++ 120 93 +ppc-MacOSX-g++ +i386-Linux-g++3 +i386-Linux-g++ +x86-Windows-msvc 161 120 + + diff --git a/src/xdocs/nar-dependencies.xml b/src/xdocs/nar-dependencies.xml index dd9ae8e..1f378a7 100644 --- a/src/xdocs/nar-dependencies.xml +++ b/src/xdocs/nar-dependencies.xml @@ -1,9 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> + <document> <properties> - <title> NAR Dependencies</title> - <author email="Mark.Donszelmann@slac.stanford.edu">Mark Donszelmann</author> + <title>NAR Dependencies</title> + <author email="Mark.Donszelmann@gmail.com">Mark Donszelmann</author> </properties> <body> <section name="Dependencies on other NARs"> @@ -47,7 +66,7 @@ </tr> <tr> - <td>freehep.nar.nars</td> + <td>maven.nar.nars</td> <td>Space separated list of other nar files to download. </td> <td> @@ -76,7 +95,7 @@ <tr> <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]<i>DependentArtifact</i>-nar.local</td> <td>Specifies that the DependentArtifact is installed locally (in a different place than the local - repository. The property <code>freehep.nar.nars</code> will be ignored. + repository. The property <code>maven.nar.nars</code> will be ignored. One would typically use this for standard libs such as zlib and others.</td> <td>false</td> </tr> @@ -108,7 +127,7 @@ <tr> <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]<i>DependentArtifact</i>-nar.type</td> <td>Specify the type of linking</td> - <td><code>${freehep.nar.libs.type}</code></td> + <td><code>${maven.nar.libs.type}</code></td> </tr> <tr> @@ -122,7 +141,7 @@ <td>Converts one AOL into another. For example: YourLib-nar.i386-Linux-g++=i386-Linux-gcc will make sure you can link from g++ as well as from gcc to YourLib. YourLib needs to be dsitributed as a gcc linked lib in this case.</td> - <td>${freehep.nar.aol.name}</td> + <td>${maven.nar.aol.name}</td> </tr> </table> @@ -131,7 +150,7 @@ If the property <i>DependentArtifact</i>-nar.local is set to true, then no further files will be downloaded or installed and the properties <i>DependentArtifact</i>-nar.dir and <i>DependentArtifact</i>-nar.include will be used for compilation and linking with this <i>DependentArtifact</i>. - In the other case the files specified by freehep.nar.nars will be downloaded, installed in + In the other case the files specified by maven.nar.nars will be downloaded, installed in the local repository, unpacked and used for compilation and linking. Setting <i>DependentArtifact</i>-nar.local allows the user to avoid downloading a library which is already installed as a non-NAR file somewhere else on his machine. @@ -140,7 +159,7 @@ <p> When generating a set of NAR files, the <i>Artifact</i>-nar-<i>Version</i>.nar file will be generated for you. This file may contain any of the properties listed above. The NAR plugin generates the - properties freehep.nar.nars and <i>Artifact</i>-nar.linkLibs. Any other properties can be specified + properties maven.nar.nars and <i>Artifact</i>-nar.linkLibs. Any other properties can be specified in the nar.properties file in the artifact's top directory (alongside project.properties) and will be concatenated to the generated nar file. </p> diff --git a/src/xdocs/properties.xml b/src/xdocs/properties.xml index 28bcbf5..489e4bd 100644 --- a/src/xdocs/properties.xml +++ b/src/xdocs/properties.xml @@ -1,10 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +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. +--> + <document> <properties> - <title>FreeHEP NAR Plugin Properties</title> - <author email="Mark.Donszelmann@slac.stanford.edu">Mark Donszelmann</author> + <title>Maven NAR Plugin Properties</title> + <author email="Mark.Donszelmann@gmail.com">Mark Donszelmann</author> </properties> <body> @@ -13,7 +32,7 @@ Below are the properties by group for the NAR plugin. The properties with the <code>[<i>arch.[os.[linker.]</i>]</code> prefix can either be set in general, architecture specific, architecture-os specific or architecture-os-linker specific. - The latter overruling the former ones. The defaults for these combiations + The latter overruling the former ones. The defaults for these combinations are listed in two separate tables below. </p> @@ -26,7 +45,7 @@ <tr> <td>maven -Dverbose</td> - <td>Output NAR debug stetements</td> + <td>Output NAR debug statements</td> </tr> <tr> @@ -45,7 +64,7 @@ </tr> <tr> - <td>freehep.nar.arch</td> + <td>maven.nar.arch</td> <td>Architecture [<i>arch</i>] (ex: x86, i386, sparc, ...)</td> <td> <code>${os.arch}</code> @@ -53,7 +72,7 @@ </tr> <tr> - <td>freehep.nar.os</td> + <td>maven.nar.os</td> <td>Operating System [<i>os</i>] (ex: Linux, win32, MacOSX, SunOs, ...)</td> <td> <code>${os.name}</code> (Note: no spaces) @@ -61,10 +80,10 @@ </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>]]freehep.nar.linker</td> + <td>[<i>arch.</i>[<i>os.</i>]]maven.nar.linker</td> <td><a href="http://ant-contrib.sourceforge.net/linker.html">Linker</a> [<i>linker</i>] (ex: msvc, g++, CC, ...), but you may use any name here and override it in - the property <i>arch.os.linker.</i>freehep.nar.linker to the real linker name.</td> + the property <i>arch.os.linker.</i>maven.nar.linker to the real linker name.</td> <td>Architecture-OS specific, see <a href="#Architecture-OS">below</a>.</td> </tr> </table> @@ -79,106 +98,106 @@ </tr> <tr> - <td>freehep.nar.src</td> + <td>maven.nar.src</td> <td>Source file directory</td> <td><code>src/main/cpp</code></td> </tr> <tr> - <td>freehep.nar.cpp.src.includes</td> + <td>maven.nar.cpp.src.includes</td> <td>C++ file pattern to include</td> <td><code>**/*.h **/*.hh **/*.cc **/*.cpp **/*.cxx</code></td> </tr> <tr> - <td>freehep.nar.cpp.src.excludes</td> + <td>maven.nar.cpp.src.excludes</td> <td>C++ file pattern to exclude</td> <td></td> </tr> <tr> - <td>freehep.nar.c.src.includes</td> + <td>maven.nar.c.src.includes</td> <td>C file pattern to include</td> <td><code>**/*.h **/*.c</code></td> </tr> <tr> - <td>freehep.nar.c.src.excludes</td> + <td>maven.nar.c.src.excludes</td> <td>C file pattern to exclude</td> <td></td> </tr> <tr> - <td>freehep.nar.fortran.src.includes</td> + <td>maven.nar.fortran.src.includes</td> <td>Fortran file pattern to include</td> <td><code>**/*.f **/*.for</code></td> </tr> <tr> - <td>freehep.nar.fortran.src.excludes</td> + <td>maven.nar.fortran.src.excludes</td> <td>Fortran file pattern to exclude</td> <td></td> </tr> <tr> - <td>freehep.nar.test.src</td> + <td>maven.nar.test.src</td> <td>Test source file directory</td> <td><code>src/test/cpp</code></td> </tr> <tr> - <td>freehep.nar.compile.includepath</td> + <td>maven.nar.compile.includepath</td> <td><a href="http://ant-contrib.sourceforge.net/includepath.html"> Include path for compilation</a></td> <td><code>src/main/include</code></td> </tr> <tr> - <td>freehep.nar.compile.sysincludepath</td> + <td>maven.nar.compile.sysincludepath</td> <td><a href="http://ant-contrib.sourceforge.net/sysincludepath.html"> System include path for compilation</a></td> <td></td> </tr> <tr> - <td>freehep.nar.compile.withjava</td> + <td>maven.nar.compile.withjava</td> <td>Adds the Java Virtual Machine include files for compilation</td> <td>false (automatic if the nar:jni goal is run and headers are generated)</td> </tr> <tr> - <td>freehep.nar.test.compile.includepath</td> + <td>maven.nar.test.compile.includepath</td> <td><a href="http://ant-contrib.sourceforge.net/includepath.html"> Include path for compilation of tests</a></td> <td><code>src/test/include</code></td> </tr> <tr> - <td>freehep.nar.link.withjava</td> + <td>maven.nar.link.withjava</td> <td>Enables the linking with the Java Virtual Machine</td> - <td><code>${freehep.nar.compile.withjava}</code></td> + <td><code>${maven.nar.compile.withjava}</code></td> </tr> <tr> - <td>freehep.nar.jni.classpath</td> + <td>maven.nar.jni.classpath</td> <td>Classpath to add for nar:jni goal</td> <td></td> </tr> <tr> - <td>freehep.nar.tests</td> + <td>maven.nar.tests</td> <td>List of test (executables) to be generated</td> <td></td> </tr> <tr> - <td>freehep.nar.includefilesonly</td> + <td>maven.nar.includefilesonly</td> <td>Generates only common NAR file. Machine-OS specific NAR file will not be made.</td> <td>false</td> </tr> <tr> - <td>freehep.nar.aol</td> + <td>maven.nar.aol</td> <td>Architecture-OS-Linker [<i>aol</i>] name, used for naming the machine specific NAR and used for the destination directory</td> <td> @@ -187,7 +206,7 @@ </tr> <tr> - <td>freehep.nar.dest</td> + <td>maven.nar.dest</td> <td>Output directory</td> <td> <code>${maven.build.dir}/nar</code> @@ -195,7 +214,7 @@ </tr> <tr> - <td>freehep.nar.test.dest</td> + <td>maven.nar.test.dest</td> <td>Test output directory</td> <td> <code>${maven.build.dir}/test-nar</code> @@ -214,26 +233,26 @@ </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.cpp.compiler</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.cpp.compiler</td> <td><a href="http://ant-contrib.sourceforge.net/compiler.html">C++ Compiler</a></td> <td>Architecture-OS-Linker specific, see <a href="#Architecture-OS">below</a></td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.c.compiler</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.c.compiler</td> <td><a href="http://ant-contrib.sourceforge.net/compiler.html">C Compiler</a></td> <td>Architecture-OS-Linker specific, see <a href="#Architecture-OS">below</a></td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.fortran.compiler</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.fortran.compiler</td> <td><a href="http://ant-contrib.sourceforge.net/compiler.html">Fortran Compiler</a></td> <td>Architecture-OS-Linker specific, see <a href="#Architecture-OS">below</a></td> </tr> <tr> - <td><i>arch.os.linker.</i>freehep.nar.linker</td> + <td><i>arch.os.linker.</i>maven.nar.linker</td> <td><a href="http://ant-contrib.sourceforge.net/linker.html">Real linker name</a></td> <td>Architecture-OS-Linker specific, see <a href="#Architecture-OS">below</a></td> </tr> @@ -251,67 +270,67 @@ </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.rtti</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.rtti</td> <td>Enable Runtime Type Identification</td> <td>true</td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.exceptions</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.exceptions</td> <td>Enable Exception Handling</td> <td>true</td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.runtime</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.runtime</td> <td><a href="http://ant-contrib.sourceforge.net/cc.html">Use static or dynamic runtime library</a></td> <td>dynamic</td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.optmize</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.optmize</td> <td><a href="http://ant-contrib.sourceforge.net/cc.html">Set optimization level</a></td> <td>none</td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.multithreaded</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.multithreaded</td> <td>Enable multithreading</td> <td>false</td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.incremental</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.incremental</td> <td>Enable incremental linking</td> <td>false</td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.failonerror</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.failonerror</td> <td>Abort if an error is detected</td> <td>true</td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.libtool</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.libtool</td> <td>Use libtool to compile and link</td> <td>false</td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.debug</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.debug</td> <td>Generate debugging code</td> <td>false</td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.outtype</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.outtype</td> <td><a href="http://ant-contrib.sourceforge.net/cc.html">Type of library to be generated</a> (use "jni" for native shareable code with java)</td> <td>static</td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.test.outtype</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.test.outtype</td> <td><a href="http://ant-contrib.sourceforge.net/cc.html">Type of test output to be generated</a></td> <td>executable</td> </tr> @@ -329,7 +348,7 @@ </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.compiler.arg.start|mid|end</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.compiler.arg.start|mid|end</td> <td> <a href="http://ant-contrib.sourceforge.net/compilerarg.html"> Space delimited list of optional compiler arguments</a>. @@ -340,7 +359,7 @@ </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.cpp.compiler.arg.start|mid|end</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.cpp.compiler.arg.start|mid|end</td> <td> <a href="http://ant-contrib.sourceforge.net/compilerarg.html"> Space delimited list of optional cpp compiler arguments</a>. @@ -351,7 +370,7 @@ </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.c.compiler.arg.start|mid|end</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.c.compiler.arg.start|mid|end</td> <td> <a href="http://ant-contrib.sourceforge.net/compilerarg.html"> Space delimited list of optional c compiler arguments</a>. @@ -362,7 +381,7 @@ </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.fortran.compiler.arg.start|mid|end</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.fortran.compiler.arg.start|mid|end</td> <td> <a href="http://ant-contrib.sourceforge.net/compilerarg.html"> Space delimited list of optional fortran compiler arguments</a>. @@ -373,7 +392,7 @@ </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.linker.arg.start|mid|end</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.linker.arg.start|mid|end</td> <td> <a href="http://ant-contrib.sourceforge.net/linkerarg.html"> Space delimited list of optional linker arguments</a>. @@ -384,7 +403,7 @@ </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.linker.test.arg.start|mid|end</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.linker.test.arg.start|mid|end</td> <td> <a href="http://ant-contrib.sourceforge.net/linkerarg.html"> Space delimited list of optional linker arguments for creating the test output</a>. @@ -406,7 +425,7 @@ </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.java.home</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.java.home</td> <td>Java Home (jdk)</td> <td> <code>${java.home}/..</code> @@ -414,19 +433,19 @@ </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.java.include</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.java.include</td> <td>Directory to look for include files for jni</td> - <td><code>${freehep.nar.java.home}/include</code></td> + <td><code>${maven.nar.java.home}/include</code></td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.java.include.os</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.java.include.os</td> <td>OS specific directory to look for include files for jni</td> <td>Architecture-OS-Linker specific, see <a href="#Architecture-OS">below</a></td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.java.vm</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.java.vm</td> <td>Location to the jvm</td> <td>Architecture-OS-Linker specific, see <a href="#Architecture-OS">below</a></td> </tr> @@ -444,31 +463,31 @@ </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.lib.prefix</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.lib.prefix</td> <td>Prefix for library name</td> <td>Architecture-OS-Linker specific, see <a href="#Architecture-OS">below</a></td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.static.extension</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.static.extension</td> <td>Extension for static library</td> <td>Architecture-OS-Linker specific, see <a href="#Architecture-OS">below</a></td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.shared.extension</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.shared.extension</td> <td>Extension for shared library</td> <td>Architecture-OS-Linker specific, see <a href="#Architecture-OS">below</a></td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.plugin.extension</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.plugin.extension</td> <td>Extension for plugin library</td> <td>Architecture-OS-Linker specific, see <a href="#Architecture-OS">below</a></td> </tr> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.executable.extension</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.executable.extension</td> <td>Extension for executable output</td> <td>Architecture-OS-Linker specific, see <a href="#Architecture-OS">below</a></td> </tr> @@ -485,33 +504,33 @@ </tr> <tr> - <td>freehep.nar.libs.type</td> + <td>maven.nar.libs.type</td> <td>Type for libraries</td> <td>static</td> </tr> <tr> - <td>freehep.nar.libs</td> + <td>maven.nar.libs</td> <td>List of library modules to link against [<i>X</i>]</td> <td></td> </tr> <tr> - <td>freehep.nar.lib.<i>X</i>.libs</td> + <td>maven.nar.lib.<i>X</i>.libs</td> <td>List of library names to link against</td> <td><i>X</i></td> </tr> <tr> - <td>freehep.nar.lib.<i>X</i>.dir</td> + <td>maven.nar.lib.<i>X</i>.dir</td> <td>Directory where to look for <i>X</i></td> - <td><code>${freehep.nar.dest}/lib</code></td> + <td><code>${maven.nar.dest}/lib</code></td> </tr> <tr> - <td>freehep.nar.lib.<i>X</i>.type</td> + <td>maven.nar.lib.<i>X</i>.type</td> <td>Type of library <i>X</i></td> - <td><code>${freehep.nar.libs.type}</code></td> + <td><code>${maven.nar.libs.type}</code></td> </tr> </table> </subsection> @@ -519,7 +538,7 @@ <subsection name="NAR packaging" > <table> <tr> - <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]freehep.nar.arch.includes</td> + <td>[<i>arch.</i>[<i>os.</i>[<i>linker.</i>]maven.nar.arch.includes</td> <td>Include these files and libraries in the arch specific nar file</td> <td>Architecture-OS-Linker specific, see <a href="#Architecture-OS">below</a></td> </tr> @@ -547,7 +566,7 @@ </tr> <tr> - <td>freehep.nar.linker</td> + <td>maven.nar.linker</td> <td>msvc</td> <td>g++</td> <td>g++</td> @@ -556,7 +575,7 @@ </tr> <tr> - <td>freehep.nar.java.home</td> + <td>maven.nar.java.home</td> <td></td> <td></td> <td></td> @@ -565,7 +584,7 @@ </tr> <tr> - <td>freehep.nar.java.include.os prefixed with <code>freehep.nar.java.home</code></td> + <td>maven.nar.java.include.os prefixed with <code>maven.nar.java.home</code></td> <td>include/win32</td> <td>include/linux</td> <td>include/linux</td> @@ -574,7 +593,7 @@ </tr> <tr> - <td>freehep.nar.java.vm prefixed with <code>freehep.nar.java.home</code></td> + <td>maven.nar.java.vm prefixed with <code>maven.nar.java.home</code></td> <td><code>lib</code></td> <td><code>jre/lib/i386/client</code></td> <td><code>jre/lib/amd64/server</code></td> @@ -583,7 +602,7 @@ </tr> <tr> - <td>freehep.nar.multithreaded</td> + <td>maven.nar.multithreaded</td> <td>true</td> <td></td> <td></td> @@ -592,7 +611,7 @@ </tr> <tr> - <td>freehep.nar.cpp.compiler</td> + <td>maven.nar.cpp.compiler</td> <td>msvc</td> <td>g++</td> <td>g++</td> @@ -601,7 +620,7 @@ </tr> <tr> - <td>freehep.nar.c.compiler</td> + <td>maven.nar.c.compiler</td> <td>msvc</td> <td>gcc</td> <td>gcc</td> @@ -610,7 +629,7 @@ </tr> <tr> - <td>freehep.nar.fortran.compiler</td> + <td>maven.nar.fortran.compiler</td> <td>df</td> <td>g77</td> <td>g77</td> @@ -619,7 +638,7 @@ </tr> <tr> - <td>freehep.nar.compiler.arg.start</td> + <td>maven.nar.compiler.arg.start</td> <td>-DWIN32</td> <td>-DLinux</td> <td>-DLinux</td> @@ -628,7 +647,7 @@ </tr> <tr> - <td>freehep.nar.linker.arg.start</td> + <td>maven.nar.linker.arg.start</td> <td></td> <td></td> <td></td> @@ -637,7 +656,7 @@ </tr> <tr> - <td>freehep.nar.arch.includes</td> + <td>maven.nar.arch.includes</td> <td>lib/**/*.lib lib/**/*.dll</td> <td>lib/**/*.a lib/**/*.so</td> <td>lib/**/*.a lib/**/*.so</td> @@ -646,7 +665,7 @@ </tr> <tr> - <td>freehep.nar.lib.prefix</td> + <td>maven.nar.lib.prefix</td> <td></td> <td>lib</td> <td>lib</td> @@ -655,7 +674,7 @@ </tr> <tr> - <td>freehep.nar.static.extension</td> + <td>maven.nar.static.extension</td> <td>.lib</td> <td>.a</td> <td>.a</td> @@ -664,7 +683,7 @@ </tr> <tr> - <td>freehep.nar.shared.extension</td> + <td>maven.nar.shared.extension</td> <td>.dll</td> <td>.so</td> <td>.so</td> @@ -673,7 +692,7 @@ </tr> <tr> - <td>freehep.nar.plugin.extension</td> + <td>maven.nar.plugin.extension</td> <td>.dll</td> <td>.so</td> <td>.so</td> @@ -682,7 +701,7 @@ </tr> <tr> - <td>freehep.nar.executable.extension</td> + <td>maven.nar.executable.extension</td> <td>.exe</td> <td></td> <td></td> @@ -708,21 +727,21 @@ </tr> <tr> - <td>freehep.nar.cpp.compiler</td> + <td>maven.nar.cpp.compiler</td> <td>g++</td> <td>icpc</td> <td>ecpc</td> </tr> <tr> - <td>freehep.nar.c.compiler</td> + <td>maven.nar.c.compiler</td> <td>gcc</td> <td>icc</td> <td>ecc</td> </tr> <tr> - <td>freehep.nar.fortran.compiler</td> + <td>maven.nar.fortran.compiler</td> <td>g77</td> <td>ifort</td> <td>ifort (should this be efc?)</td> |