diff options
author | Vikas Rangarajan <vikas@vikas-linux.tva.tvworks.com> | 2010-03-22 15:48:57 -0700 |
---|---|---|
committer | Vikas Rangarajan <vikas@vikas-linux.tva.tvworks.com> | 2010-03-22 15:48:57 -0700 |
commit | e8c35d105cf227a9a781ac4aac79dcd0c5024a6b (patch) | |
tree | ed979c6ccf8c0a9a5a6ec6ed67ff47242acfeeea /src/main/java/org/apache/maven/plugin/nar/NarSystemMojo.java | |
parent | 2bb8e535ca23632a4df9ba291709cd1c536d39cd (diff) | |
download | maven-nar-plugin-e8c35d105cf227a9a781ac4aac79dcd0c5024a6b.tar.gz maven-nar-plugin-e8c35d105cf227a9a781ac4aac79dcd0c5024a6b.tar.bz2 maven-nar-plugin-e8c35d105cf227a9a781ac4aac79dcd0c5024a6b.tar.xz maven-nar-plugin-e8c35d105cf227a9a781ac4aac79dcd0c5024a6b.zip |
Initial merge of local changes with master, main changes :
- New mojo for vcproj generation
- Fixed aol to be url-friendly for maven deployments (g++->gpp)
- Fail build early if specified include paths do not exist
- Only add "include" subdirs of sourcedirs if they exist, to the include path
- Removed duplication of source dirs in source path
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/NarSystemMojo.java')
-rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/NarSystemMojo.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarSystemMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarSystemMojo.java index 24443c3..758eb74 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarSystemMojo.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarSystemMojo.java @@ -53,7 +53,8 @@ public class NarSystemMojo for ( Iterator i = getLibraries().iterator(); !jniFound && i.hasNext(); ) { Library library = (Library) i.next(); - if ( library.getType().equals( Library.JNI ) ) + if ( library.getType().equals( Library.JNI ) + || library.getType().equals( Library.SHARED )) { packageName = library.getNarSystemPackage(); narSystemName = library.getNarSystemName(); @@ -64,6 +65,12 @@ public class NarSystemMojo if ( !jniFound || packageName == null) { + if ( !jniFound ) { + getLog().debug("NAR: not building a shared or JNI library, so not generating NarSystem class."); + } else { + getLog().warn( + "NAR: no system package specified; unable to generate NarSystem class."); + } return; } @@ -108,6 +115,12 @@ public class NarSystemMojo p.println( " System.loadLibrary(\"" + artifactId + "-" + version + "\");" ); p.println( " }" ); + p.println(""); + p.println(" public static int runUnitTests() {"); + p.println(" return new NarSystem().runUnitTestsNative();"); + p.println("}"); + p.println(""); + p.println(" public native int runUnitTestsNative();"); p.println( "}" ); p.close(); fos.close(); |