diff options
9 files changed, 238 insertions, 10 deletions
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 3b916ff..70264db 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -15,7 +15,8 @@ Bugs - Goal for Tests should be Install. -- Excecutable needs a test to run and verify the output of Executable for it0001, it0002, it0007 +- Excecutable needs a test to run and verify the output of Executable for it0001, it0002, it0007, it0008 + it0010 - Resource directory seems in GIT while it should not, it should be generated in target diff --git a/src/it/it0008-executable-dep-lib-shared/executable-dep-lib-shared/pom.xml b/src/it/it0008-executable-dep-lib-shared/executable-dep-lib-shared/pom.xml new file mode 100644 index 0000000..b1ab9ab --- /dev/null +++ b/src/it/it0008-executable-dep-lib-shared/executable-dep-lib-shared/pom.xml @@ -0,0 +1,70 @@ +<?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. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.maven.its.nar</groupId> + <artifactId>it0004-pom</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <artifactId>it0008-executable-dep-lib-shared</artifactId> + <packaging>nar</packaging> + + <name>Maven NAR Executable</name> + <version>1.0-SNAPSHOT</version> + <description> + Executable + </description> + + <build> + <defaultGoal>integration-test</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-nar-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <libraries> + <library> + <type>executable</type> + <run>true</run> + </library> + </libraries> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.apache.maven.its.nar</groupId> + <artifactId>it0008-lib-shared</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + </dependencies> +</project> diff --git a/src/it/it0008-executable-dep-lib-shared/executable-dep-lib-shared/src/main/c/HelloWorldExe.c b/src/it/it0008-executable-dep-lib-shared/executable-dep-lib-shared/src/main/c/HelloWorldExe.c new file mode 100644 index 0000000..4aa35d8 --- /dev/null +++ b/src/it/it0008-executable-dep-lib-shared/executable-dep-lib-shared/src/main/c/HelloWorldExe.c @@ -0,0 +1,9 @@ +#include <stdio.h> +#include "HelloWorldLib.h" + +int main(int argc, char *argv[]) { + printf("%s\n", HelloWorldLib_sayHello()); + return 0; +} + + diff --git a/src/it/it0008-executable-dep-lib-shared/lib-shared/pom.xml b/src/it/it0008-executable-dep-lib-shared/lib-shared/pom.xml new file mode 100644 index 0000000..4c46296 --- /dev/null +++ b/src/it/it0008-executable-dep-lib-shared/lib-shared/pom.xml @@ -0,0 +1,74 @@ +<?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. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.maven.its.nar</groupId> + <artifactId>it0008-pom</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <artifactId>it0008-lib-shared</artifactId> + <packaging>nar</packaging> + + <name>Maven NAR Shared Library</name> + <version>1.0-SNAPSHOT</version> + <description> + Simple shared library and test file + </description> + <url>http://maven.apache.org/</url> +<!-- + <properties> + <maven.test.skip>true</maven.test.skip> + </properties> +--> + + <build> + <defaultGoal>install</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-nar-plugin</artifactId> + <extensions>true</extensions> + <configuration> + <libraries> + <library> + <type>shared</type> + </library> + </libraries> + <tests> + <test> + <name>HelloWorldTest</name> + <link>shared</link> + </test> + </tests> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> +</project> diff --git a/src/it/it0008-executable-dep-lib-shared/lib-shared/src/main/c/HelloWorldLib.c b/src/it/it0008-executable-dep-lib-shared/lib-shared/src/main/c/HelloWorldLib.c new file mode 100644 index 0000000..9f65143 --- /dev/null +++ b/src/it/it0008-executable-dep-lib-shared/lib-shared/src/main/c/HelloWorldLib.c @@ -0,0 +1,7 @@ +#include <stdio.h> +#include "HelloWorldLib.h" + +char* HelloWorldLib_sayHello() { + return "Hello NAR LIB World!"; +} + diff --git a/src/it/it0008-executable-dep-lib-shared/lib-shared/src/main/include/HelloWorldLib.h b/src/it/it0008-executable-dep-lib-shared/lib-shared/src/main/include/HelloWorldLib.h new file mode 100644 index 0000000..e801bec --- /dev/null +++ b/src/it/it0008-executable-dep-lib-shared/lib-shared/src/main/include/HelloWorldLib.h @@ -0,0 +1,9 @@ +#ifndef HelloWorldLib_H +#define HelloWorldLib_H + +#ifdef WIN32 +__declspec(dllexport) +#endif +extern char* HelloWorldLib_sayHello(); + +#endif diff --git a/src/it/it0008-executable-dep-lib-shared/lib-shared/src/test/c/HelloWorldTest.c b/src/it/it0008-executable-dep-lib-shared/lib-shared/src/test/c/HelloWorldTest.c new file mode 100644 index 0000000..4aa35d8 --- /dev/null +++ b/src/it/it0008-executable-dep-lib-shared/lib-shared/src/test/c/HelloWorldTest.c @@ -0,0 +1,9 @@ +#include <stdio.h> +#include "HelloWorldLib.h" + +int main(int argc, char *argv[]) { + printf("%s\n", HelloWorldLib_sayHello()); + return 0; +} + + diff --git a/src/it/it0008-executable-dep-lib-shared/pom.xml b/src/it/it0008-executable-dep-lib-shared/pom.xml new file mode 100644 index 0000000..ad81553 --- /dev/null +++ b/src/it/it0008-executable-dep-lib-shared/pom.xml @@ -0,0 +1,49 @@ +<?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. +--> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.maven.its.nar</groupId> + <artifactId>it-parent</artifactId> + <version>1.0-SNAPSHOT</version> + <relativePath>../it-parent/pom.xml</relativePath> + </parent> + + <artifactId>it0008-pom</artifactId> + <packaging>pom</packaging> + + <name>Maven NAR Executable and Shared Library</name> + <version>1.0-SNAPSHOT</version> + <description> + Executable depending on a shared library. + </description> + + <build> + <defaultGoal>install</defaultGoal> + </build> + + <modules> + <module>executable-dep-lib-shared</module> + <module>lib-shared</module> + </modules> +</project> diff --git a/src/site/apt/HelloWorld.apt b/src/site/apt/HelloWorld.apt index 51675db..2f970f4 100644 --- a/src/site/apt/HelloWorld.apt +++ b/src/site/apt/HelloWorld.apt @@ -13,19 +13,19 @@ There are also some unit test which are run and call the same method. The following examples are available: - [executable] A C routine. + [it0001-executable] A C routine. - [executable-static] A C routine statically linked with the C-runtime library. + [it0002-executable-static] A C routine statically linked with the C-runtime library. [] - [jni] A C routine called from Java. + [it0003-jni] A C routine called from Java. - [java-dep-jni] A java project which depends on "jni". + [it0004-java-dep-jni] A java project which depends on "jni". - [jni-static] A C routine called from Java statically linked with the C-runtime library. + [it0005-jni-static] A C routine called from Java statically linked with the C-runtime library. - [jni-3rdparty] A third party JNI library called from Java. + [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: @@ -36,10 +36,10 @@ There are also some unit test which are run and call the same method. [] - [lib-shared] A C routine which gets archived into a shared library. A C test executable + [it0007-lib-shared] A C routine which gets archived into a shared library. A C test executable is created. - [helloworldsharedlibexe] A C executable which depends on "helloworldsharedlib" and links dynamically + [it0008-executable-dep-lib-shared] A C executable which depends on "helloworldsharedlib" and links dynamically with it. The executable is created and run. [helloworldsharedlibjni] A C routine called from Java, which depends on @@ -47,7 +47,7 @@ There are also some unit test which are run and call the same method. [] - [lib-static] A C routine which gets archived into a static library. A C test executable + [it0010-lib-static] A C routine which gets archived into a static library. A C test executable is created. [helloworldstaticlibexe] A C executable which depends on "helloworldstaticlib" and links statically |