summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-10-05 15:00:00 +0200
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-10-05 15:00:00 +0200
commite578a662451c9c387ac2d168fc0d7475657646ee (patch)
treee42331e41e4eee16f18a106b906e5cead1aef902
parent5f38c7ddcb0e1d0b703d121b54d960d45886e006 (diff)
downloadmaven-nar-plugin-e578a662451c9c387ac2d168fc0d7475657646ee.tar.gz
maven-nar-plugin-e578a662451c9c387ac2d168fc0d7475657646ee.tar.bz2
maven-nar-plugin-e578a662451c9c387ac2d168fc0d7475657646ee.tar.xz
maven-nar-plugin-e578a662451c9c387ac2d168fc0d7475657646ee.zip
Added it0011-executable-dep-lib-static test; Fixed reference to parent in it0008-executable-dep-lib-shared
-rw-r--r--src/it/it0008-executable-dep-lib-shared/executable-dep-lib-shared/pom.xml2
-rw-r--r--src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/pom.xml69
-rw-r--r--src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/src/main/c/HelloWorldExe.c9
-rw-r--r--src/it/it0011-executable-dep-lib-static/lib-static/pom.xml74
-rw-r--r--src/it/it0011-executable-dep-lib-static/lib-static/src/main/c/HelloWorldLib.c7
-rw-r--r--src/it/it0011-executable-dep-lib-static/lib-static/src/main/include/HelloWorldLib.h6
-rw-r--r--src/it/it0011-executable-dep-lib-static/lib-static/src/test/c/HelloWorldTest.c9
-rw-r--r--src/it/it0011-executable-dep-lib-static/pom.xml49
-rw-r--r--src/site/apt/HelloWorld.apt10
9 files changed, 229 insertions, 6 deletions
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
index b1ab9ab..aa3498b 100644
--- 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
@@ -24,7 +24,7 @@ under the License.
<parent>
<groupId>org.apache.maven.its.nar</groupId>
- <artifactId>it0004-pom</artifactId>
+ <artifactId>it0008-pom</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
diff --git a/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/pom.xml b/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/pom.xml
new file mode 100644
index 0000000..85e7d82
--- /dev/null
+++ b/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/pom.xml
@@ -0,0 +1,69 @@
+<?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>it0011-pom</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>it0011-executable-dep-lib-static</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>it0011-lib-static</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/src/main/c/HelloWorldExe.c b/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/src/main/c/HelloWorldExe.c
new file mode 100644
index 0000000..4aa35d8
--- /dev/null
+++ b/src/it/it0011-executable-dep-lib-static/executable-dep-lib-static/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/it0011-executable-dep-lib-static/lib-static/pom.xml b/src/it/it0011-executable-dep-lib-static/lib-static/pom.xml
new file mode 100644
index 0000000..3ef44a4
--- /dev/null
+++ b/src/it/it0011-executable-dep-lib-static/lib-static/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>it0011-pom</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>it0011-lib-static</artifactId>
+ <packaging>nar</packaging>
+
+ <name>Maven NAR Static Library</name>
+ <version>1.0-SNAPSHOT</version>
+ <description>
+ Simple static 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>static</type>
+ </library>
+ </libraries>
+ <tests>
+ <test>
+ <name>HelloWorldTest</name>
+ <link>static</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/it0011-executable-dep-lib-static/lib-static/src/main/c/HelloWorldLib.c b/src/it/it0011-executable-dep-lib-static/lib-static/src/main/c/HelloWorldLib.c
new file mode 100644
index 0000000..9f65143
--- /dev/null
+++ b/src/it/it0011-executable-dep-lib-static/lib-static/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/it0011-executable-dep-lib-static/lib-static/src/main/include/HelloWorldLib.h b/src/it/it0011-executable-dep-lib-static/lib-static/src/main/include/HelloWorldLib.h
new file mode 100644
index 0000000..8c50dfb
--- /dev/null
+++ b/src/it/it0011-executable-dep-lib-static/lib-static/src/main/include/HelloWorldLib.h
@@ -0,0 +1,6 @@
+#ifndef HelloWorldLib_H
+#define HelloWorldLib_H
+
+extern char* HelloWorldLib_sayHello();
+
+#endif
diff --git a/src/it/it0011-executable-dep-lib-static/lib-static/src/test/c/HelloWorldTest.c b/src/it/it0011-executable-dep-lib-static/lib-static/src/test/c/HelloWorldTest.c
new file mode 100644
index 0000000..4aa35d8
--- /dev/null
+++ b/src/it/it0011-executable-dep-lib-static/lib-static/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/it0011-executable-dep-lib-static/pom.xml b/src/it/it0011-executable-dep-lib-static/pom.xml
new file mode 100644
index 0000000..34142a2
--- /dev/null
+++ b/src/it/it0011-executable-dep-lib-static/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>it0011-pom</artifactId>
+ <packaging>pom</packaging>
+
+ <name>Maven NAR Executable and Static Library</name>
+ <version>1.0-SNAPSHOT</version>
+ <description>
+ Executable depending on a static library.
+ </description>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ </build>
+
+ <modules>
+ <module>executable-dep-lib-static</module>
+ <module>lib-static</module>
+ </modules>
+</project>
diff --git a/src/site/apt/HelloWorld.apt b/src/site/apt/HelloWorld.apt
index 2f970f4..3b5fa4d 100644
--- a/src/site/apt/HelloWorld.apt
+++ b/src/site/apt/HelloWorld.apt
@@ -39,25 +39,25 @@ There are also some unit test which are run and call the same method.
[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 "helloworldsharedlib" and links dynamically
+ [it0008-executable-dep-lib-shared] A C executable which depends on "lib-shared" and links dynamically
with it. The executable is created and run.
[helloworldsharedlibjni] A C routine called from Java, which depends on
- "helloworldsharedlib" and links dynamically with it.
+ "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.
- [helloworldstaticlibexe] A C executable which depends on "helloworldstaticlib" and links statically
+ [it0011-executable-dep-lib-static] A C executable which depends on "lib-static" and links statically
with it. The executabe is created and run.
[helloworldstaticlibjni] A C routine called from Java, which depends on
- "helloworldstaticlib" and links statically with it. A Java unit test is provided.
+ "lib-static" and links statically with it. A Java unit test is provided.
[]
- These examples are now all run as integration tests when you try to run maven on the maven-nar-plugin from its top-level directory with the profile "run-its".
+ 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".