Merge branch 'pr-265' into devel

fvarrui · fvarrui · commit 5d6af9cea557 · 2023-01-08T13:09:09.000Z
diff --git a/src/main/java/io/github/fvarrui/javapackager/gradle/PackagePluginExtension.java b/src/main/java/io/github/fvarrui/javapackager/gradle/PackagePluginExtension.java
@@ -7,6 +7,7 @@
 import org.gradle.api.Project;
 
 import groovy.lang.Closure;
+import io.github.fvarrui.javapackager.model.Arch;
 import io.github.fvarrui.javapackager.model.LinuxConfig;
 import io.github.fvarrui.javapackager.model.MacConfig;
 import io.github.fvarrui.javapackager.model.Manifest;
@@ -52,6 +53,7 @@ public PackagePluginExtension(Project project) {
 		this.outputDirectory = project.getBuildDir();
 		this.scripts = new Scripts();
 		this.forceInstaller = false;
+		this.arch = Arch.getDefault();
 	}
 	
     public LinuxConfig linuxConfig(Closure<LinuxConfig> closure) {
diff --git a/src/main/java/io/github/fvarrui/javapackager/gradle/PackageTask.java b/src/main/java/io/github/fvarrui/javapackager/gradle/PackageTask.java
@@ -14,6 +14,7 @@
 import org.gradle.api.tasks.OutputDirectory;
 
 import groovy.lang.Closure;
+import io.github.fvarrui.javapackager.model.Arch;
 import io.github.fvarrui.javapackager.model.FileAssociation;
 import io.github.fvarrui.javapackager.model.LinuxConfig;
 import io.github.fvarrui.javapackager.model.MacConfig;
@@ -559,6 +560,18 @@ public Scripts scripts(Closure<Scripts> closure) {
         getProject().configure(scripts, closure);
         return scripts;
     }
+    
+	@Input
+	@Optional	
+	private Arch arch;
+
+	public Arch getArch() {
+		return arch;
+	}
+
+	public void setArch(Arch arch) {
+		this.arch = arch;
+	}
 
 	// ===============
 	// create packager
@@ -577,6 +590,7 @@ protected Packager createPackager() throws Exception {
 					.additionalModulePaths(defaultIfNull(additionalModulePaths, extension.getAdditionalModulePaths()))
 					.additionalResources(defaultIfNull(additionalResources, extension.getAdditionalResources()))
 					.administratorRequired(defaultIfNull(administratorRequired, extension.getAdministratorRequired()))
+					.arch(defaultIfNull(arch, extension.getArch()))
 					.assetsDir(defaultIfNull(assetsDir, extension.getAssetsDir()))
 					.bundleJre(defaultIfNull(bundleJre, extension.getBundleJre()))
 					.classpath(defaultIfNull(classpath, extension.getClasspath()))
diff --git a/src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java b/src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java
@@ -1,12 +1,14 @@
 package io.github.fvarrui.javapackager.maven;
 
 import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
+import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
 import static org.twdata.maven.mojoexecutor.MojoExecutor.executionEnvironment;
 
 import java.io.File;
 import java.util.List;
 import java.util.Map;
 
+import io.github.fvarrui.javapackager.model.*;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.BuildPluginManager;
@@ -18,13 +20,6 @@
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.maven.project.MavenProject;
 
-import io.github.fvarrui.javapackager.model.FileAssociation;
-import io.github.fvarrui.javapackager.model.LinuxConfig;
-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;
 import io.github.fvarrui.javapackager.packagers.PackagerFactory;
@@ -314,7 +309,13 @@ public class PackageMojo extends AbstractMojo {
 	 */
 	@Parameter(property = "scripts", required = false)
 	private Scripts scripts;
-	
+
+	/**
+	 * Architecture
+	 */
+	@Parameter(property = "arch", required = false)
+	private Arch arch;
+
 	public void execute() throws MojoExecutionException {
 		
 		Context.setContext(
@@ -333,6 +334,7 @@ public void execute() throws MojoExecutionException {
 						.additionalModulePaths(additionalModulePaths)
 						.additionalResources(additionalResources)
 						.administratorRequired(administratorRequired)
+						.arch(defaultIfNull(arch, Arch.getDefault()))
 						.assetsDir(assetsDir)
 						.bundleJre(bundleJre)
 						.classpath(classpath)
diff --git a/src/main/java/io/github/fvarrui/javapackager/model/Arch.java b/src/main/java/io/github/fvarrui/javapackager/model/Arch.java
@@ -0,0 +1,44 @@
+package io.github.fvarrui.javapackager.model;
+
+import org.apache.commons.lang3.SystemUtils;
+
+public enum Arch {
+	aarch64("arm64", "AARCH64"), 
+	x64("amd64", "X86_64"), 
+	x86("i386", "i386");
+
+	private String deb;
+	private String rpm;
+
+	Arch(String deb, String rpm) {
+		this.deb = deb;
+		this.rpm = rpm;
+	}
+
+	public String getDeb() {
+		return deb;
+	}
+
+	public String getRpm() {
+		return rpm;
+	}
+	
+	public static Arch getDefault() {
+		switch (SystemUtils.OS_ARCH) {
+		case "x86":
+		case "i386":
+		case "i486":
+		case "i586":
+		case "i686": 
+			return x86; 
+		case "x86_64":
+		case "amd64":
+			return x64;
+		case "aarch64":
+			return aarch64;
+		default:
+		    throw new IllegalArgumentException("Unknown architecture " + SystemUtils.OS_ARCH);
+		}
+	}
+	
+}
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateRpm.java b/src/main/java/io/github/fvarrui/javapackager/packagers/GenerateRpm.java
@@ -42,6 +42,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		File executable = packager.getExecutable();
 		File assetsFolder = packager.getAssetsFolder();
 		String jreDirectoryName = packager.getJreDirectoryName();
+		Architecture arch = Architecture.valueOf(packager.getArch().getRpm());
 		
 		// generates desktop file from velocity template
 		File desktopFile = new File(assetsFolder, name + ".desktop");
@@ -53,7 +54,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 
 		Builder builder = new Builder();
 		builder.setType(RpmType.BINARY);
-		builder.setPlatform(Architecture.X86_64, Os.LINUX);
+		builder.setPlatform(arch, Os.LINUX);
 		builder.setPackage(name, version, "1");
 		builder.setPackager(organizationName);
 		builder.setDescription(description);
@@ -76,7 +77,8 @@ protected File doApply(LinuxPackager packager) throws Exception {
 
 		builder.build(outputDirectory);
 
-		File originalRpm = new File(outputDirectory, name + "-" + version + "-1.x86_64.rpm");
+		String suffix = "-1." + arch.name().toLowerCase() + ".rpm";
+		File originalRpm = new File(outputDirectory, name + "-" + version + suffix);
 		File rpm = null;
 		if (originalRpm.exists()) {
 			rpm = new File(outputDirectory, name + "_" + version + ".rpm");
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/PackagerSettings.java b/src/main/java/io/github/fvarrui/javapackager/packagers/PackagerSettings.java
@@ -6,15 +6,9 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import io.github.fvarrui.javapackager.model.*;
 import org.apache.commons.lang3.StringUtils;
-
-import io.github.fvarrui.javapackager.model.FileAssociation;
-import io.github.fvarrui.javapackager.model.LinuxConfig;
-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 org.redline_rpm.header.Architecture;
 
 /**
  * Common packagers' settings
@@ -64,7 +58,8 @@ public class PackagerSettings {
 	protected List<FileAssociation> fileAssociations;
 	protected File packagingJdk;
 	protected Scripts scripts;
-
+	protected Arch arch;
+	
 	/**
 	 * Get packaging JDK
 	 * @return Packaging JDK
@@ -857,16 +852,24 @@ public boolean isThereFileAssociations() {
 	 * @return Mime type list string
 	 */
 	public String getMimeTypesListAsString(String separator) {
-		return StringUtils.join(fileAssociations.stream().map(fa -> fa.getMimeType()).collect(Collectors.toList()),
-				separator);
+		return StringUtils.join(fileAssociations.stream().map(fa -> fa.getMimeType()).collect(Collectors.toList()), separator);
+	}
+
+	public Arch getArch() {
+		return arch;
+	}
+
+	public PackagerSettings arch(Arch arch) {
+		this.arch = arch;
+		return this;
 	}
 
 	@Override
 	public String toString() {
-		return "PackagerSettings [outputDirectory=" + outputDirectory + ", licenseFile=" + licenseFile + ", iconFile="
-				+ iconFile + ", generateInstaller=" + generateInstaller + ", forceInstaller=" + forceInstaller
-				+ ", mainClass=" + mainClass + ", name=" + name + ", displayName=" + displayName + ", version="
-				+ version + ", description=" + description + ", url=" + url + ", administratorRequired="
+		return "PackagerSettings [" + "outputDirectory=" + outputDirectory + ", " + "licenseFile=" + licenseFile + ", "
+				+ "iconFile=" + iconFile + ", " + "generateInstaller=" + generateInstaller + ", " + "forceInstaller="
+				+ forceInstaller + ", " + "mainClass=" + mainClass + ", name=" + name + ", displayName=" + displayName
+				+ ", version=" + version + ", description=" + description + ", url=" + url + ", administratorRequired="
 				+ administratorRequired + ", organizationName=" + organizationName + ", organizationUrl="
 				+ organizationUrl + ", organizationEmail=" + organizationEmail + ", bundleJre=" + bundleJre
 				+ ", customizedJre=" + customizedJre + ", jrePath=" + jrePath + ", jdkPath=" + jdkPath
@@ -878,5 +881,6 @@ public String toString() {
 				+ extra + ", useResourcesAsWorkingDir=" + useResourcesAsWorkingDir + ", assetsDir=" + assetsDir
 				+ ", classpath=" + classpath + ", jreMinVersion=" + jreMinVersion + ", manifest=" + manifest
 				+ ", additionalModulePaths=" + additionalModulePaths + ", fileAssociations=" + fileAssociations
-				+ ", packagingJdk=" + packagingJdk + ", scripts=" + scripts + "]";
-	}}
+				+ ", packagingJdk=" + packagingJdk + ", scripts=" + scripts + ", arch=" + arch + "]";
+	}
+}
diff --git a/src/main/resources/linux/control.vtl b/src/main/resources/linux/control.vtl
@@ -2,7 +2,7 @@ Package: ${info.name}
 Version: ${info.version}
 Section: misc
 Priority: optional
-Architecture: amd64
+Architecture: ${info.arch.deb}
 Maintainer: ${info.organizationName} <$!{info.organizationEmail}>
 Description: ${info.description}
 Distribution: development
diff --git a/src/main/resources/linux/startup.sh.vtl b/src/main/resources/linux/startup.sh.vtl
@@ -82,8 +82,8 @@ Bootstrap="$SCRIPTPATH/scripts/${info.bootstrapFile.name}" && [ -x "$Bootstrap"
 #end
 
 #if ($info.administratorRequired)
-pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY GDKBACKEND=x11 "${JAVA}" ${JVMDefaultOptions} -cp "${JVMClassPath}" ${info.mainClass} $@
+pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY GDKBACKEND=x11 "${JAVA}" ${JVMDefaultOptions} -jar "${JVMClassPath}" $@
 #else
-"${JAVA}" ${JVMDefaultOptions} -cp "${JVMClassPath}" ${info.mainClass} $@
+"${JAVA}" ${JVMDefaultOptions} -jar "${JVMClassPath}" $@
 #end
 exit 0
