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 ++++++-- src/xdocs/properties.xml | 191 ++++++++++++++++++++++------------------- 2 files changed, 132 insertions(+), 94 deletions(-) (limited to 'src/xdocs') 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.

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 @@ + + - FreeHEP NAR Plugin Properties - Mark Donszelmann + Maven NAR Plugin Properties + Mark Donszelmann @@ -13,7 +32,7 @@ Below are the properties by group for the NAR plugin. The properties with the [arch.[os.[linker.]] 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.

@@ -26,7 +45,7 @@ maven -Dverbose - Output NAR debug stetements + Output NAR debug statements @@ -45,7 +64,7 @@ - freehep.nar.arch + maven.nar.arch Architecture [arch] (ex: x86, i386, sparc, ...) ${os.arch} @@ -53,7 +72,7 @@ - freehep.nar.os + maven.nar.os Operating System [os] (ex: Linux, win32, MacOSX, SunOs, ...) ${os.name} (Note: no spaces) @@ -61,10 +80,10 @@ - [arch.[os.]]freehep.nar.linker + [arch.[os.]]maven.nar.linker Linker [linker] (ex: msvc, g++, CC, ...), but you may use any name here and override it in - the property arch.os.linker.freehep.nar.linker to the real linker name. + the property arch.os.linker.maven.nar.linker to the real linker name. Architecture-OS specific, see below. @@ -79,106 +98,106 @@ - freehep.nar.src + maven.nar.src Source file directory src/main/cpp - freehep.nar.cpp.src.includes + maven.nar.cpp.src.includes C++ file pattern to include **/*.h **/*.hh **/*.cc **/*.cpp **/*.cxx - freehep.nar.cpp.src.excludes + maven.nar.cpp.src.excludes C++ file pattern to exclude - freehep.nar.c.src.includes + maven.nar.c.src.includes C file pattern to include **/*.h **/*.c - freehep.nar.c.src.excludes + maven.nar.c.src.excludes C file pattern to exclude - freehep.nar.fortran.src.includes + maven.nar.fortran.src.includes Fortran file pattern to include **/*.f **/*.for - freehep.nar.fortran.src.excludes + maven.nar.fortran.src.excludes Fortran file pattern to exclude - freehep.nar.test.src + maven.nar.test.src Test source file directory src/test/cpp - freehep.nar.compile.includepath + maven.nar.compile.includepath Include path for compilation src/main/include - freehep.nar.compile.sysincludepath + maven.nar.compile.sysincludepath System include path for compilation - freehep.nar.compile.withjava + maven.nar.compile.withjava Adds the Java Virtual Machine include files for compilation false (automatic if the nar:jni goal is run and headers are generated) - freehep.nar.test.compile.includepath + maven.nar.test.compile.includepath Include path for compilation of tests src/test/include - freehep.nar.link.withjava + maven.nar.link.withjava Enables the linking with the Java Virtual Machine - ${freehep.nar.compile.withjava} + ${maven.nar.compile.withjava} - freehep.nar.jni.classpath + maven.nar.jni.classpath Classpath to add for nar:jni goal - freehep.nar.tests + maven.nar.tests List of test (executables) to be generated - freehep.nar.includefilesonly + maven.nar.includefilesonly Generates only common NAR file. Machine-OS specific NAR file will not be made. false - freehep.nar.aol + maven.nar.aol Architecture-OS-Linker [aol] name, used for naming the machine specific NAR and used for the destination directory @@ -187,7 +206,7 @@ - freehep.nar.dest + maven.nar.dest Output directory ${maven.build.dir}/nar @@ -195,7 +214,7 @@ - freehep.nar.test.dest + maven.nar.test.dest Test output directory ${maven.build.dir}/test-nar @@ -214,26 +233,26 @@ - [arch.[os.[linker.]freehep.nar.cpp.compiler + [arch.[os.[linker.]maven.nar.cpp.compiler C++ Compiler Architecture-OS-Linker specific, see below - [arch.[os.[linker.]freehep.nar.c.compiler + [arch.[os.[linker.]maven.nar.c.compiler C Compiler Architecture-OS-Linker specific, see below - [arch.[os.[linker.]freehep.nar.fortran.compiler + [arch.[os.[linker.]maven.nar.fortran.compiler Fortran Compiler Architecture-OS-Linker specific, see below - arch.os.linker.freehep.nar.linker + arch.os.linker.maven.nar.linker Real linker name Architecture-OS-Linker specific, see below @@ -251,67 +270,67 @@ - [arch.[os.[linker.]freehep.nar.rtti + [arch.[os.[linker.]maven.nar.rtti Enable Runtime Type Identification true - [arch.[os.[linker.]freehep.nar.exceptions + [arch.[os.[linker.]maven.nar.exceptions Enable Exception Handling true - [arch.[os.[linker.]freehep.nar.runtime + [arch.[os.[linker.]maven.nar.runtime Use static or dynamic runtime library dynamic - [arch.[os.[linker.]freehep.nar.optmize + [arch.[os.[linker.]maven.nar.optmize Set optimization level none - [arch.[os.[linker.]freehep.nar.multithreaded + [arch.[os.[linker.]maven.nar.multithreaded Enable multithreading false - [arch.[os.[linker.]freehep.nar.incremental + [arch.[os.[linker.]maven.nar.incremental Enable incremental linking false - [arch.[os.[linker.]freehep.nar.failonerror + [arch.[os.[linker.]maven.nar.failonerror Abort if an error is detected true - [arch.[os.[linker.]freehep.nar.libtool + [arch.[os.[linker.]maven.nar.libtool Use libtool to compile and link false - [arch.[os.[linker.]freehep.nar.debug + [arch.[os.[linker.]maven.nar.debug Generate debugging code false - [arch.[os.[linker.]freehep.nar.outtype + [arch.[os.[linker.]maven.nar.outtype Type of library to be generated (use "jni" for native shareable code with java) static - [arch.[os.[linker.]freehep.nar.test.outtype + [arch.[os.[linker.]maven.nar.test.outtype Type of test output to be generated executable @@ -329,7 +348,7 @@ - [arch.[os.[linker.]freehep.nar.compiler.arg.start|mid|end + [arch.[os.[linker.]maven.nar.compiler.arg.start|mid|end Space delimited list of optional compiler arguments. @@ -340,7 +359,7 @@ - [arch.[os.[linker.]freehep.nar.cpp.compiler.arg.start|mid|end + [arch.[os.[linker.]maven.nar.cpp.compiler.arg.start|mid|end Space delimited list of optional cpp compiler arguments. @@ -351,7 +370,7 @@ - [arch.[os.[linker.]freehep.nar.c.compiler.arg.start|mid|end + [arch.[os.[linker.]maven.nar.c.compiler.arg.start|mid|end Space delimited list of optional c compiler arguments. @@ -362,7 +381,7 @@ - [arch.[os.[linker.]freehep.nar.fortran.compiler.arg.start|mid|end + [arch.[os.[linker.]maven.nar.fortran.compiler.arg.start|mid|end Space delimited list of optional fortran compiler arguments. @@ -373,7 +392,7 @@ - [arch.[os.[linker.]freehep.nar.linker.arg.start|mid|end + [arch.[os.[linker.]maven.nar.linker.arg.start|mid|end Space delimited list of optional linker arguments. @@ -384,7 +403,7 @@ - [arch.[os.[linker.]freehep.nar.linker.test.arg.start|mid|end + [arch.[os.[linker.]maven.nar.linker.test.arg.start|mid|end Space delimited list of optional linker arguments for creating the test output. @@ -406,7 +425,7 @@ - [arch.[os.[linker.]freehep.nar.java.home + [arch.[os.[linker.]maven.nar.java.home Java Home (jdk) ${java.home}/.. @@ -414,19 +433,19 @@ - [arch.[os.[linker.]freehep.nar.java.include + [arch.[os.[linker.]maven.nar.java.include Directory to look for include files for jni - ${freehep.nar.java.home}/include + ${maven.nar.java.home}/include - [arch.[os.[linker.]freehep.nar.java.include.os + [arch.[os.[linker.]maven.nar.java.include.os OS specific directory to look for include files for jni Architecture-OS-Linker specific, see below - [arch.[os.[linker.]freehep.nar.java.vm + [arch.[os.[linker.]maven.nar.java.vm Location to the jvm Architecture-OS-Linker specific, see below @@ -444,31 +463,31 @@ - [arch.[os.[linker.]freehep.nar.lib.prefix + [arch.[os.[linker.]maven.nar.lib.prefix Prefix for library name Architecture-OS-Linker specific, see below - [arch.[os.[linker.]freehep.nar.static.extension + [arch.[os.[linker.]maven.nar.static.extension Extension for static library Architecture-OS-Linker specific, see below - [arch.[os.[linker.]freehep.nar.shared.extension + [arch.[os.[linker.]maven.nar.shared.extension Extension for shared library Architecture-OS-Linker specific, see below - [arch.[os.[linker.]freehep.nar.plugin.extension + [arch.[os.[linker.]maven.nar.plugin.extension Extension for plugin library Architecture-OS-Linker specific, see below - [arch.[os.[linker.]freehep.nar.executable.extension + [arch.[os.[linker.]maven.nar.executable.extension Extension for executable output Architecture-OS-Linker specific, see below @@ -485,33 +504,33 @@ - freehep.nar.libs.type + maven.nar.libs.type Type for libraries static - freehep.nar.libs + maven.nar.libs List of library modules to link against [X] - freehep.nar.lib.X.libs + maven.nar.lib.X.libs List of library names to link against X - freehep.nar.lib.X.dir + maven.nar.lib.X.dir Directory where to look for X - ${freehep.nar.dest}/lib + ${maven.nar.dest}/lib - freehep.nar.lib.X.type + maven.nar.lib.X.type Type of library X - ${freehep.nar.libs.type} + ${maven.nar.libs.type} @@ -519,7 +538,7 @@ - + @@ -547,7 +566,7 @@ - + @@ -556,7 +575,7 @@ - + @@ -565,7 +584,7 @@ - + @@ -574,7 +593,7 @@ - + @@ -583,7 +602,7 @@ - + @@ -592,7 +611,7 @@ - + @@ -601,7 +620,7 @@ - + @@ -610,7 +629,7 @@ - + @@ -619,7 +638,7 @@ - + @@ -628,7 +647,7 @@ - + @@ -637,7 +656,7 @@ - + @@ -646,7 +665,7 @@ - + @@ -655,7 +674,7 @@ - + @@ -664,7 +683,7 @@ - + @@ -673,7 +692,7 @@ - + @@ -682,7 +701,7 @@ - + @@ -708,21 +727,21 @@ - + - + - + -- cgit v1.2.3
[arch.[os.[linker.]freehep.nar.arch.includes[arch.[os.[linker.]maven.nar.arch.includes Include these files and libraries in the arch specific nar file Architecture-OS-Linker specific, see below
freehep.nar.linkermaven.nar.linker msvc g++ g++
freehep.nar.java.homemaven.nar.java.home
freehep.nar.java.include.os prefixed with freehep.nar.java.homemaven.nar.java.include.os prefixed with maven.nar.java.home include/win32 include/linux include/linux
freehep.nar.java.vm prefixed with freehep.nar.java.homemaven.nar.java.vm prefixed with maven.nar.java.home lib jre/lib/i386/client jre/lib/amd64/server
freehep.nar.multithreadedmaven.nar.multithreaded true
freehep.nar.cpp.compilermaven.nar.cpp.compiler msvc g++ g++
freehep.nar.c.compilermaven.nar.c.compiler msvc gcc gcc
freehep.nar.fortran.compilermaven.nar.fortran.compiler df g77 g77
freehep.nar.compiler.arg.startmaven.nar.compiler.arg.start -DWIN32 -DLinux -DLinux
freehep.nar.linker.arg.startmaven.nar.linker.arg.start
freehep.nar.arch.includesmaven.nar.arch.includes lib/**/*.lib lib/**/*.dll lib/**/*.a lib/**/*.so lib/**/*.a lib/**/*.so
freehep.nar.lib.prefixmaven.nar.lib.prefix lib lib
freehep.nar.static.extensionmaven.nar.static.extension .lib .a .a
freehep.nar.shared.extensionmaven.nar.shared.extension .dll .so .so
freehep.nar.plugin.extensionmaven.nar.plugin.extension .dll .so .so
freehep.nar.executable.extensionmaven.nar.executable.extension .exe
freehep.nar.cpp.compilermaven.nar.cpp.compiler g++ icpc ecpc
freehep.nar.c.compilermaven.nar.c.compiler gcc icc ecc
freehep.nar.fortran.compilermaven.nar.fortran.compiler g77 ifort ifort (should this be efc?)