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/xdocs/nar-dependencies.xml | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) (limited to 'src/xdocs/nar-dependencies.xml') 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 @@ + + - NAR Dependencies - Mark Donszelmann + NAR Dependencies + Mark Donszelmann
@@ -47,7 +66,7 @@ - freehep.nar.nars + maven.nar.nars Space separated list of other nar files to download. @@ -76,7 +95,7 @@ [arch.[os.[linker.]DependentArtifact-nar.local Specifies that the DependentArtifact is installed locally (in a different place than the local - repository. The property freehep.nar.nars will be ignored. + repository. The property maven.nar.nars will be ignored. One would typically use this for standard libs such as zlib and others. false @@ -108,7 +127,7 @@ [arch.[os.[linker.]DependentArtifact-nar.type Specify the type of linking - ${freehep.nar.libs.type} + ${maven.nar.libs.type} @@ -122,7 +141,7 @@ 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. - ${freehep.nar.aol.name} + ${maven.nar.aol.name} @@ -131,7 +150,7 @@ If the property DependentArtifact-nar.local is set to true, then no further files will be downloaded or installed and the properties DependentArtifact-nar.dir and DependentArtifact-nar.include will be used for compilation and linking with this DependentArtifact. - 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 DependentArtifact-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 @@

When generating a set of NAR files, the Artifact-nar-Version.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 Artifact-nar.linkLibs. Any other properties can be specified + properties maven.nar.nars and Artifact-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.

-- cgit v1.2.3