svn commit: r1485952 - in /incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild: javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java src/main/csharp/NPanday/Plugin/Msbuild/MsbuildMojo.cs

[br...@apache.org]

Author: brett
Date: Fri May 24 07:20:44 2013
New Revision: 1485952

URL: http://svn.apache.org/r1485952
Log:
[NPANDAY-583] customise arguments to MSBuild

Modified:
    incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/javabinding/src/main/java/NPanday/Plugin/Msbuild/MsbuildMojo.java
    incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/main/csharp/NPanday/Plugin/Msbuild/MsbuildMojo.cs

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=1485952&r1=1485951&r2=1485952&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 May 24 07:20:44 2013
@@ -138,6 +138,12 @@ public class MsbuildMojo
      */
     private MavenProjectHelper projectHelper;
 
+    /**
+     * @parameter expression="${msbuild.extraArguments}"
+     */
+    @FieldAnnotation()
+    public String extraArguments;
+
     public String getMojoArtifactId()
     {
         return "NPanday.Plugin.Msbuild";

Modified: incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/main/csharp/NPanday/Plugin/Msbuild/MsbuildMojo.cs
URL: http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/main/csharp/NPanday/Plugin/Msbuild/MsbuildMojo.cs?rev=1485952&r1=1485951&r2=1485952&view=diff
==============================================================================
--- incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/main/csharp/NPanday/Plugin/Msbuild/MsbuildMojo.cs (original)
+++ incubator/npanday/trunk/plugins/netplugins/NPanday.Plugin.Msbuild/src/main/csharp/NPanday/Plugin/Msbuild/MsbuildMojo.cs Fri May 24 07:20:44 2013
@@ -47,6 +47,9 @@ namespace NPanday.Plugin.Msbuild
         [FieldAttribute("mavenProject", Expression = "${project}", Type = "org.apache.maven.project.MavenProject")]
         public NPanday.Model.Pom.Model mavenProject;
 
+        [FieldAttribute("extraArguments", Expression = "${msbuild.extraArguments}", Type = "java.lang.String")]
+        public string extraArguments;
+
         public override Type GetMojoImplementationType()
         {
             return this.GetType();
@@ -60,7 +63,6 @@ namespace NPanday.Plugin.Msbuild
             }
             else
             {
-                Console.WriteLine("[INFO] Executing MsBuild Plugin");
                 Directory.SetCurrentDirectory(mavenProject.build.sourceDirectory);
             
                 string projectName = mavenProject.artifactId;
@@ -78,8 +80,14 @@ namespace NPanday.Plugin.Msbuild
                 // must use /v:q here, as /v:m and above report the csc command, that includes '/errorprompt', which
                 // erroneously triggers the NPANDAY-063-001 error
                 // BuildingInsideVisualStudio is required to avoid building project references on framework 2.0
-                ProcessStartInfo processStartInfo =
-                   new ProcessStartInfo("msbuild", "/v:q /p:BuildProjectReferences=false /p:BuildingInsideVisualStudio=true " + projectName);
+                string args = "/v:q /p:BuildProjectReferences=false /p:BuildingInsideVisualStudio=true";
+                if (!string.IsNullOrEmpty(extraArguments))
+                {
+                    args += " " + extraArguments;
+                }
+                Console.WriteLine("[INFO] Executing MsBuild Plugin with arguments " + args);
+
+                ProcessStartInfo processStartInfo = new ProcessStartInfo("msbuild", args + " " + projectName);
                 processStartInfo.UseShellExecute = false;
                 Process p = System.Diagnostics.Process.Start(processStartInfo);
                 p.WaitForExit();