diff --git a/native/plugin.jelly b/native/plugin.jelly index 0b03c398..926c200f 100644 --- a/native/plugin.jelly +++ b/native/plugin.jelly @@ -90,6 +90,45 @@ + + ${maven.native.compile.includepath} + + + + + ${maven.native.compile.sysincludepath} + + + + + + + + + + + + + + ${dep.artifactId} + + + + + + + + + + + + + + + + + + @@ -112,7 +151,7 @@ artifactDirectory = '${pom.artifactDirectory}' - + diff --git a/native/plugin.properties b/native/plugin.properties index 2e5d060b..c77b18a2 100644 --- a/native/plugin.properties +++ b/native/plugin.properties @@ -10,3 +10,6 @@ maven.native.linker.target=${maven.native.compiler.target} maven.native.src.includes=**/*.h **/*.c **/*.cpp maven.native.src.excludes= + +maven.native.compile.includepath= +maven.native.compile.sysincludepath= diff --git a/native/xdocs/changes.xml b/native/xdocs/changes.xml index 78dde022..2ae2ae7f 100644 --- a/native/xdocs/changes.xml +++ b/native/xdocs/changes.xml @@ -24,6 +24,13 @@ Brett Porter + + Changed repository location of libraries from so to sos so Maven can handle them as dependencies + Add support for native dependencies (libset/syslibset) + Add support for optional include path (includepath/sysincludepath) + update bcel (consistency) and cpptasks (cross compile) dependencies + + add src includes/excludes. Linker and compiler argument passing. diff --git a/native/xdocs/index.xml b/native/xdocs/index.xml index a52e759c..9f8eb2bd 100644 --- a/native/xdocs/index.xml +++ b/native/xdocs/index.xml @@ -22,6 +22,7 @@ Maven Native Plug-in Kasper Nielsen + Joachim Bader @@ -38,6 +39,14 @@ Date Description + + + 31 July 2004 + + support for native dependencies added + + + 26 Mar 2003 diff --git a/native/xdocs/properties.xml b/native/xdocs/properties.xml index c6b4141d..046113c0 100644 --- a/native/xdocs/properties.xml +++ b/native/xdocs/properties.xml @@ -22,6 +22,7 @@ Maven Native Plugin Properties Kasper Nielsen + Joachim Bader
@@ -112,7 +113,88 @@ + + maven.native.compiler.target + Yes + + Optional compiler target. Used for cross compile. + arm-linux means that arm-linux-gcc is + used. + + + + + maven.native.linker.target + Yes + + Optional linker target. Used for cross compile. + Default value ${maven.native.compiler.target} + + + + + maven.native.compiler.arg.start|mid|end + Yes + + Space delimted list of optional compiler arguments. + start|mid|end spcifies the position in the compiler + argument list. + + + + + maven.native.linke.arg.start|mid|end + Yes + + Space delimted list of optional linke arguments. + start|mid|end spcifies the position in the linker + argument list. + + + + + maven.native.compile.includepath + Yes + + Space delimted list of optional include pathes. + + + + + maven.native.compile.sysincludepath + Yes + + Space delimted list of optional system include pathes. + + +
+ +
+

+ Dependencies on native libraries can be handled by the maven + dependency mechanism. + + The property native.syslib is optional. If set the + syslibset tag is used insted of the normal + libset tag. + + Only sos are supported a the moment. +

+ + + group + libmyDependendLib1.0 + so + + true + + + ]]> + +
\ No newline at end of file diff --git a/native/xdocs/tasks.xml b/native/xdocs/tasks.xml index dddd4ceb..ed98424c 100644 --- a/native/xdocs/tasks.xml +++ b/native/xdocs/tasks.xml @@ -32,6 +32,14 @@

+

    +
  • + Add support for other native dependencies. Currently only + so is supported. dll and + a are not supported. Maybe introduce a property + like maven.native.libType. +
    • +