Merge branch 'issue-93' into devel

Author: fvarrui

settings.gradle

@@ -1 +1,2 @@
-rootProject.name = 'javapackager'
+rootProject.name = 'javapackager'
+include 'winrun4j-launcher'

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

@@ -5,19 +5,19 @@
 import org.gradle.api.Project;
 import org.gradle.api.tasks.Copy;
 
+import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
 import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.Packager;
-import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
 
 /**
- * Copies all dependencies to app folder on Maven context
+ * Copies all dependencies to app folder on Gradle context
  */
 public class CopyDependencies extends ArtifactGenerator<Packager> {
 
 	public Copy copyLibsTask;
 
 	public CopyDependencies() {
-		super("Dependencies");
+		super("Libs folder");
 	}
 
 	@Override

…avapackager/gradle/CreateWindowsExe.java …ger/gradle/CreateWindowsExeLaunch4j.javasrc/main/java/io/github/fvarrui/javapackager/gradle/CreateWindowsExe.java renamed to src/main/java/io/github/fvarrui/javapackager/gradle/CreateWindowsExeLaunch4j.java src/main/java/io/github/fvarrui/javapackager/gradle/CreateWindowsExe.java renamed to src/main/java/io/github/fvarrui/javapackager/gradle/CreateWindowsExeLaunch4j.java

@@ -16,8 +16,12 @@
 /**
  * Creates Windows native executable on Gradle context
  */
-public class CreateWindowsExe extends AbstractCreateWindowsExe {
-
+public class CreateWindowsExeLaunch4j extends AbstractCreateWindowsExe {
+	
+	public CreateWindowsExeLaunch4j() {
+		super("launch4j");
+	}
+	
 	@Override
 	protected File doApply(WindowsPackager packager) throws Exception {
 
@@ -62,7 +66,6 @@ protected File doApply(WindowsPackager packager) throws Exception {
 		l4jTask.setInternalName(winConfig.getInternalName());
 		l4jTask.setTrademarks(winConfig.getTrademarks());
 		l4jTask.setLanguage(winConfig.getLanguage());
-		// l4jTask.setLibraryDir("");
 		l4jTask.getActions().forEach(action -> action.execute(l4jTask));
 
 		sign(getGenericExe(), packager);

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

@@ -6,10 +6,10 @@
 import org.gradle.api.tasks.bundling.Zip;
 
 import io.github.fvarrui.javapackager.model.Platform;
+import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
 import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.MacPackager;
 import io.github.fvarrui.javapackager.packagers.Packager;
-import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
 
 /**
  * Creates zipball (zip file)  on Gradle context

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

@@ -0,0 +1,33 @@
+package io.github.fvarrui.javapackager.gradle;
+
+import java.io.File;
+
+import io.github.fvarrui.javapackager.model.Platform;
+import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
+import io.github.fvarrui.javapackager.packagers.LinuxPackager;
+import io.github.fvarrui.javapackager.utils.Logger;
+
+/**
+ * Creates a RPM package file including all app folder's content only for 
+ * GNU/Linux so app could be easily distributed on Gradle context
+ */
+public class GenerateRpm extends ArtifactGenerator<LinuxPackager> {
+
+	public GenerateRpm() {
+		super("RPM package");
+	}
+	
+	@Override
+	public boolean skip(LinuxPackager packager) {
+		return !packager.getLinuxConfig().isGenerateRpm() || !Platform.linux.isCurrentPlatform();
+	}
+	
+	@Override
+	protected File doApply(LinuxPackager packager) throws Exception {
+		
+		Logger.warn("Sorry! " + getArtifactName() + " generation is not yet available");
+
+		return null;
+	}
+	
+}

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

@@ -14,7 +14,6 @@
 import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
 import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.Packager;
-import io.github.fvarrui.javapackager.packagers.WindowsPackager;
 
 /**
  * Gradle context
@@ -74,11 +73,6 @@ public File resolveLicense(Packager packager) throws Exception {
 		return null;
 	}
 
-	@Override
-	public File createWindowsExe(WindowsPackager packager) throws Exception {
-		return new CreateWindowsExe().apply(packager);
-	}
-
 	public Launch4jLibraryTask getLibraryTask() {
 		return libraryTask;
 	}

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

@@ -13,9 +13,9 @@
 
 import org.apache.maven.plugin.MojoExecutionException;
 
+import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
 import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.Packager;
-import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
 
 /**
  * Copies all dependencies to app folder on Maven context

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

@@ -12,9 +12,9 @@
 import java.io.File;
 
 import io.github.fvarrui.javapackager.model.Platform;
+import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
 import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.Packager;
-import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
 
 /**

…javapackager/maven/CreateWindowsExe.java …ager/maven/CreateWindowsExeLaunch4j.javasrc/main/java/io/github/fvarrui/javapackager/maven/CreateWindowsExe.java renamed to src/main/java/io/github/fvarrui/javapackager/maven/CreateWindowsExeLaunch4j.java src/main/java/io/github/fvarrui/javapackager/maven/CreateWindowsExe.java renamed to src/main/java/io/github/fvarrui/javapackager/maven/CreateWindowsExeLaunch4j.java

@@ -26,8 +26,12 @@
 /**
  * Creates Windows executable with Maven
  */
-public class CreateWindowsExe extends AbstractCreateWindowsExe {
+public class CreateWindowsExeLaunch4j extends AbstractCreateWindowsExe {
 
+	public CreateWindowsExeLaunch4j() {
+		super("launch4j");
+	}
+
 	@Override
 	protected File doApply(WindowsPackager packager) throws Exception {
 

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

@@ -12,9 +12,9 @@
 import java.io.File;
 
 import io.github.fvarrui.javapackager.model.Platform;
+import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
 import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.Packager;
-import io.github.fvarrui.javapackager.packagers.ArtifactGenerator;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
 
 /**