Merge pull request #265 from zfqjava/master

add arch config property

Author: fvarrui

src/main/java/io/github/fvarrui/javapackager/maven/PackageMojo.java

@@ -7,6 +7,7 @@
 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 +19,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 +308,10 @@ public class PackageMojo extends AbstractMojo {
 	 */
 	@Parameter(property = "scripts", required = false)
 	private Scripts scripts;
-	
+
+	@Parameter(property = "arch", required = false, defaultValue="x64")
+	private JavaArch arch;
+
 	public void execute() throws MojoExecutionException {
 
 		Context.setContext(
@@ -370,7 +367,8 @@ public void execute() throws MojoExecutionException {
 						.url(url)
 						.version(version)
 						.vmArgs(vmArgs)
-						.winConfig(winConfig);
+						.winConfig(winConfig)
+						.arch(arch);
 
 			// generate app, installers and bundles
 			packager.createApp();

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

@@ -0,0 +1,22 @@
+package io.github.fvarrui.javapackager.model;
+
+public enum JavaArch {
+    aarch64("arm64", "AARCH64"),
+    x64("amd64", "X86_64");
+
+    private String deb;
+    private String rpm;
+
+    JavaArch(String deb, String rpm) {
+        this.deb = deb;
+        this.rpm = rpm;
+    }
+
+    public String getDeb() {
+        return deb;
+    }
+
+    public String getRpm() {
+        return rpm;
+    }
+}

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

@@ -53,7 +53,8 @@ protected File doApply(LinuxPackager packager) throws Exception {
 
 		Builder builder = new Builder();
 		builder.setType(RpmType.BINARY);
-		builder.setPlatform(Architecture.X86_64, Os.LINUX);
+		Architecture archForRpm = packager.getArchForRpm();
+		builder.setPlatform(archForRpm, Os.LINUX);
 		builder.setPackage(name, version, "1");
 		builder.setPackager(organizationName);
 		builder.setDescription(description);
@@ -76,7 +77,9 @@ protected File doApply(LinuxPackager packager) throws Exception {
 
 		builder.build(outputDirectory);
 
-		File originalRpm = new File(outputDirectory, name + "-" + version + "-1.x86_64.rpm");
+		String arch = archForRpm.name().toLowerCase();
+		String suffix = "-1."+arch+".rpm";
+		File originalRpm = new File(outputDirectory, name + "-" + version + suffix);
 		File rpm = null;
 		if (originalRpm.exists()) {
 			rpm = new File(outputDirectory, name + "_" + version + ".rpm");

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
@@ -65,6 +59,7 @@ public class PackagerSettings {
 	protected File packagingJdk;
 	protected Scripts scripts;
 
+	private JavaArch arch;
 	/**
 	 * Get packaging JDK
 	 * @return Packaging JDK
@@ -861,6 +856,23 @@ public String getMimeTypesListAsString(String separator) {
 				separator);
 	}
 
+	public JavaArch getArch() {
+		return arch;
+	}
+
+	public PackagerSettings arch(JavaArch arch) {
+		this.arch = arch;
+		return this;
+	}
+
+	public String getArchForDeb() {
+		return arch.getDeb();
+	}
+
+	public Architecture getArchForRpm() {
+		return Architecture.valueOf(arch.getRpm());
+	}
+
 	@Override
 	public String toString() {
 		return "PackagerSettings [outputDirectory=" + outputDirectory + ", licenseFile=" + licenseFile + ", iconFile="
@@ -878,5 +890,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 + "]";
+	}
+}

src/main/resources/linux/control.vtl

@@ -2,7 +2,7 @@ Package: ${info.name}
 Version: ${info.version}
 Section: misc
 Priority: optional
-Architecture: amd64
+Architecture: ${info.archForDeb}
 Maintainer: ${info.organizationName} <$!{info.organizationEmail}>
 Description: ${info.description}
 Distribution: development

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