Merge branch 'issue-187' into devel

Author: fvarrui

build.gradle

@@ -6,7 +6,7 @@ plugins {
 	id 'com.gradle.plugin-publish' version '0.12.0'
 	id 'io.codearte.nexus-staging' version '0.21.2'
 	id 'eclipse'
-	id 'de.undercouch.download' version '4.1.1'
+	id 'de.undercouch.download' version '5.0.4'
 }
 
 repositories {
@@ -224,10 +224,18 @@ nexusStaging {
 	password = project.findProperty('ossrhPassword') ?: ''
 }
 
-task updateUniversalJavaApplicationStub(type: Download) {
-	group 'Update'
-	description 'Downloads universalJavaApplicationStub to src/main/resources/mac and overrides the existing one.'
-	src 'https://raw.githubusercontent.com/fvarrui/universalJavaApplicationStub/master/src/universalJavaApplicationStub'
+
+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.'	
+	src([
+		"https://github.com/fvarrui/universalJavaApplicationStub/releases/download/${version}/universalJavaApplicationStub.sh",
+		"https://github.com/fvarrui/universalJavaApplicationStub/releases/download/${version}/universalJavaApplicationStub.x86_64",
+		"https://github.com/fvarrui/universalJavaApplicationStub/releases/download/${version}/universalJavaApplicationStub.arm64",
+		"https://github.com/fvarrui/universalJavaApplicationStub/releases/download/${version}/universalJavaApplicationStub"
+	])
 	dest file('src/main/resources/mac')
-	overwrite true
+    overwrite true
 }
+

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

@@ -36,6 +36,7 @@ public class MacConfig implements Serializable {
 	private boolean codesignApp = true;
 	private InfoPlist infoPlist = new InfoPlist();
 	private boolean hardenedCodesign = true;
+	private MacStartup macStartup = MacStartup.SCRIPT;
 
 	public File getIcnsFile() {
 		return icnsFile;
@@ -221,6 +222,14 @@ public boolean isHardenedCodesign() {
 		return hardenedCodesign;
 	}
 
+	public MacStartup getMacStartup() {
+		return macStartup;
+	}
+
+	public void setMacStartup(MacStartup macStartup) {
+		this.macStartup = macStartup;
+	}
+
 	@Override
 	public String toString() {
 		return "MacConfig [icnsFile=" + icnsFile + ", backgroundImage=" + backgroundImage + ", windowWidth="
@@ -230,7 +239,7 @@ public String toString() {
 				+ ", volumeName=" + volumeName + ", generateDmg=" + generateDmg + ", generatePkg=" + generatePkg
 				+ ", relocateJar=" + relocateJar + ", appId=" + appId + ", developerId=" + developerId
 				+ ", entitlements=" + entitlements + ", codesignApp=" + codesignApp + ", infoPlist=" + infoPlist
-				+ ", hardenedCodesign=" + hardenedCodesign + "]";
+				+ ", hardenedCodesign=" + hardenedCodesign + ", macStartup=" + macStartup + "]";
 	}
 
 	/**

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

@@ -0,0 +1,8 @@
+package io.github.fvarrui.javapackager.model;
+
+public enum MacStartup {
+	UNIVERSAL,
+	X86_64,
+	ARM64,
+	SCRIPT
+}

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

@@ -1,15 +1,13 @@
 package io.github.fvarrui.javapackager.packagers;
 
 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.apache.commons.lang3.SystemUtils;
-import org.codehaus.plexus.util.cli.CommandLineException;
 
 import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.utils.CommandUtils;
@@ -113,14 +111,14 @@ public File doCreateApp() throws Exception {
 
 		// copies universalJavaApplicationStub startup file to boot java app
 		File appStubFile = new File(macOSFolder, "universalJavaApplicationStub");
-		FileUtils.copyResourceToFile("/mac/universalJavaApplicationStub", appStubFile, true, this.getAssetsDir());
-		FileUtils.processFileContent(appStubFile, content -> {
-			if (!macConfig.isRelocateJar()) {
-				content = content.replaceAll("/Contents/Resources/Java", "/Contents/Resources");
-			}
-			content = content.replaceAll("\\$\\{info.name\\}", this.name);
-			return content;
-		});
+		String universalJavaApplicationStubResource = null;
+		switch (macConfig.getMacStartup()) {
+		case UNIVERSAL:	universalJavaApplicationStubResource = "universalJavaApplicationStub"; break;
+		case X86_64:	universalJavaApplicationStubResource = "universalJavaApplicationStub.x86_64"; break;
+		case ARM64: 	universalJavaApplicationStubResource = "universalJavaApplicationStub.arm64"; break;
+		case SCRIPT: 	universalJavaApplicationStubResource = "universalJavaApplicationStub.sh"; break;
+		}
+		FileUtils.copyResourceToFile("/mac/" + universalJavaApplicationStubResource, appStubFile);
 		appStubFile.setExecutable(true, false);
 
 		// process classpath
@@ -152,9 +150,9 @@ public File doCreateApp() throws Exception {
 		return appFile;
 	}
 
-	private void codesign(String developerId, File entitlements, File appFile)
-			throws IOException, CommandLineException {
+	private void codesign(String developerId, File entitlements, File appFile) throws Exception {
 
+		// checks --option flags
 		List<String> flags = new ArrayList<>();
 		if (macConfig.isHardenedCodesign()) {
 			if (VersionUtils.compareVersions("10.13.6", SystemUtils.OS_VERSION) >= 0) {
@@ -163,25 +161,31 @@ private void codesign(String developerId, File entitlements, File appFile)
 				Logger.warn("Mac OS version detected: " + SystemUtils.OS_VERSION + " ... hardened runtime disabled!");
 			}
 		}
+		
+		// if entitlements.plist file not specified, use a default one
+		if (entitlements == null) {	
+			Logger.warn("Entitlements file not specified. Using defaults!");			
+			entitlements = new File(assetsFolder, "entitlements.plist");
+			VelocityUtils.render("mac/entitlements.plist.vtl", entitlements, this);
+		} else if (!entitlements.exists()) {
+			throw new Exception("Entitlements file doesn't exist: " + entitlements);
+		}
 
+		// prepare params array
 		List<Object> codesignArgs = new ArrayList<>();
 		codesignArgs.add("--force");
 		if (!flags.isEmpty()) {
 			codesignArgs.add("--options");
 			codesignArgs.add(StringUtils.join(flags, ","));
 		}
-		codesignArgs.add("--deep");
-		if (entitlements == null) {
-			Logger.warn("Entitlements file not specified");
-		} else if (!entitlements.exists()) {
-			Logger.warn("Entitlements file doesn't exist: " + entitlements);
-		} else {
-			codesignArgs.add("--entitlements");
-			codesignArgs.add(entitlements);
-		}
+		codesignArgs.add("--deep");		
+		codesignArgs.add("--entitlements");
+		codesignArgs.add(entitlements);
 		codesignArgs.add("--sign");
 		codesignArgs.add(developerId);
 		codesignArgs.add(appFile);
+		
+		// run codesign
 		CommandUtils.execute("codesign", codesignArgs.toArray(new Object[codesignArgs.size()]));
 	}
 

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

@@ -116,6 +116,12 @@
 #if ($info.scripts.bootstrap)			
 			<key>BootstrapScript</key>
 			<string>$APP_PACKAGE/Contents/Resources/scripts/${info.bootstrapFile.name}</string>
+#end
+			<key>RelocateJar</key>
+#if ($info.macConfig.relocateJar)			
+			<true/>
+#else
+			<false/>
 #end
 		</dict>
 		<key>LSEnvironment</key>

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

@@ -0,0 +1,36 @@
+<?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">
+    <dict>
+        <!-- 
+            Allow Execution of JIT-compiled Code Entitlement
+            https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_cs_allow-jit
+        -->
+        <key>com.apple.security.cs.allow-jit</key>
+        <true/>
+        <!-- 
+            Allow Unsigned Executable Memory Entitlement
+            https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_cs_allow-unsigned-executable-memory
+        -->
+        <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+        <true/>
+        <!--
+            Disable Executable Memory Protection Entitlement
+            https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_cs_disable-executable-page-protection
+        -->
+        <key>com.apple.security.cs.disable-executable-page-protection</key>
+        <true/>
+        <!--
+            Allow DYLD Environment Variables Entitlement
+            https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_cs_allow-dyld-environment-variables
+        -->
+        <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+        <true/>
+        <!--
+            Disable Library Validation Entitlement
+            https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_security_cs_disable-library-validation
+        -->
+        <key>com.apple.security.cs.disable-library-validation</key>
+        <true/>
+    </dict>
+</plist>