diff options
author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-19 22:49:36 +0200 |
---|---|---|
committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-19 22:49:36 +0200 |
commit | 72983d6e09fd565f8b99764940ec51d85f8560c5 (patch) | |
tree | b8a6af6cb5d9d2309e7b2917a057d5d901fa34b8 /src/main/java/org/apache/maven/plugin/nar/Javah.java | |
parent | d03cbbf6a547b88a060f2b682df52969e067a3c7 (diff) | |
download | maven-nar-plugin-72983d6e09fd565f8b99764940ec51d85f8560c5.tar.gz maven-nar-plugin-72983d6e09fd565f8b99764940ec51d85f8560c5.tar.bz2 maven-nar-plugin-72983d6e09fd565f8b99764940ec51d85f8560c5.tar.xz maven-nar-plugin-72983d6e09fd565f8b99764940ec51d85f8560c5.zip |
Partial fix of NAR-73
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/Javah.java')
-rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/Javah.java | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/Javah.java b/src/main/java/org/apache/maven/plugin/nar/Javah.java index 2856972..8383a4f 100644 --- a/src/main/java/org/apache/maven/plugin/nar/Javah.java +++ b/src/main/java/org/apache/maven/plugin/nar/Javah.java @@ -31,7 +31,6 @@ import org.apache.bcel.classfile.ClassFormatException; import org.apache.bcel.classfile.JavaClass; import org.apache.bcel.classfile.Method; import org.apache.maven.artifact.DependencyResolutionRequiredException; -import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.toolchain.Toolchain; @@ -41,7 +40,6 @@ import org.codehaus.plexus.compiler.util.scan.SourceInclusionScanner; import org.codehaus.plexus.compiler.util.scan.StaleSourceScanner; import org.codehaus.plexus.compiler.util.scan.mapping.SingleTargetSourceMapping; import org.codehaus.plexus.compiler.util.scan.mapping.SuffixMapping; -import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.StringUtils; @@ -125,15 +123,6 @@ public class Javah * @parameter */ private File timestampFile; - - /** - * The current build session instance. - * - * @parameter expression="${session}" - * @required - * @readonly - */ - private MavenSession session; private AbstractCompileMojo mojo; @@ -250,6 +239,9 @@ public class Javah File javahFile = new File( mojo.getJavaHome( mojo.getAOL() ), "bin" ); String javah = new File( javahFile, name ).getAbsolutePath(); + Toolchain tc = getToolchain(); + System.err.println( tc.findTool( "javac" ) ); + mojo.getLog().info( "Running " + javah + " compiler on " + files.size() + " classes..." ); int result = NarUtil.runCommand( javah, generateArgs( files ), null, null, mojo.getLog() ); if ( result != 0 ) @@ -308,4 +300,20 @@ public class Javah return (String[]) args.toArray( new String[args.size()] ); } + + //TODO remove the part with ToolchainManager lookup once we depend on + //2.0.9 (have it as prerequisite). Define as regular component field then. + private Toolchain getToolchain() + { + Toolchain toolChain = null; + ToolchainManager toolchainManager = ((NarJavahMojo)mojo).toolchainManager; + System.err.println("tcm: "+toolchainManager); + + if ( toolchainManager != null ) + { + toolChain = toolchainManager.getToolchainFromBuildContext( "jdk", ((NarJavahMojo)mojo).session ); + System.err.println("tc: "+toolChain); + } + return toolChain; + } } |