summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-13 22:14:54 +0100
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-13 22:14:54 +0100
commit4e3b01acebc8594f0900ef978330a1bcce61c036 (patch)
tree32011fc32a3876ea559ad89e9e4e09bea996e6d6 /src/main
parent0121e954df7ebaf38eeeba74e5748db2760fb75e (diff)
downloadmaven-nar-plugin-4e3b01acebc8594f0900ef978330a1bcce61c036.tar.gz
maven-nar-plugin-4e3b01acebc8594f0900ef978330a1bcce61c036.tar.bz2
maven-nar-plugin-4e3b01acebc8594f0900ef978330a1bcce61c036.tar.xz
maven-nar-plugin-4e3b01acebc8594f0900ef978330a1bcce61c036.zip
Fix for creating manifest in VS 2010 beta 2
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/Linker.java9
1 files changed, 9 insertions, 0 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 2bfc6aa..385bdf2 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Linker.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Linker.java
@@ -288,6 +288,15 @@ public class Linker
linker.addConfiguredLinkerArg( arg );
}
}
+
+ // FIXME, this should be done in CPPTasks at some point, and may not be necessary, but was for VS 2010 beta 2
+ if ( os.equals( OS.WINDOWS )
+ && getName( null, null ).equals( "msvc" ) && !getVersion().startsWith( "6." ) ) {
+ LinkerArgument arg = new LinkerArgument();
+ arg.setValue( "/MANIFEST" );
+ linker.addConfiguredLinkerArg( arg );
+ }
+
// Add options to linker
if ( options != null )