Author: brett
Date: Fri Apr 26 12:47:19 2013
New Revision: 1476174
URL: http://svn.apache.org/r1476174
Log:
[NPANDAY-580] attach manifest as well
Move attachment operations to postExecute to ensure the files already exist
Modified:
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java
Modified:
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java
URL:
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java?rev=1476174&r1=1476173&r2=1476174&view=diff
==============================================================================
---
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java
(original)
+++
incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java
Fri Apr 26 12:47:19 2013
@@ -251,7 +251,13 @@ public class MsbuildMojo
}
}
}
+ return super.preExecute();
+ }
+ @Override
+ public void postExecute()
+ throws MojoExecutionException, MojoFailureException
+ {
// #12549 - add resources generated by MSBuild to the project
String directory = new File( project.getBasedir(), "obj"
).getAbsolutePath();
if ( platform != null )
@@ -268,9 +274,16 @@ public class MsbuildMojo
if (attachXBAP) {
projectHelper.attachArtifact(project, "xbap", new File(directory,
project.getArtifactId() + ".xbap"));
+ File manifest = new File(directory, project.getArtifactId() +
".exe.manifest");
+ if (manifest.exists()) {
+ getLog().info("Attaching manifest: " + manifest);
+ projectHelper.attachArtifact(project, "exe.manifest",
manifest);
+ }
+ else {
+ getLog().debug("Manifest not found: " + manifest);
+ }
}
-
- return super.preExecute();
+ super.postExecute();
}
public ArtifactFactory getArtifactFactory()
