summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMark Donszelmann <duns@macserver.donszelmann.org>2010-10-26 12:53:27 +0200
committerMark Donszelmann <duns@macserver.donszelmann.org>2010-10-26 12:53:27 +0200
commitb462f0a345461aa653aee1d71ade66f925543807 (patch)
tree82798c31d1f94a7ab8b6cea3360d31d529920f87 /src/main
parent9af270beb1414531363aa1fcb6cba7565ca0075a (diff)
downloadmaven-nar-plugin-b462f0a345461aa653aee1d71ade66f925543807.tar.gz
maven-nar-plugin-b462f0a345461aa653aee1d71ade66f925543807.tar.bz2
maven-nar-plugin-b462f0a345461aa653aee1d71ade66f925543807.tar.xz
maven-nar-plugin-b462f0a345461aa653aee1d71ade66f925543807.zip
Added test for NAR-158 but decided it would not work. Left the test. Native tests will include javah generated directory
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java
index 034e3ed..078f78e 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java
@@ -159,6 +159,12 @@ public class NarTestCompileMojo
task.createIncludePath().setPath( include.getPath() );
}
}
+
+ // add javah generated include path
+ File jniIncludeDir = getJavah().getJniDirectory();
+ if (jniIncludeDir.exists()) {
+ task.createIncludePath().setPath(jniIncludeDir.getPath());
+ }
// add linker
LinkerDef linkerDefinition =
@@ -170,6 +176,7 @@ public class NarTestCompileMojo
File includeDir =
getLayout().getIncludeDirectory( getTargetDirectory(), getMavenProject().getArtifactId(),
getMavenProject().getVersion() );
+
File libDir =
getLayout().getLibDirectory( getTargetDirectory(), getMavenProject().getArtifactId(),
getMavenProject().getVersion(), getAOL().toString(), test.getLink() );