Merge branch 'issue-250' into devel

Author: fvarrui

build.gradle

@@ -232,8 +232,8 @@ nexusStaging {
 
 task updateUniversalJavaApplicationStub(type : Download) {
 	def version = '20220410.162252'
-	group 'Update universalJavaApplicationStub'
-	description 'Downloads and ovewrites compiled and scripted versions of universalJavaApplicationStub to src/main/resources/mac and overrides the existing ones.'	
+	group 'Update assets'
+	description 'Downloads compiled and scripted versions of universalJavaApplicationStub to src/main/resources/mac and overrides the existing ones.'	
 	src([
 		"https://github.com/fvarrui/universalJavaApplicationStub/releases/download/${version}/universalJavaApplicationStub.sh",
 		"https://github.com/fvarrui/universalJavaApplicationStub/releases/download/${version}/universalJavaApplicationStub.x86_64",
@@ -243,3 +243,15 @@ task updateUniversalJavaApplicationStub(type : Download) {
 	dest file('src/main/resources/mac')
     overwrite true
 }
+
+task updateWhyJavaLauncher(type : Download) {
+	def version = '1.1.2'
+	group 'Update assets'
+	description 'Downloads JavaLauncher.exe to src/main/resources/windows and overwrites the existing one.'	
+	src([
+		"https://github.com/AstroImageJ/Why/releases/download/${version}/JavaLauncher.exe"
+	])
+	dest file('src/main/resources/windows')
+    overwrite true
+}
+

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

@@ -8,6 +8,7 @@
 
 import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
 import io.github.fvarrui.javapackager.model.WindowsConfig;
+import io.github.fvarrui.javapackager.model.WindowsExeCreationTool;
 import io.github.fvarrui.javapackager.packagers.AbstractCreateWindowsExe;
 import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.WindowsPackager;
@@ -19,7 +20,7 @@
 public class CreateWindowsExeLaunch4j extends AbstractCreateWindowsExe {
 
 	public CreateWindowsExeLaunch4j() {
-		super("launch4j");
+		super(WindowsExeCreationTool.launch4j);
 	}
 
 	@Override

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

@@ -18,6 +18,7 @@
 import org.twdata.maven.mojoexecutor.MojoExecutor.Element;
 
 import io.github.fvarrui.javapackager.model.WindowsConfig;
+import io.github.fvarrui.javapackager.model.WindowsExeCreationTool;
 import io.github.fvarrui.javapackager.packagers.AbstractCreateWindowsExe;
 import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.WindowsPackager;
@@ -29,7 +30,7 @@
 public class CreateWindowsExeLaunch4j extends AbstractCreateWindowsExe {
 
 	public CreateWindowsExeLaunch4j() {
-		super("launch4j");
+		super(WindowsExeCreationTool.launch4j);
 	}
 
 	@Override

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

@@ -3,6 +3,7 @@
 import java.io.File;
 
 import io.github.fvarrui.javapackager.model.Platform;
+import io.github.fvarrui.javapackager.model.WindowsExeCreationTool;
 import io.github.fvarrui.javapackager.utils.FileUtils;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
 
@@ -14,9 +15,9 @@ public abstract class AbstractCreateWindowsExe extends WindowsArtifactGenerator
 	private File genericJar;
 	private File genericExe;
 
-	public AbstractCreateWindowsExe(String outputFolderName) {
-		super("Windows EXE");
-		this.outputFolder = new File(Context.getContext().getBuildDir(), outputFolderName);
+	public AbstractCreateWindowsExe(WindowsExeCreationTool tool) {
+		super(tool.toString());
+		this.outputFolder = new File(Context.getContext().getBuildDir(), tool.toString());
 	}
 
 	public File getGenericManifest() {

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

@@ -4,6 +4,7 @@
 
 import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.model.WindowsConfig;
+import io.github.fvarrui.javapackager.model.WindowsExeCreationTool;
 import io.github.fvarrui.javapackager.utils.CommandUtils;
 import io.github.fvarrui.javapackager.utils.FileUtils;
 import io.github.fvarrui.javapackager.utils.Logger;
@@ -15,7 +16,7 @@
 public class CreateWindowsExeWhy extends AbstractCreateWindowsExe {
 
 	public CreateWindowsExeWhy() {
-		super("why");
+		super(WindowsExeCreationTool.why);
 	}
 
 	@Override

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

@@ -11,6 +11,7 @@
 
 import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.model.WindowsConfig;
+import io.github.fvarrui.javapackager.model.WindowsExeCreationTool;
 import io.github.fvarrui.javapackager.utils.CommandUtils;
 import io.github.fvarrui.javapackager.utils.FileUtils;
 import io.github.fvarrui.javapackager.utils.JarUtils;
@@ -28,7 +29,7 @@ public class CreateWindowsExeWinRun4j extends AbstractCreateWindowsExe {
 		};
 
 	public CreateWindowsExeWinRun4j() {
-		super("winrun4j");
+		super(WindowsExeCreationTool.winrun4j);
 	}
 
 	@Override

src/main/resources/windows/JavaLauncher.exe

@@ -5,9 +5,12 @@ mainclass=$info.mainClass
 #end
 classpath=${classpath}
 #if ($info.bundleJre)
-jvm_path=${info.jreDirectoryName}
+jvm_install=${info.jreDirectoryName}
+allow_system_java=false
+allow_java_location_lookup=false
+check_main_class=false
 #end
 #if (!$info.bundleJre && $info.jreMinVersion)
 min_java=${info.jreMinVersion}
 #end
-launch_options_file=${info.name}.l4j.ini
+launch_options=${info.name}.l4j.ini