diff options
| author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-29 16:10:25 +0100 |
|---|---|---|
| committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-10-29 16:10:25 +0100 |
| commit | 0007cfb94d604bcd650a657dab1dfa765b034fd3 (patch) | |
| tree | 23bd96f7164d830299feb567a52752d2bf1b9c00 | |
| parent | 2adbe5725a399ac1df275d299e5b352e9e589eaf (diff) | |
| download | maven-nar-plugin-0007cfb94d604bcd650a657dab1dfa765b034fd3.tar.gz maven-nar-plugin-0007cfb94d604bcd650a657dab1dfa765b034fd3.tar.bz2 maven-nar-plugin-0007cfb94d604bcd650a657dab1dfa765b034fd3.tar.xz maven-nar-plugin-0007cfb94d604bcd650a657dab1dfa765b034fd3.zip | |
Possible fix for part of NAR-1 related to DLL under VC 9
| -rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/Linker.java | 3 | ||||
| -rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/Linker.java b/src/main/java/org/apache/maven/plugin/nar/Linker.java index f09458a..5d9069f 100644 --- a/src/main/java/org/apache/maven/plugin/nar/Linker.java +++ b/src/main/java/org/apache/maven/plugin/nar/Linker.java @@ -206,9 +206,6 @@ public class Linker { throw new MojoFailureException( "Cannot find version number for linker '" + name + "'" ); } - System.err.println( "O " + out ); - System.err.println( "E " + err ); - System.err.println( "D " + dbg ); return version; } 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 4b2d1f5..63b12e6 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java @@ -330,11 +330,11 @@ public class NarCompileMojo { throw new MojoExecutionException( "NAR: Compile failed", e ); } - + // FIXME, this should be done in CPPTasks at some point if ( getRuntime( getAOL() ).equals( "dynamic" ) && getOS().equals( OS.WINDOWS ) && getLinker().getName( null, null ).equals( "msvc" ) - && NarUtil.getEnv( "MSVCVer", "MSVCVer", "6.0" ).startsWith( "8." ) ) + && !getLinker().getVersion().startsWith( "6." ) ) { String libType = library.getType(); if ( libType.equals( Library.JNI ) || libType.equals( Library.SHARED ) ) |