architecture checks improved and refactoring

fvarrui · fvarrui · commit 830b72617c3e · 2024-02-28T02:49:42.000Z
diff --git a/src/main/java/io/github/fvarrui/javapackager/maven/CreateWindowsExeLaunch4j.java b/src/main/java/io/github/fvarrui/javapackager/maven/CreateWindowsExeLaunch4j.java
@@ -17,12 +17,14 @@
 import org.apache.commons.lang3.StringUtils;
 import org.twdata.maven.mojoexecutor.MojoExecutor.Element;
 
+import io.github.fvarrui.javapackager.model.Arch;
 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;
 import io.github.fvarrui.javapackager.utils.FileUtils;
+import io.github.fvarrui.javapackager.utils.Logger;
 
 /**
  * Creates Windows executable with Maven
@@ -47,9 +49,15 @@ protected File doApply(WindowsPackager packager) throws Exception {
 		String jreMinVersion = packager.getJreMinVersion();
 		File jarFile = packager.getJarFile();
 		File appFolder = packager.getAppFolder();
+		Arch arch = packager.getArch();
 		
 		createAssets(packager);
 		
+		// warns about architecture
+		if (arch != Arch.x86) {
+			Logger.warn("Launch4J only can generate 32-bit executable");
+		}
+		
 		// copies JAR to app folder
 		String jarPath;
 		if (winConfig.isWrapJar()) {
diff --git a/src/main/java/io/github/fvarrui/javapackager/maven/ResolveLicenseFromPOM.java b/src/main/java/io/github/fvarrui/javapackager/maven/ResolveLicenseFromPOM.java
@@ -1,7 +1,6 @@
 package io.github.fvarrui.javapackager.maven;
 
 import java.io.File;
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/src/main/java/io/github/fvarrui/javapackager/model/Arch.java b/src/main/java/io/github/fvarrui/javapackager/model/Arch.java
@@ -8,8 +8,8 @@ public enum Arch {
 	x64, 
 	x86;
 	
-	public static Arch getDefault() {
-		switch (SystemUtils.OS_ARCH) {
+	public static Arch getArch(String archString) {
+		switch (archString) {
 		case "x86":
 		case "i386":
 		case "i486":
@@ -22,15 +22,19 @@ public static Arch getDefault() {
 		case "aarch64":
 			return aarch64;
 		default:
-		    throw new IllegalArgumentException("Unknown architecture " + SystemUtils.OS_ARCH);
+		    throw new IllegalArgumentException("Unknown architecture " + archString);
 		}
 	}
 	
-	public Architecture toRpmArchitecture() {
-		switch (this.toString()) {
-		case "aarch64": return Architecture.AARCH64;
-		case "x64": return Architecture.X86_64;
-		case "x86": return Architecture.I386;
+	public static Arch getDefault() {
+		return getArch(SystemUtils.OS_ARCH);
+	}
+	
+	public Architecture toRpmArchitecture() {		
+		switch (this) {
+		case aarch64: return Architecture.AARCH64;
+		case x64: return Architecture.X86_64;
+		case x86: return Architecture.I386;
 		default: return null;
 		}
 	}
diff --git a/src/main/java/io/github/fvarrui/javapackager/model/Platform.java b/src/main/java/io/github/fvarrui/javapackager/model/Platform.java
@@ -23,4 +23,13 @@ public static Platform getCurrentPlatform() {
 		return null;
 	}
 	
+	public static Platform getPlatform(String platformString) {
+		switch (platformString.toLowerCase()) {
+		case "linux": return linux;
+		case "darwin": return mac;
+		case "windows": return windows;
+		default: throw new IllegalArgumentException("Unknown platform " + platformString);
+		}
+	}
+	
 }
diff --git a/src/main/java/io/github/fvarrui/javapackager/model/WindowsConfig.java b/src/main/java/io/github/fvarrui/javapackager/model/WindowsConfig.java
@@ -1,13 +1,15 @@
 package io.github.fvarrui.javapackager.model;
 
-import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
 import static io.github.fvarrui.javapackager.utils.ObjectUtils.defaultIfNull;
+import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
 
 import java.io.File;
 import java.io.Serializable;
 import java.util.LinkedHashMap;
 import java.util.UUID;
 
+import org.apache.commons.collections4.MapUtils;
+
 import io.github.fvarrui.javapackager.packagers.Packager;
 
 /**
@@ -351,6 +353,11 @@ public void setDefaults(Packager packager) {
 		this.setInternalName(defaultIfBlank(this.getInternalName(), packager.getName()));
 		this.setOriginalFilename(defaultIfBlank(this.getOriginalFilename(), packager.getName() + ".exe"));
 		this.setMsiUpgradeCode(defaultIfBlank(this.getMsiUpgradeCode(), UUID.randomUUID().toString()));
+		// init setup languages
+		if (MapUtils.isEmpty(this.getSetupLanguages())) {
+			this.getSetupLanguages().put("english", "compiler:Default.isl");
+			this.getSetupLanguages().put("spanish", "compiler:Languages\\Spanish.isl");
+		}
 	}
 	
 }
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/BundleJre.java b/src/main/java/io/github/fvarrui/javapackager/packagers/BundleJre.java
@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
@@ -58,23 +59,32 @@ protected File doApply(Packager packager) throws Exception {
 				throw new Exception("'" + specificJreFolder + "' is not a directory!");
 			}
 
-			// checks if the specified jre is valid (it looks for 'release' file into it, and if so, checks if it matches the right platform 
+			// checks if the specified jre is valid (it looks for 'release' file into it, and if so, checks if it matches the right platform
+			boolean validJre = true;
 			if (!JDKUtils.isValidJRE(platform, specificJreFolder)) {
 
-				Logger.warn("An invalid JRE may have been specified for '" + platform + "' platform: " + specificJreFolder + " ('release' file not found)");
-
-				// try to fix the path to the JRE on MacOS adding Contents/Home to JRE path
+				// if platform is mac
 				if (platform.equals(Platform.mac)) {
 					
+					// try to fix the path to the JRE on MacOS adding Contents/Home to JRE path
 					File fixedJreFolder = new File(specificJreFolder, "Contents/Home");
 					if (JDKUtils.isValidJRE(platform, fixedJreFolder)) {
 						specificJreFolder = fixedJreFolder;
-						Logger.warn("Specified 'jrePath' fixed: " + specificJreFolder);
+						Logger.warn("Specified 'jrePath' fixed: " + specificJreFolder);						
+					} else {
+						validJre = false;
 					}
 				
+				} else {
+					validJre = false;
 				}
 				
 			}
+			if (!validJre) {
+				Logger.warn("An invalid JRE may have been specified for '" + platform + "' platform: " + specificJreFolder);
+			} else if (JDKUtils.isJDK(specificJreFolder)) {
+				Logger.warn("Wow! Embedding a JDK instead of a JRE ... are you sure you want to do that?");
+			}
 
 			// removes old jre folder from bundle
 			if (destinationFolder.exists()) FileUtils.removeFolder(destinationFolder);
@@ -124,7 +134,12 @@ protected File doApply(Packager packager) throws Exception {
 			Logger.info("Using " + modulesDir + " modules directory");
 	
 			if (destinationFolder.exists()) FileUtils.removeFolder(destinationFolder);
+			
+			// gets JDK release info 
+			Map<String,String> releaseMap = JDKUtils.getRelease(jdkPath);
+			String releaseInfo = "add:IMAGE_TYPE=\"JRE\":OS_ARCH=\"" + releaseMap.get("OS_ARCH") + "\":OS_NAME=" + releaseMap.get("OS_NAME") + "\"";
 
+			// full path to jlink command
 			File jlink = new File(currentJdk, "/bin/jlink");
 			
 			// generates customized jre using modules
@@ -136,7 +151,8 @@ protected File doApply(Packager packager) throws Exception {
 					"--output", destinationFolder, 
 					"--no-header-files", 
 					"--no-man-pages", 
-					"--strip-debug", 
+					"--strip-debug",
+					"--release-info", releaseInfo, 
 					(VersionUtils.getJavaMajorVersion() < 21 ? "--compress=2" : null)
 				);
 	
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/CreateWindowsExeWinRun4j.java b/src/main/java/io/github/fvarrui/javapackager/packagers/CreateWindowsExeWinRun4j.java
@@ -12,6 +12,7 @@
 import io.github.fvarrui.javapackager.model.WindowsConfig;
 import io.github.fvarrui.javapackager.model.WindowsExeCreationTool;
 import io.github.fvarrui.javapackager.utils.FileUtils;
+import io.github.fvarrui.javapackager.utils.JDKUtils;
 import io.github.fvarrui.javapackager.utils.Logger;
 import io.github.fvarrui.javapackager.utils.RcEdit;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
@@ -68,11 +69,16 @@ protected File doApply(WindowsPackager packager) throws Exception {
 		// creates generic manifest
 		FileUtils.copyFileToFile(iconFile, getGenericIcon());
 
+		// checks if desired arch matches with JRE arch
+		if (bundleJre && !JDKUtils.isValidJRE(Platform.windows, arch, packager.getJreDestinationFolder())) {
+			throw new Exception("Bundled JRE must match " + Platform.windows + " " + arch);
+		}
+
 		// creates generic exe
-		if (arch == Arch.x64) {
+		if (arch == Arch.x86) {
+			FileUtils.copyResourceToFile("/windows/WinRun4J.exe", getGenericExe());
+		} else {
 			FileUtils.copyResourceToFile("/windows/WinRun4J64.exe", getGenericExe());
-		} else if (arch == Arch.x86) {
-			FileUtils.copyResourceToFile("/windows/WinRun4J.exe", getGenericExe());			
 		}
 
 		// uses vmLocation only if a JRE is bundled
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateRpm.java b/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateRpm.java
@@ -11,7 +11,6 @@
 import org.redline_rpm.header.Os;
 import org.redline_rpm.header.RpmType;
 
-import io.github.fvarrui.javapackager.model.Arch;
 import io.github.fvarrui.javapackager.utils.FileUtils;
 import io.github.fvarrui.javapackager.utils.Logger;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java b/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java
@@ -140,12 +140,6 @@ private void init() throws Exception {
 			throw new Exception("Invalid name specified: " + name, e);
 		}
 
-		// init setup languages
-		if (platform.equals(Platform.windows) && (winConfig.getSetupLanguages() == null || winConfig.getSetupLanguages().isEmpty())) {
-			winConfig.getSetupLanguages().put("english", "compiler:Default.isl");
-			winConfig.getSetupLanguages().put("spanish", "compiler:Languages\\Spanish.isl");
-		}
-
 		doInit();
 
 		// removes not necessary platform specific configs
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/WindowsPackager.java b/src/main/java/io/github/fvarrui/javapackager/packagers/WindowsPackager.java
@@ -6,6 +6,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 
+import io.github.fvarrui.javapackager.model.Arch;
 import io.github.fvarrui.javapackager.model.Platform;
 import io.github.fvarrui.javapackager.utils.Logger;
 import io.github.fvarrui.javapackager.utils.VelocityUtils;
@@ -38,6 +39,14 @@ public WindowsPackager() {
 	@Override
 	public void doInit() throws Exception {
 		
+		// sets default system architecture 
+		if (getArch() != Arch.x64 && getArch() != Arch.x86) {
+			if (Platform.windows.isCurrentPlatform())
+				arch(Arch.getDefault());
+			else
+				arch(Arch.x64);
+		}
+		
 		// sets windows config default values
 		this.winConfig.setDefaults(this);
 		
@@ -79,7 +88,7 @@ public File doCreateApp() throws Exception {
 			classpath = StringUtils.join(classpaths, ";");
 		}
 		
-		// invokes launch4j to generate windows executable
+		// invokes windows exe artifact generator (building tool dependant)
 		executable = Context.getContext().createWindowsExe(this);
 
 		Logger.infoUnindent("Windows EXE file created in " + executable + "!");		
diff --git a/src/main/java/io/github/fvarrui/javapackager/utils/JDKUtils.java b/src/main/java/io/github/fvarrui/javapackager/utils/JDKUtils.java

Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,13 @@ public static Platform getCurrentPlatform() {`
`23`	`23`	`return null;`
`24`	`24`	`}`
`25`	`25`
	`26`	`+ public static Platform getPlatform(String platformString) {`
	`27`	`+ switch (platformString.toLowerCase()) {`
	`28`	`+ case "linux": return linux;`
	`29`	`+ case "darwin": return mac;`
	`30`	`+ case "windows": return windows;`
	`31`	`+ default: throw new IllegalArgumentException("Unknown platform " + platformString);`
	`32`	`+ }`
	`33`	`+ }`
	`34`	`+`
`26`	`35`	`}`