From b36dbcf19e08413b888e5a2d49dc9db44557624e Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Thu, 29 Oct 2009 11:38:17 +0100 Subject: Fixed NAR-95 --- pom.xml | 37 ++++++++----- .../apache/maven/plugin/nar/AbstractGnuMojo.java | 2 + src/site/apt/HelloWorld.apt | 63 --------------------- src/site/apt/examples.apt | 64 ++++++++++++++++++++++ src/site/site.xml | 5 +- 5 files changed, 92 insertions(+), 79 deletions(-) delete mode 100644 src/site/apt/HelloWorld.apt create mode 100644 src/site/apt/examples.apt diff --git a/pom.xml b/pom.xml index a8afe9b..bae006e 100644 --- a/pom.xml +++ b/pom.xml @@ -153,19 +153,6 @@ ---> - @@ -176,10 +163,34 @@ org.apache.maven.plugins maven-javadoc-plugin + + org.apache.maven.plugins + maven-jxr-plugin + + + check + + + + + org.apache.maven.plugins + maven-docck-plugin + + + + check + + + + + + + + run-its diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractGnuMojo.java b/src/main/java/org/apache/maven/plugin/nar/AbstractGnuMojo.java index 9be1d44..d133389 100644 --- a/src/main/java/org/apache/maven/plugin/nar/AbstractGnuMojo.java +++ b/src/main/java/org/apache/maven/plugin/nar/AbstractGnuMojo.java @@ -48,6 +48,8 @@ public abstract class AbstractGnuMojo protected File gnuSourceDirectory; /** + * Directory in which gnu sources are copied and "configured" + * * @parameter expression="${project.build.directory}/nar/gnu" * @required */ diff --git a/src/site/apt/HelloWorld.apt b/src/site/apt/HelloWorld.apt deleted file mode 100644 index f03bd70..0000000 --- a/src/site/apt/HelloWorld.apt +++ /dev/null @@ -1,63 +0,0 @@ - --- -Maven NAR Plugin - --- - --- -Mark Donszelmann - --- - -HelloWorld Examples - - These example contain a simple C method "sayHello". This method can be called from a C program, a Java program, put into -a static library, put into a shared library, use as a third party library, ... -There are also some unit test which are run and call the same method. - - The following examples are available: - - [it0001-executable] A C routine. - - [it0002-executable-static] A C routine statically linked with the C-runtime library. - - [] - - [it0003-jni] A C routine called from Java. - - [it0004-java-dep-jni] A java project which depends on "jni". - - [it0005-jni-static] A C routine called from Java statically linked with the C-runtime library. - - [it0006-jni-3rdparty] A third party JNI library called from Java. - The third party library is the "jni" from the example above and is added as resource to the project in the - form of a JNI library and a corresponding jar file. The "jni" lib is currently provided for the following - platforms: - - * x86_64-MacOSX-g++ - - [] - - [] - - [it0007-lib-shared] A C routine which gets archived into a shared library. A C test executable - is created. - - [it0008-executable-dep-lib-shared] A C executable which depends on "lib-shared" and links dynamically - with it. The executable is created and run. - - [it0009-jni-dep-lib-shared] A C routine called from Java, which depends on - "lib-shared" and links dynamically with it. - - [] - - [it0010-lib-static] A C routine which gets archived into a static library. A C test executable - is created. - - [it0011-executable-dep-lib-static] A C executable which depends on "lib-static" and links statically - with it. The executabe is created and run. - - [it0012-jni-dep-lib-static] A C routine called from Java, which depends on - "lib-static" and links statically with it. - - [] - - These examples are now all run as integration tests by running maven on the maven-nar-plugin from its top-level directory with the profile "run-its". - - diff --git a/src/site/apt/examples.apt b/src/site/apt/examples.apt new file mode 100644 index 0000000..2ce7120 --- /dev/null +++ b/src/site/apt/examples.apt @@ -0,0 +1,64 @@ + --- +Maven NAR Plugin + --- + --- +Mark Donszelmann + --- + +Examples + + These example contain a simple C method "sayHello". This method can be called from a C program, a Java program, put into +a static library, put into a shared library, use as a third party library, ... +There are also some unit test which are run and call the same method. All examples are available in the src/it +directory. + + The following examples are available: + + [it0001-executable] A C routine. + + [it0002-executable-static] A C routine statically linked with the C-runtime library. + + [] + + [it0003-jni] A C routine called from Java. + + [it0004-java-dep-jni] A java project which depends on "jni". + + [it0005-jni-static] A C routine called from Java statically linked with the C-runtime library. + + [it0006-jni-3rdparty] A third party JNI library called from Java. + The third party library is the "jni" from the example above and is added as resource to the project in the + form of a JNI library and a corresponding jar file. The "jni" lib is currently provided for the following + platforms: + + * x86_64-MacOSX-g++ + + [] + + [] + + [it0007-lib-shared] A C routine which gets archived into a shared library. A C test executable + is created. + + [it0008-executable-dep-lib-shared] A C executable which depends on "lib-shared" and links dynamically + with it. The executable is created and run. + + [it0009-jni-dep-lib-shared] A C routine called from Java, which depends on + "lib-shared" and links dynamically with it. + + [] + + [it0010-lib-static] A C routine which gets archived into a static library. A C test executable + is created. + + [it0011-executable-dep-lib-static] A C executable which depends on "lib-static" and links statically + with it. The executabe is created and run. + + [it0012-jni-dep-lib-static] A C routine called from Java, which depends on + "lib-static" and links statically with it. + + [] + + These examples are now all run as integration tests by running maven on the maven-nar-plugin from its top-level directory with the profile "run-its". + + diff --git a/src/site/site.xml b/src/site/site.xml index 1c0190f..7e98cd5 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -43,6 +43,7 @@ under the License. + @@ -56,9 +57,7 @@ under the License. - - - + -- cgit v1.2.3