summaryrefslogtreecommitdiff
path: root/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-16 23:05:54 +0100
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-16 23:05:54 +0100
commitbb9f382d1024e60f672b9c484031f40772a54a4b (patch)
tree32ca1fa8894b54aca1e0fbed596e4f7b1f0adaca /src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
parent9da8be3cb31159c4d44d72f98de663c8350ff770 (diff)
downloadmaven-nar-plugin-bb9f382d1024e60f672b9c484031f40772a54a4b.tar.gz
maven-nar-plugin-bb9f382d1024e60f672b9c484031f40772a54a4b.tar.bz2
maven-nar-plugin-bb9f382d1024e60f672b9c484031f40772a54a4b.tar.xz
maven-nar-plugin-bb9f382d1024e60f672b9c484031f40772a54a4b.zip
Reformat
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java')
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java8
1 files changed, 8 insertions, 0 deletions
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 8664d96..f8b8e81 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
@@ -58,7 +58,9 @@ public class NarCompileMojo
throws MojoExecutionException, MojoFailureException
{
if ( shouldSkip() )
+ {
return;
+ }
// make sure destination is there
getTargetDirectory().mkdirs();
@@ -103,8 +105,10 @@ public class NarCompileMojo
{
File dir = (File) i.next();
if ( dir.exists() )
+ {
files.addAll( FileUtils.getFiles( dir, StringUtils.join( compiler.getIncludes().iterator(), "," ),
null ) );
+ }
}
return files;
}
@@ -191,7 +195,9 @@ public class NarCompileMojo
// add javah include path
File jniDirectory = getJavah().getJniDirectory();
if ( jniDirectory.exists() )
+ {
task.createIncludePath().setPath( jniDirectory.getPath() );
+ }
// add java include paths
getJava().addIncludePaths( task, type );
@@ -345,7 +351,9 @@ public class NarCompileMojo
NarUtil.runCommand( "mt.exe", new String[] { "/manifest", manifest,
"/outputresource:" + dll + ";#2" }, null, null, getLog() );
if ( result != 0 )
+ {
throw new MojoFailureException( "MT.EXE failed with exit code: " + result );
+ }
}
}
}