Fix some other problems with platform, especially on windows when com…

…piling for the non native platform
fusesource · Apr 27, 2017 · 477c8cc · 477c8cc
1 parent 58834e8
commit 477c8cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 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
@@ -325,7 +325,7 @@ private void vsBasedBuild(File buildDir) throws CommandLineException, MojoExecut
             throw new MojoExecutionException("vcbuild did not generate: "+libFile);
         }        
 
-        File target=FileUtils.resolveFile(libDirectory, library.getPlatformSpecificResourcePath());
+        File target=FileUtils.resolveFile(libDirectory, library.getPlatformSpecificResourcePath(libPlatform));
         FileUtils.copyFile(libFile, target);
 
 	}

diff --git a/maven-hawtjni-plugin/src/main/java/org/fusesource/hawtjni/maven/PackageJarMojo.java b/maven-hawtjni-plugin/src/main/java/org/fusesource/hawtjni/maven/PackageJarMojo.java
@@ -91,7 +91,7 @@ public class PackageJarMojo extends AbstractMojo {
      * The platform identifier of this build.  If not specified,
      * it will be automatically detected.
      * 
-     * @parameter default-value="${hawtjni-platform}"
+     * @parameter
      */
     private String platform;     
 
@@ -115,8 +115,8 @@ public void execute() throws MojoExecutionException {
         try {
 
             Library library = new Library(name);
-            if (platform == null || platform.trim().length()==0 ) {
-                platform = library.getPlatform();
+            if (platform == null) {
+                platform = Library.getPlatform();
             }
 
             String classifier = null;