Merge branch 'issue-115'

Author: fvarrui

src/main/java/io/github/fvarrui/javapackager/gradle/GenerateRpm.java

@@ -26,11 +26,7 @@ public class GradleContext extends Context<Logger> {
 
 	public GradleContext(Project project) {
 		super();
-		this.project = project;
-		
-		// gradle dependant generators 
-		this.getLinuxInstallerGenerators().add(new GenerateRpm());
-		
+		this.project = project;		
 	}
 
 	public Logger getLogger() {

src/main/java/io/github/fvarrui/javapackager/gradle/GradleContext.java

@@ -18,13 +18,8 @@ public class MavenContext extends Context<Log> {
 
 	public MavenContext(ExecutionEnvironment env, Log logger) {
 		super();
-		
 		this.env = env;
 		this.logger = logger;
-		
-		// maven dependant generators 		
-		this.getLinuxInstallerGenerators().add(new GenerateRpm());
-		
 	}
 
 	public ExecutionEnvironment getEnv() {

src/main/java/io/github/fvarrui/javapackager/maven/GenerateRpm.java

@@ -16,9 +16,13 @@ public Context() {
 		super();
 
 		// building tool independent generators
+		
 		linuxInstallerGenerators.add(new GenerateDeb());
+		linuxInstallerGenerators.add(new GenerateRpm());
+		
 		macInstallerGenerators.add(new GenerateDmg());
 		macInstallerGenerators.add(new GeneratePkg());
+		
 		windowsInstallerGenerators.add(new GenerateSetup());
 		windowsInstallerGenerators.add(new GenerateMsm());
 		windowsInstallerGenerators.add(new GenerateMsi());		

src/main/java/io/github/fvarrui/javapackager/maven/MavenContext.java

@@ -9,6 +9,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import io.github.fvarrui.javapackager.model.MacConfig;
+import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.utils.FileUtils;
 import io.github.fvarrui.javapackager.utils.Logger;
 import io.github.fvarrui.javapackager.utils.ThreadUtils;
@@ -26,7 +27,17 @@ public GenerateDmg() {
 
 	@Override
 	public boolean skip(Packager packager) {
-		return !packager.getMacConfig().isGenerateDmg();
+		
+		if (!packager.getMacConfig().isGenerateDmg()) {
+			return true;
+		}
+		
+		if (!packager.getPlatform().isCurrentPlatform()) {
+			Logger.warn(getArtifactName() + " cannot be generated due to the target platform (" + packager.getPlatform() + ") is different from the execution platform (" + Platform.getCurrentPlatform() + ")!");
+			return true;
+		}
+		
+		return false;		
 	}
 
 	@Override

src/main/java/io/github/fvarrui/javapackager/packagers/Context.java

@@ -4,6 +4,7 @@
 
 import java.io.File;
 
+import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.utils.Logger;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
 import io.github.fvarrui.javapackager.utils.XMLUtils;
@@ -20,7 +21,17 @@ public GenerateMsi() {
 
 	@Override
 	public boolean skip(Packager packager) {
-		return !packager.getWinConfig().isGenerateMsi();
+		
+		if (!packager.getWinConfig().isGenerateMsi()) {
+			return true;
+		}
+		
+		if (!packager.getPlatform().isCurrentPlatform()) {
+			Logger.warn(getArtifactName() + " cannot be generated due to the target platform (" + packager.getPlatform() + ") is different from the execution platform (" + Platform.getCurrentPlatform() + ")!");
+			return true;
+		}
+		
+		return false;		
 	}
 
 	@Override

src/main/java/io/github/fvarrui/javapackager/packagers/GenerateDmg.java

@@ -2,6 +2,7 @@
 
 import java.io.File;
 
+import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.utils.CommandUtils;
 import io.github.fvarrui.javapackager.utils.Logger;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
@@ -19,7 +20,17 @@ public GenerateMsm() {
 
 	@Override
 	public boolean skip(Packager packager) {
-		return !packager.getWinConfig().isGenerateMsm() && !packager.getWinConfig().isGenerateMsi();
+		
+		if (!packager.getWinConfig().isGenerateMsm() && !packager.getWinConfig().isGenerateMsi()) {
+			return true;
+		}
+		
+		if (!packager.getPlatform().isCurrentPlatform()) {
+			Logger.warn(getArtifactName() + " cannot be generated due to the target platform (" + packager.getPlatform() + ") is different from the execution platform (" + Platform.getCurrentPlatform() + ")!");
+			return true;
+		}
+		
+		return false;
 	}
 
 	@Override

src/main/java/io/github/fvarrui/javapackager/packagers/GenerateMsi.java

@@ -2,7 +2,9 @@
 
 import java.io.File;
 
+import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.utils.CommandUtils;
+import io.github.fvarrui.javapackager.utils.Logger;
 
 /**
  * Creates a PKG installer file including all app folder's content only for MacOS so
@@ -16,7 +18,17 @@ public GeneratePkg() {
 
 	@Override
 	public boolean skip(Packager packager) {
-		return !packager.getMacConfig().isGeneratePkg();
+		
+		if (!packager.getMacConfig().isGeneratePkg()) {
+			return true;
+		}
+		
+		if (!packager.getPlatform().isCurrentPlatform()) {
+			Logger.warn(getArtifactName() + " cannot be generated due to the target platform (" + packager.getPlatform() + ") is different from the execution platform (" + Platform.getCurrentPlatform() + ")!");
+			return true;
+		}
+		
+		return false;
 	}
 
 	@Override