From f8f2fda5699908139fc5f610358538d2247ffc4d Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Mon, 11 Jan 2010 11:39:26 +0100 Subject: Renamed some directories --- .../it0016-exe-dep-lib-shared-layout20/pom.xml | 72 ++++++++++++++++++++++ .../src/main/c/HelloWorldExe.c | 9 +++ .../it0016-exe-dep-lib-shared-layout21/pom.xml | 70 +++++++++++++++++++++ .../src/main/c/HelloWorldExe.c | 9 +++ .../pom.xml | 72 ---------------------- .../src/main/c/HelloWorldExe.c | 9 --- .../pom.xml | 70 --------------------- .../src/main/c/HelloWorldExe.c | 9 --- .../apache/maven/plugin/nar/NarCompileMojo.java | 2 +- 9 files changed, 161 insertions(+), 161 deletions(-) create mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/pom.xml create mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c create mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/pom.xml create mode 100644 src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c delete mode 100644 src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/pom.xml delete mode 100644 src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c delete mode 100644 src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/pom.xml delete mode 100644 src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c diff --git a/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/pom.xml b/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/pom.xml new file mode 100644 index 0000000..3ec4393 --- /dev/null +++ b/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/pom.xml @@ -0,0 +1,72 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.nar + it0016-pom + 1.0-SNAPSHOT + + + it0016-executable-dep-lib-shared-layout20 + nar + + Maven NAR Executable and Shared Library (Layout20) + 1.0-SNAPSHOT + + Executable depending on a shared library. + + + + true + + + + integration-test + + + maven-nar-plugin + true + + + NarLayout20 + + + executable + true + + + + + + + + + + org.apache.maven.its.nar + it0016-lib-shared-layout20 + 1.0-SNAPSHOT + nar + + + diff --git a/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c b/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c new file mode 100644 index 0000000..4aa35d8 --- /dev/null +++ b/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c @@ -0,0 +1,9 @@ +#include +#include "HelloWorldLib.h" + +int main(int argc, char *argv[]) { + printf("%s\n", HelloWorldLib_sayHello()); + return 0; +} + + diff --git a/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/pom.xml b/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/pom.xml new file mode 100644 index 0000000..d5e21ef --- /dev/null +++ b/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/pom.xml @@ -0,0 +1,70 @@ + + + + + + 4.0.0 + + + org.apache.maven.its.nar + it0016-pom + 1.0-SNAPSHOT + + + it0016-executable-dep-lib-shared-layout21 + nar + + Maven NAR Executable and Shared Library (Layout21) + 1.0-SNAPSHOT + + Executable depending on a shared library. + + + + true + + + + integration-test + + + maven-nar-plugin + true + + + + executable + true + + + + + + + + + + org.apache.maven.its.nar + it0016-lib-shared-layout21 + 1.0-SNAPSHOT + nar + + + diff --git a/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c b/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c new file mode 100644 index 0000000..4aa35d8 --- /dev/null +++ b/src/it/it0016-layout/it0016-exe-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c @@ -0,0 +1,9 @@ +#include +#include "HelloWorldLib.h" + +int main(int argc, char *argv[]) { + printf("%s\n", HelloWorldLib_sayHello()); + return 0; +} + + 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 deleted file mode 100644 index 3ec4393..0000000 --- a/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.nar - it0016-pom - 1.0-SNAPSHOT - - - it0016-executable-dep-lib-shared-layout20 - nar - - Maven NAR Executable and Shared Library (Layout20) - 1.0-SNAPSHOT - - Executable depending on a shared library. - - - - true - - - - integration-test - - - maven-nar-plugin - true - - - NarLayout20 - - - executable - true - - - - - - - - - - org.apache.maven.its.nar - it0016-lib-shared-layout20 - 1.0-SNAPSHOT - nar - - - diff --git a/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c deleted file mode 100644 index 4aa35d8..0000000 --- a/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout20/src/main/c/HelloWorldExe.c +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include "HelloWorldLib.h" - -int main(int argc, char *argv[]) { - printf("%s\n", HelloWorldLib_sayHello()); - return 0; -} - - diff --git a/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/pom.xml b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/pom.xml deleted file mode 100644 index d5e21ef..0000000 --- a/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - 4.0.0 - - - org.apache.maven.its.nar - it0016-pom - 1.0-SNAPSHOT - - - it0016-executable-dep-lib-shared-layout21 - nar - - Maven NAR Executable and Shared Library (Layout21) - 1.0-SNAPSHOT - - Executable depending on a shared library. - - - - true - - - - integration-test - - - maven-nar-plugin - true - - - - executable - true - - - - - - - - - - org.apache.maven.its.nar - it0016-lib-shared-layout21 - 1.0-SNAPSHOT - nar - - - diff --git a/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c b/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c deleted file mode 100644 index 4aa35d8..0000000 --- a/src/it/it0016-layout/it0016-executable-dep-lib-shared-layout21/src/main/c/HelloWorldExe.c +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include "HelloWorldLib.h" - -int main(int argc, char *argv[]) { - printf("%s\n", HelloWorldLib_sayHello()); - return 0; -} - - diff --git a/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java index fad50fa..811ce70 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java @@ -141,7 +141,7 @@ public class NarCompileMojo // configure task CCTask task = new CCTask(); task.setProject( antProject ); - + // subsystem SubsystemEnum subSystem = new SubsystemEnum(); subSystem.setValue( library.getSubSystem() ); -- cgit v1.2.3