U bootstrap script support for windows

Author: fvarrui

build.gradle

@@ -55,6 +55,7 @@ dependencies {
     implementation 'org.vafer:jdeb:1.9'
     implementation 'net.jsign:jsign-core:3.1'
     implementation 'org.redline-rpm:redline:1.2.10'
+    implementation 'com.github.vatbub:mslinks:1.0.6.2'
 
     testImplementation 'junit:junit:4.12'
 

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

@@ -7,11 +7,13 @@
 import org.apache.commons.lang3.StringUtils;
 
 import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask;
+import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.model.WindowsConfig;
 import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.WindowsArtifactGenerator;
 import io.github.fvarrui.javapackager.packagers.WindowsPackager;
 import io.github.fvarrui.javapackager.utils.FileUtils;
+import io.github.fvarrui.javapackager.utils.VelocityUtils;
 
 /**
  * Creates Windows native executable on Gradle context
@@ -39,6 +41,8 @@ protected File doApply(WindowsPackager packager) throws Exception {
 		String jreDirectoryName = packager.getJreDirectoryName();
 		String jreMinVersion = packager.getJreMinVersion();
 		File jarFile = packager.getJarFile();
+		File appFolder = packager.getAppFolder();
+		String name = packager.getName();
 
 		try {
 			// creates a folder only for launch4j assets
@@ -60,7 +64,9 @@ protected File doApply(WindowsPackager packager) throws Exception {
 		l4jTask.setMainClassName(mainClass);
 		l4jTask.setClasspath(new HashSet<>(packager.getClasspaths()));
 		l4jTask.setChdir(useResourcesAsWorkingDir ? "." : "");
-		l4jTask.setBundledJrePath(bundleJre ? jreDirectoryName : "%JAVA_HOME%;%PATH%");
+		if (bundleJre) {
+			l4jTask.setBundledJrePath(jreDirectoryName);
+		}
 		if (!StringUtils.isBlank(jreMinVersion)) { 
 			l4jTask.setJreMinVersion(jreMinVersion);
 		}
@@ -74,24 +80,39 @@ protected File doApply(WindowsPackager packager) throws Exception {
 		l4jTask.setInternalName(winConfig.getInternalName());
 		l4jTask.setTrademarks(winConfig.getTrademarks());
 		l4jTask.setLanguage(winConfig.getLanguage());
-		l4jTask.setLibraryDir("");
+		//l4jTask.setLibraryDir("");
 		l4jTask.getActions().forEach(action -> action.execute(l4jTask));
 
 		sign(genericExe, packager);
 
 		FileUtils.copyFileToFile(genericExe, executable);
 
+		// bootstrap script specified
+		if (FileUtils.exists(packager.getScripts().getBootstrap())) {
+
+			// generates startup VBS script file
+			File vbsFile = new File(appFolder, name + ".vbs");
+			VelocityUtils.render(Platform.windows + "/startup.vbs.vtl", vbsFile, packager);
+			executable = vbsFile;
+			
+		}
+		
 		return executable;
 	}
 
+	/**
+	 * Renames assets required for launch4j to avoid unsupported characters (chinese, e.g.) 
+	 * @param packager Windows packager
+	 * @throws Exception Something went wrong
+	 */
 	private void createAssets(WindowsPackager packager) throws Exception {
 
 		File manifestFile = packager.getManifestFile();
 		File iconFile = packager.getIconFile();
 		File jarFile = packager.getJarFile();
 
 		File launch4j = new File(Context.getGradleContext().getProject().getBuildDir(), "launch4j");
-		if (!launch4j.exists()) launch4j.mkdirs();
+		FileUtils.mkdir(launch4j);
 
 		genericManifest = new File(launch4j, "app.exe.manifest");
 		genericIcon = new File(launch4j, "app.ico");

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

@@ -23,6 +23,7 @@
 import io.github.fvarrui.javapackager.model.MacConfig;
 import io.github.fvarrui.javapackager.model.Manifest;
 import io.github.fvarrui.javapackager.model.Platform;
+import io.github.fvarrui.javapackager.model.Scripts;
 import io.github.fvarrui.javapackager.model.WindowsConfig;
 import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.Packager;
@@ -296,12 +297,18 @@ public class PackageMojo extends AbstractMojo {
 	@Parameter(defaultValue = "${java.home}", property = "packagingJdk", required = false)
 	private File packagingJdk;
 
-
 	/**
 	 * Additional module paths
 	 */
 	@Parameter(property = "fileAssociations", required = false)
 	private List<FileAssociation> fileAssociations;
+	
+	/**
+	 * Scripts
+	 */
+	@Parameter(property = "scripts", required = false)
+	private Scripts scripts;
+
 
 	public void execute() throws MojoExecutionException {
 
@@ -352,6 +359,7 @@ public void execute() throws MojoExecutionException {
 						.outputDirectory(outputDirectory)
 						.packagingJdk(packagingJdk)
 						.runnableJar(runnableJar)
+						.scripts(scripts)
 						.useResourcesAsWorkingDir(useResourcesAsWorkingDir)
 						.url(url)
 						.version(version)

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

@@ -2,6 +2,7 @@
 
 import static org.apache.commons.collections4.CollectionUtils.addIgnoreNull;
 import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
+import static org.apache.commons.io.FilenameUtils.getExtension;
 
 import java.io.File;
 import java.nio.file.InvalidPathException;
@@ -32,6 +33,7 @@ public abstract class Packager extends PackagerSettings {
 	protected File executable;
 	protected File jarFile;
 	protected File libsFolder;
+	protected File bootstrapFile;
 
 	// internal specific properties (setted in "doCreateAppStructure")
 	protected File executableDestinationFolder;
@@ -75,6 +77,10 @@ public List<String> getClasspaths() {
 	public File getJreDestinationFolder() {
 		return jreDestinationFolder;
 	}
+	
+	public File getBootstrapFile() {
+		return bootstrapFile;
+	}
 
 	// ===============================================
 
@@ -199,9 +205,10 @@ protected void copyAdditionalResources(List<File> resources, File destination) {
 		});
 
 		// copy bootstrap script
-		if (getScripts().getBootstrap() != null && getScripts().getBootstrap().exists()) {
+		if (FileUtils.exists(getScripts().getBootstrap())) {
+			String scriptExtension = getExtension(getScripts().getBootstrap().getName());
 			File scriptsFolder = new File(destination, "scripts");
-			File bootstrapFile = new File(scriptsFolder, "bootstrap"); 
+			bootstrapFile = new File(scriptsFolder, "bootstrap" + (!scriptExtension.isEmpty() ? "." + scriptExtension : ""));
 			try {
 				FileUtils.copyFileToFile(getScripts().getBootstrap(), bootstrapFile);
 				bootstrapFile.setExecutable(true, false);

src/main/resources/windows/startup.vbs.vtl

@@ -0,0 +1,28 @@
+' Windows startup script generated by JavaPackager plugin
+
+' Runs an executable file (exe, bat, cmd, ...)
+Function Run(file)
+    If  FileExists(file) Then
+        Set WshShell = CreateObject("WScript.Shell") 
+        WshShell.Run chr(34) & file & Chr(34), 0
+        Set WshShell = Nothing
+    End If
+End Function
+
+' Checks if a file exists
+Function FileExists(FilePath)
+    Set fso = CreateObject("Scripting.FileSystemObject")
+    If fso.FileExists(FilePath) Then
+        FileExists=CBool(1)
+    Else
+        FileExists=CBool(0)
+    End If
+End Function
+
+#if ($info.bootstrapFile)
+' Runs bootstrap script if exists
+Run "scripts\\${info.bootstrapFile.name}"
+#end
+
+' Runs app executable
+Run "${info.executable.name}"