U classpath property processing enhanced for all platforms

Author: fvarrui

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

@@ -1,6 +1,7 @@
 package io.github.fvarrui.javapackager.gradle;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -41,10 +42,6 @@ public File apply(Packager packager) throws Exception {
 		boolean useResourcesAsWorkingDir = windowsPackager.isUseResourcesAsWorkingDir();
 		boolean bundleJre = windowsPackager.getBundleJre();
 		String jreDirectoryName = windowsPackager.getJreDirectoryName();
-		String classpath = windowsPackager.getClasspath();
-		
-		Set<String> classpathSet = new HashSet<>();
-		if (classpath != null) classpathSet.add(classpath);
 
 		Launch4jLibraryTask l4jTask = createLaunch4jTask();
 		l4jTask.setHeaderType(winConfig.getHeaderType().toString());
@@ -54,7 +51,7 @@ public File apply(Packager packager) throws Exception {
 		l4jTask.setIcon(iconFile.getAbsolutePath());
 		l4jTask.setManifest(manifestFile.getAbsolutePath());
 		l4jTask.setMainClassName(mainClass);
-		l4jTask.setClasspath(classpathSet);
+		l4jTask.setClasspath(new HashSet<>(windowsPackager.getClasspaths()));
 		l4jTask.setChdir(useResourcesAsWorkingDir ? "." : "");
 		l4jTask.setBundledJrePath(bundleJre ? jreDirectoryName : "%JAVA_HOME%");
 		l4jTask.getJvmOptions().addAll(vmArgs);

src/main/java/io/github/fvarrui/javapackager/model/MacConfig.java

@@ -27,7 +27,7 @@ public class MacConfig implements Serializable {
 	private boolean generateDmg = true;
 	private boolean generatePkg = true;
 	private boolean relocateJar = true;
-	private String appIdentifier;
+	private String appId;
 	private String developerId = "-";
 	private File entitlements;
 
@@ -167,12 +167,12 @@ public void setRelocateJar(boolean relocateJar) {
 		this.relocateJar = relocateJar;
 	}
 
-	public String getAppIdentifier() {
-		return appIdentifier;
+	public String getAppId() {
+		return appId;
 	}
 
-	public void setAppIdentifier(String appIdentifier) {
-		this.appIdentifier = appIdentifier;
+	public void setAppId(String appId) {
+		this.appId = appId;
 	}
 
 	public String getDeveloperId() {
@@ -198,7 +198,7 @@ public String toString() {
 				+ ", iconSize=" + iconSize + ", textSize=" + textSize + ", iconX=" + iconX + ", iconY=" + iconY
 				+ ", appsLinkIconX=" + appsLinkIconX + ", appsLinkIconY=" + appsLinkIconY + ", volumeIcon=" + volumeIcon
 				+ ", volumeName=" + volumeName + ", generateDmg=" + generateDmg + ", generatePkg=" + generatePkg
-				+ ", relocateJar=" + relocateJar + ", appIdentifier=" + appIdentifier + ", developerId=" + developerId
+				+ ", relocateJar=" + relocateJar + ", appId=" + appId + ", developerId=" + developerId
 				+ ", entitlements=" + entitlements + "]";
 	}
 
@@ -218,6 +218,6 @@ public void setDefaults(Packager packager) {
 		this.setIconY(defaultIfNull(this.getIconY(), 116));
 		this.setAppsLinkIconX(defaultIfNull(this.getAppsLinkIconX(), 360));
 		this.setAppsLinkIconY(defaultIfNull(this.getAppsLinkIconY(), 116));
-		this.setAppIdentifier(defaultIfNull(this.getAppIdentifier(), packager.getMainClass()));
+		this.setAppId(defaultIfNull(this.getAppId(), packager.getMainClass()));
 	}
 }

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

@@ -1,6 +1,10 @@
 package io.github.fvarrui.javapackager.packagers;
 
 import java.io.File;
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
 
 import io.github.fvarrui.javapackager.utils.FileUtils;
 import io.github.fvarrui.javapackager.utils.Logger;
@@ -43,6 +47,15 @@ public File doCreateApp() throws Exception {
 		// sets executable file
 		this.executable = new File(appFolder, name);
 
+		// process classpath
+		if (classpath != null) {
+			classpaths = Arrays.asList(classpath.split("[:;]"));
+			if (!isUseResourcesAsWorkingDir()) {
+				classpaths = classpaths.stream().map(cp -> new File(cp).isAbsolute() ? cp : "$SCRIPTPATH/" + cp).collect(Collectors.toList());
+			}
+			classpath = StringUtils.join(classpaths, ":");
+		}
+		
 		// generates startup.sh script to boot java app
 		File startupFile = new File(assetsFolder, "startup.sh");
 		VelocityUtils.render("linux/startup.sh.vtl", startupFile, this);

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

@@ -3,8 +3,11 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
 import org.codehaus.plexus.util.cli.CommandLineException;
 
 import io.github.fvarrui.javapackager.model.Platform;
@@ -111,6 +114,14 @@ public File doCreateApp() throws Exception {
 			return content;
 		});
 		appStubFile.setExecutable(true, false);
+		
+		// process classpath
+		classpath = (this.macConfig.isRelocateJar() ? "Java/" : "") + this.jarFile.getName() + ":" + classpath;
+		classpaths = Arrays.asList(classpath.split("[:;]"));
+		if (!isUseResourcesAsWorkingDir()) {
+			classpaths = classpaths.stream().map(cp -> new File(cp).isAbsolute() ? cp : "$ResourcesFolder/" + cp).collect(Collectors.toList());
+		}
+		classpath = StringUtils.join(classpaths, ":");
 
 		// creates and write the Info.plist file
 		File infoPlistFile = new File(contentsFolder, "Info.plist");

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

@@ -42,6 +42,9 @@ public abstract class Packager extends PackagerSettings {
 	protected File jarFileDestinationFolder;
 	protected File jreDestinationFolder;
 	protected File resourcesDestinationFolder;
+	
+	// processed classpaths list
+	protected List<String> classpaths = new ArrayList<>();
 
 	// ===============================================	
 
@@ -68,6 +71,10 @@ public File getJarFileDestinationFolder() {
 	public File getLibsFolder() {
 		return libsFolder;
 	}
+	
+	public List<String> getClasspaths() {
+		return classpaths;
+	}
 
 	// ===============================================
 

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

@@ -1,6 +1,11 @@
 package io.github.fvarrui.javapackager.packagers;
 
 import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
 
 import io.github.fvarrui.javapackager.utils.FileUtils;
 import io.github.fvarrui.javapackager.utils.Logger;
@@ -74,15 +79,27 @@ public File doCreateApp() throws Exception {
 
 		// sets executable file
 		executable = new File(appFolder, name + ".exe");
-
-		// invokes launch4j to generate windows executable
 
+		// process classpath
+		if (classpath != null) {
+			classpaths = Arrays.asList(classpath.split(";"));
+			if (!isUseResourcesAsWorkingDir()) {
+				classpaths = classpaths.stream().map(cp -> new File(cp).isAbsolute() ? cp : "%EXEDIR%/" + cp).collect(Collectors.toList());
+			}
+			classpath = StringUtils.join(classpaths, ";");
+		}
+		
+		// invokes launch4j to generate windows executable
 		executable = Context.getContext().createWindowsExe(this);
 
 		Logger.infoUnindent("Windows EXE file created in " + executable + "!");		
 
 		return appFolder;
 	}
-
 
+	public static void main(String[] args) {
+		String classpath = "plugins/*:addons/*";
+		List<String> classpaths = Arrays.asList(classpath.split("[:;]"));
+		System.out.println(classpaths);
+	}
 }

src/main/resources/linux/startup.sh.vtl

@@ -21,12 +21,8 @@ JVMOptionsFile="$SCRIPTPATH/${info.name}.l4j.ini"
 [ -f $JVMOptionsFile ] && while read -r option; do JVMDefaultOptions+=" $option"; done <<< $(sed "/^#.*$/d" $JVMOptionsFile)
 
 JVMClassPath="$BINARY"
-#if ($info.classpath)
-	#if ($info.useResourcesAsWorkingDir)
-JVMClassPath+=":${info.classpath}"
-	#else
-JVMClassPath+=":$SCRIPTPATH/${info.classpath}"
-	#end
+#foreach ($classpath in $info.classpaths)
+JVMClassPath+=":${classpath}"
 #end
 
 #if ($info.useResourcesAsWorkingDir)

src/main/resources/mac/Info.plist.vtl

@@ -1,8 +1,3 @@
-#if ($info.useResourcesAsWorkingDir)
-#set ($classpathPrefix="")
-#else
-#set ($classpathPrefix="$ResourcesFolder/")
-#end
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -16,7 +11,7 @@
 		<key>CFBundleIconFile</key>
 		<string>${info.name}.icns</string>
 		<key>CFBundleIdentifier</key>
-		<string>${info.mainClass}</string>
+		<string>${info.macConfig.appId}</string>
 		<key>CFBundleDisplayName</key>
 		<string>${info.displayName}</string>
 		<key>CFBundleInfoDictionaryVersion</key>
@@ -49,13 +44,8 @@
 			<string>${info.mainClass}</string>
 			<key>ClassPath</key>
 			<array>
-#if ($info.macConfig.relocateJar)
-				<string>${classpathPrefix}Java/${info.jarFile.name}</string>
-#else
-				<string>${classpathPrefix}${info.jarFile.name}</string>
-#end
-#if ($info.classpath)
-				<string>${classpathPrefix}${info.classpath}</string>
+#foreach ($classpath in $info.classpaths)
+				<string>$classpath</string>
 #end
 			</array>
 #if (!$info.vmArgs.empty)