U macos codesigning process enhanced

Author: fvarrui

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

@@ -27,7 +27,9 @@ public class MacConfig implements Serializable {
 	private boolean generateDmg = true;
 	private boolean generatePkg = true;
 	private boolean relocateJar = true;
-	private String signingIdentity = "-";
+	private String appIdentifier;
+	private String developerId = "-";
+	private File entitlements;
 
 	public File getIcnsFile() {
 		return icnsFile;
@@ -165,12 +167,28 @@ public void setRelocateJar(boolean relocateJar) {
 		this.relocateJar = relocateJar;
 	}
 
-	public String getSigningIdentity() {
-		return signingIdentity;
+	public String getAppIdentifier() {
+		return appIdentifier;
 	}
 
-	public void setSigningIdentity(String signingIdentity) {
-		this.signingIdentity = signingIdentity;
+	public void setAppIdentifier(String appIdentifier) {
+		this.appIdentifier = appIdentifier;
+	}
+
+	public String getDeveloperId() {
+		return developerId;
+	}
+
+	public void setDeveloperId(String developerId) {
+		this.developerId = developerId;
+	}
+
+	public File getEntitlements() {
+		return entitlements;
+	}
+
+	public void setEntitlements(File entitlements) {
+		this.entitlements = entitlements;
 	}
 
 	@Override
@@ -180,7 +198,8 @@ 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 + ", signingIdentity=" + signingIdentity + "]";
+				+ ", relocateJar=" + relocateJar + ", appIdentifier=" + appIdentifier + ", developerId=" + developerId
+				+ ", entitlements=" + entitlements + "]";
 	}
 
 	/**
@@ -199,5 +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()));
 	}
 }

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

@@ -1,6 +1,11 @@
 package io.github.fvarrui.javapackager.packagers;
 
 import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.codehaus.plexus.util.cli.CommandLineException;
 
 import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.utils.CommandUtils;
@@ -114,12 +119,30 @@ public File doCreateApp() throws Exception {
 
 		// codesigns app folder
 		if (Platform.mac.isCurrentPlatform()) {
-			CommandUtils.execute("codesign", "--force", "--deep", "--sign", this.macConfig.getSigningIdentity(), appFile);
+			codesign(this.macConfig.getDeveloperId(), this.macConfig.getEntitlements(), this.appFile);
 		} else {
 			Logger.warn("Generated app could not be signed due to current platform is " + Platform.getCurrentPlatform());
 		}
 
 		return appFile;
 	}
 
+	private void codesign(String developerId, File entitlements, File appFile) throws IOException, CommandLineException {
+		List<Object> codesignArgs = new ArrayList<>();
+		codesignArgs.add("--force");
+		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("--sign");
+		codesignArgs.add(developerId);
+		codesignArgs.add(appFile);
+		CommandUtils.execute("codesign", codesignArgs.toArray(new Object[codesignArgs.size()]));
+	}
+
 }