summaryrefslogtreecommitdiff
path: root/src/it/it0016-layout
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-12-15 22:53:33 +0100
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-12-15 22:53:33 +0100
commit54c4c84888b840be561565f79654e59f80766ecc (patch)
treebcf346d5dc996fa77e840e30f643ceb47dac3b00 /src/it/it0016-layout
parent8c046e79b56e71bd0a9f3787712963bc2523d8f1 (diff)
downloadmaven-nar-plugin-54c4c84888b840be561565f79654e59f80766ecc.tar.gz
maven-nar-plugin-54c4c84888b840be561565f79654e59f80766ecc.tar.bz2
maven-nar-plugin-54c4c84888b840be561565f79654e59f80766ecc.tar.xz
maven-nar-plugin-54c4c84888b840be561565f79654e59f80766ecc.zip
Fixed NAR-90 and NAR-118
Diffstat (limited to 'src/it/it0016-layout')
-rw-r--r--src/it/it0016-layout/include/HelloWorldLib.h (renamed from src/it/it0016-layout/it0016-lib-shared/src/main/include/HelloWorldLib.h)0
-rw-r--r--src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/pom.xml70
-rw-r--r--src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c (renamed from src/it/it0016-layout/it0016-executable-dep-lib-shared/src/main/c/HelloWorldExe.c)0
-rw-r--r--src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/pom.xml (renamed from src/it/it0016-layout/it0016-executable-dep-lib-shared/pom.xml)7
-rw-r--r--src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c (renamed from src/it/it0016-layout/it0016-lib-shared/src/test/c/HelloWorldTest.c)0
-rw-r--r--src/it/it0016-layout/it0016-lib-shared-layout20/pom.xml (renamed from src/it/it0016-layout/it0016-lib-shared/pom.xml)4
-rw-r--r--src/it/it0016-layout/it0016-lib-shared-layout20/src/main/c/HelloWorldLib.c (renamed from src/it/it0016-layout/it0016-lib-shared/src/main/c/HelloWorldLib.c)0
-rw-r--r--src/it/it0016-layout/it0016-lib-shared-layout20/src/main/include/HelloWorldLib.h9
-rw-r--r--src/it/it0016-layout/it0016-lib-shared-layout20/src/test/c/HelloWorldTest.c9
-rw-r--r--src/it/it0016-layout/it0016-lib-shared-layout21/pom.xml68
-rw-r--r--src/it/it0016-layout/it0016-lib-shared-layout21/src/main/c/HelloWorldLib.c7
-rw-r--r--src/it/it0016-layout/it0016-lib-shared-layout21/src/main/include/HelloWorldLib.h9
-rw-r--r--src/it/it0016-layout/it0016-lib-shared-layout21/src/test/c/HelloWorldTest.c9
-rw-r--r--src/it/it0016-layout/lib/x86_64-MacOSX-g++/shared/history.xml8
-rw-r--r--src/it/it0016-layout/lib/x86_64-MacOSX-g++/shared/libit0016-lib-shared-1.0-SNAPSHOT.dylibbin0 -> 4240 bytes
-rw-r--r--src/it/it0016-layout/pom.xml6
16 files changed, 198 insertions, 8 deletions
diff --git a/src/it/it0016-layout/it0016-lib-shared/src/main/include/HelloWorldLib.h b/src/it/it0016-layout/include/HelloWorldLib.h
index e801bec..e801bec 100644
--- a/src/it/it0016-layout/it0016-lib-shared/src/main/include/HelloWorldLib.h
+++ b/src/it/it0016-layout/include/HelloWorldLib.h
diff --git a/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/pom.xml b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/pom.xml
new file mode 100644
index 0000000..9974d0a
--- /dev/null
+++ b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/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>it0016-pom</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>it0016-executable-dep-lib-shared-layout20</artifactId>
+ <packaging>nar</packaging>
+
+ <name>Maven NAR Executable and Shared Library (Layout20)</name>
+ <version>1.0-SNAPSHOT</version>
+ <description>
+ Executable depending on a shared library.
+ </description>
+
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+
+ <build>
+ <defaultGoal>integration-test</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-nar-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <!-- dependencies get unpacked in NarLayout 20 -->
+ <layout>NarLayout20</layout>
+ <libraries>
+ <library>
+ <type>executable</type>
+ <run>true</run>
+ </library>
+ </libraries>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.its.nar</groupId>
+ <artifactId>it0016-lib-shared-layout20</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/src/it/it0016-layout/it0016-executable-dep-lib-shared/src/main/c/HelloWorldExe.c b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c
index 4aa35d8..4aa35d8 100644
--- a/src/it/it0016-layout/it0016-executable-dep-lib-shared/src/main/c/HelloWorldExe.c
+++ b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c
diff --git a/src/it/it0016-layout/it0016-executable-dep-lib-shared/pom.xml b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/pom.xml
index e73be91..3322daa 100644
--- a/src/it/it0016-layout/it0016-executable-dep-lib-shared/pom.xml
+++ b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/pom.xml
@@ -28,10 +28,10 @@ under the License.
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>it0016-executable-dep-lib-shared</artifactId>
+ <artifactId>it0016-executable-dep-lib-shared-layout21</artifactId>
<packaging>nar</packaging>
- <name>Maven NAR Executable and Shared Library</name>
+ <name>Maven NAR Executable and Shared Library (Layout21)</name>
<version>1.0-SNAPSHOT</version>
<description>
Executable depending on a shared library.
@@ -48,7 +48,6 @@ under the License.
<artifactId>maven-nar-plugin</artifactId>
<extensions>true</extensions>
<configuration>
- <layout>NarLayout20</layout>
<libraries>
<library>
<type>executable</type>
@@ -62,7 +61,7 @@ under the License.
<dependencies>
<dependency>
<groupId>org.apache.maven.its.nar</groupId>
- <artifactId>it0016-lib-shared</artifactId>
+ <artifactId>it0016-lib-shared-layout21</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/src/it/it0016-layout/it0016-lib-shared/src/test/c/HelloWorldTest.c b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c
index 4aa35d8..4aa35d8 100644
--- a/src/it/it0016-layout/it0016-lib-shared/src/test/c/HelloWorldTest.c
+++ b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c
diff --git a/src/it/it0016-layout/it0016-lib-shared/pom.xml b/src/it/it0016-layout/it0016-lib-shared-layout20/pom.xml
index 831e48e..1b4c319 100644
--- a/src/it/it0016-layout/it0016-lib-shared/pom.xml
+++ b/src/it/it0016-layout/it0016-lib-shared-layout20/pom.xml
@@ -28,10 +28,10 @@ under the License.
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>it0016-lib-shared</artifactId>
+ <artifactId>it0016-lib-shared-layout20</artifactId>
<packaging>nar</packaging>
- <name>Maven NAR Shared Library</name>
+ <name>Maven NAR Shared Library (Layout20)</name>
<version>1.0-SNAPSHOT</version>
<description>
Simple shared library and test file
diff --git a/src/it/it0016-layout/it0016-lib-shared/src/main/c/HelloWorldLib.c b/src/it/it0016-layout/it0016-lib-shared-layout20/src/main/c/HelloWorldLib.c
index 9f65143..9f65143 100644
--- a/src/it/it0016-layout/it0016-lib-shared/src/main/c/HelloWorldLib.c
+++ b/src/it/it0016-layout/it0016-lib-shared-layout20/src/main/c/HelloWorldLib.c
diff --git a/src/it/it0016-layout/it0016-lib-shared-layout20/src/main/include/HelloWorldLib.h b/src/it/it0016-layout/it0016-lib-shared-layout20/src/main/include/HelloWorldLib.h
new file mode 100644
index 0000000..e801bec
--- /dev/null
+++ b/src/it/it0016-layout/it0016-lib-shared-layout20/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/it0016-layout/it0016-lib-shared-layout20/src/test/c/HelloWorldTest.c b/src/it/it0016-layout/it0016-lib-shared-layout20/src/test/c/HelloWorldTest.c
new file mode 100644
index 0000000..4aa35d8
--- /dev/null
+++ b/src/it/it0016-layout/it0016-lib-shared-layout20/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/it0016-layout/it0016-lib-shared-layout21/pom.xml b/src/it/it0016-layout/it0016-lib-shared-layout21/pom.xml
new file mode 100644
index 0000000..8eceedc
--- /dev/null
+++ b/src/it/it0016-layout/it0016-lib-shared-layout21/pom.xml
@@ -0,0 +1,68 @@
+<?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>it0016-pom</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>it0016-lib-shared-layout21</artifactId>
+ <packaging>nar</packaging>
+
+ <name>Maven NAR Shared Library (Layout21)</name>
+ <version>1.0-SNAPSHOT</version>
+ <description>
+ Simple shared library and test file
+ </description>
+ <url>http://maven.apache.org/</url>
+
+ <properties>
+ <skipTests>true</skipTests>
+ </properties>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-nar-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <layout>NarLayout21</layout>
+ <libraries>
+ <library>
+ <type>shared</type>
+ </library>
+ </libraries>
+ <tests>
+ <test>
+ <name>HelloWorldTest</name>
+ <link>shared</link>
+ </test>
+ </tests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
diff --git a/src/it/it0016-layout/it0016-lib-shared-layout21/src/main/c/HelloWorldLib.c b/src/it/it0016-layout/it0016-lib-shared-layout21/src/main/c/HelloWorldLib.c
new file mode 100644
index 0000000..9f65143
--- /dev/null
+++ b/src/it/it0016-layout/it0016-lib-shared-layout21/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/it0016-layout/it0016-lib-shared-layout21/src/main/include/HelloWorldLib.h b/src/it/it0016-layout/it0016-lib-shared-layout21/src/main/include/HelloWorldLib.h
new file mode 100644
index 0000000..e801bec
--- /dev/null
+++ b/src/it/it0016-layout/it0016-lib-shared-layout21/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/it0016-layout/it0016-lib-shared-layout21/src/test/c/HelloWorldTest.c b/src/it/it0016-layout/it0016-lib-shared-layout21/src/test/c/HelloWorldTest.c
new file mode 100644
index 0000000..4aa35d8
--- /dev/null
+++ b/src/it/it0016-layout/it0016-lib-shared-layout21/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/it0016-layout/lib/x86_64-MacOSX-g++/shared/history.xml b/src/it/it0016-layout/lib/x86_64-MacOSX-g++/shared/history.xml
new file mode 100644
index 0000000..2004850
--- /dev/null
+++ b/src/it/it0016-layout/lib/x86_64-MacOSX-g++/shared/history.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<history>
+ <processor signature="4.2.1 -dynamiclib -fexceptions -lstdc++">
+ <target file="libit0016-lib-shared-1.0-SNAPSHOT.dylib" lastModified="125783ffc48">
+ <source file="../../../../../obj/x86_64-MacOSX-g++/HelloWorldLib.o" lastModified="125783ff478"/>
+ </target>
+ </processor>
+</history>
diff --git a/src/it/it0016-layout/lib/x86_64-MacOSX-g++/shared/libit0016-lib-shared-1.0-SNAPSHOT.dylib b/src/it/it0016-layout/lib/x86_64-MacOSX-g++/shared/libit0016-lib-shared-1.0-SNAPSHOT.dylib
new file mode 100644
index 0000000..fa18419
--- /dev/null
+++ b/src/it/it0016-layout/lib/x86_64-MacOSX-g++/shared/libit0016-lib-shared-1.0-SNAPSHOT.dylib
Binary files differ
diff --git a/src/it/it0016-layout/pom.xml b/src/it/it0016-layout/pom.xml
index 0fc5b68..c72a6f3 100644
--- a/src/it/it0016-layout/pom.xml
+++ b/src/it/it0016-layout/pom.xml
@@ -44,7 +44,9 @@ under the License.
</build>
<modules>
- <module>it0016-executable-dep-lib-shared</module>
- <module>it0016-lib-shared</module>
+ <module>it0016-executable-dep-lib-shared-layout20</module>
+ <module>it0016-executable-dep-lib-shared-layout21</module>
+ <module>it0016-lib-shared-layout20</module>
+ <module>it0016-lib-shared-layout21</module>
</modules>
</project>