Allow the windows project name to be specified, fixes #23

fusesource · Apr 26, 2017 · 1c5b81f · 1c5b81f
1 parent ef3437c
commit 1c5b81f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/maven-hawtjni-plugin/src/main/java/org/fusesource/hawtjni/maven/BuildMojo.java b/maven-hawtjni-plugin/src/main/java/org/fusesource/hawtjni/maven/BuildMojo.java
@@ -230,6 +230,15 @@ public class BuildMojo extends AbstractMojo {
      */
     private String windowsBuildTool;
 
+    /**
+     * The name of the msbuild/vcbuild project to use.
+     * Defaults to 'vs2010.vcxproj' for 'msbuild'
+     * and 'vs2008.vcproj' for 'vcbuild'.
+     *
+     * @parameter
+     */
+    private String windowsProjectName;
+
     private final CLI cli = new CLI();
 
     public void execute() throws MojoExecutionException {
@@ -297,13 +306,13 @@ private void vsBasedBuild(File buildDir) throws CommandLineException, MojoExecut
 
         if( useMSBuild ) {
             // vcbuild was removed.. use the msbuild tool instead.
-            int rc = cli.system(buildDir, new String[]{"msbuild", "vs2010.vcxproj", "/property:Platform="+platform, "/property:Configuration="+configuration});
+            int rc = cli.system(buildDir, new String[]{"msbuild", windowsProjectName != null ? windowsProjectName : "vs2010.vcxproj", "/property:Platform="+platform, "/property:Configuration="+configuration});
             if( rc != 0 ) {
                 throw new MojoExecutionException("vcbuild failed with exit code: "+rc);
             }
         } else {
             // try to use a vcbuild..
-            int rc = cli.system(buildDir, new String[]{"vcbuild", "/platform:"+platform, "vs2008.vcproj", configuration});
+            int rc = cli.system(buildDir, new String[]{"vcbuild", "/platform:"+platform, windowsProjectName != null ? windowsProjectName : "vs2008.vcproj", configuration});
             if( rc != 0 ) {
                 throw new MojoExecutionException("vcbuild failed with exit code: "+rc);
             }

diff --git a/maven-hawtjni-plugin/src/main/java/org/fusesource/hawtjni/maven/GenerateMojo.java b/maven-hawtjni-plugin/src/main/java/org/fusesource/hawtjni/maven/GenerateMojo.java
@@ -169,6 +169,13 @@ public class GenerateMojo extends AbstractMojo {
      */
     private String windowsBuildTool;
 
+    /**
+     * The name of the msbuild/vcbuild project to use.
+     * Defaults to 'vs2010.vcxproj' for 'msbuild'
+     * and 'vs2008.vcproj' for 'vcbuild'.
+     */
+    private String windowsProjectName;
+
     private File targetSrcDir;
 
     private CLI cli = new CLI();
@@ -244,9 +251,9 @@ private void generateBuildSystem() throws MojoExecutionException {
                 copyTemplateResource("vs2008.vcproj", true);
                 copyTemplateResource("vs2010.vcxproj", true);
             } else if( "msbuild".equals(tool) ) {
-                copyTemplateResource("vs2010.vcxproj", true);
+                copyTemplateResource("vs2010.vcxproj", windowsProjectName != null ? windowsProjectName : "vs2010.vcxproj", true);
             } else if( "vcbuild".equals(tool) ) {
-                copyTemplateResource("vs2008.vcproj", true);
+                copyTemplateResource("vs2008.vcproj", windowsProjectName != null ? windowsProjectName : "vs2008.vcproj", true);
             } else if( "none".equals(tool) ) {
             } else {
                 throw new MojoExecutionException("Invalid setting for windowsBuildTool: "+windowsBuildTool);
@@ -291,8 +298,12 @@ private ArrayList<String> getClasspath() throws MojoExecutionException {
     }
 
     private void copyTemplateResource(String file, boolean filter) throws MojoExecutionException {
+        copyTemplateResource(file, file, filter);
+    }
+
+    private void copyTemplateResource(String file, String output, boolean filter) throws MojoExecutionException {
         try {
-            File target = FileUtils.resolveFile(packageDirectory, file);
+            File target = FileUtils.resolveFile(packageDirectory, output);
             if( target.isFile() && target.canRead() ) {
                 return;
             }