diff options
author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-02 15:09:21 +0200 |
---|---|---|
committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-02 15:09:21 +0200 |
commit | 4ba4c1e4029bbfd271d362413f4f4b874853763b (patch) | |
tree | 58c4f76cd63c175d94b5185a8be459adc07b6a56 /src/xdocs | |
parent | 036283a4a568fbf96bb6a4f423509b9b9776d7c6 (diff) | |
download | maven-nar-plugin-4ba4c1e4029bbfd271d362413f4f4b874853763b.tar.gz maven-nar-plugin-4ba4c1e4029bbfd271d362413f4f4b874853763b.tar.bz2 maven-nar-plugin-4ba4c1e4029bbfd271d362413f4f4b874853763b.tar.xz maven-nar-plugin-4ba4c1e4029bbfd271d362413f4f4b874853763b.zip |
Added simple test to be run with -Prun-its
Diffstat (limited to 'src/xdocs')
-rw-r--r-- | src/xdocs/nar-dependencies.xml | 35 | ||||
-rw-r--r-- | src/xdocs/properties.xml | 191 |
2 files changed, 132 insertions, 94 deletions
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> |