U refactoring

Author: fvarrui

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.x64;
 	}
 
     public LinuxConfig linuxConfig(Closure<LinuxConfig> closure) {

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()))

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

@@ -309,8 +309,11 @@ public class PackageMojo extends AbstractMojo {
 	@Parameter(property = "scripts", required = false)
 	private Scripts scripts;
 
+	/**
+	 * Architecture
+	 */
 	@Parameter(property = "arch", required = false, defaultValue="x64")
-	private JavaArch arch;
+	private Arch arch;
 
 	public void execute() throws MojoExecutionException {
 
@@ -330,6 +333,7 @@ public void execute() throws MojoExecutionException {
 						.additionalModulePaths(additionalModulePaths)
 						.additionalResources(additionalResources)
 						.administratorRequired(administratorRequired)
+						.arch(arch)
 						.assetsDir(assetsDir)
 						.bundleJre(bundleJre)
 						.classpath(classpath)
@@ -367,8 +371,7 @@ public void execute() throws MojoExecutionException {
 						.url(url)
 						.version(version)
 						.vmArgs(vmArgs)
-						.winConfig(winConfig)
-						.arch(arch);
+						.winConfig(winConfig);
 
 			// generate app, installers and bundles
 			packager.createApp();

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

@@ -0,0 +1,24 @@
+package io.github.fvarrui.javapackager.model;
+
+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;
+	}
+	
+}

src/main/java/io/github/fvarrui/javapackager/model/JavaArch.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,8 +54,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 
 		Builder builder = new Builder();
 		builder.setType(RpmType.BINARY);
-		Architecture archForRpm = packager.getArchForRpm();
-		builder.setPlatform(archForRpm, Os.LINUX);
+		builder.setPlatform(arch, Os.LINUX);
 		builder.setPackage(name, version, "1");
 		builder.setPackager(organizationName);
 		builder.setDescription(description);
@@ -77,8 +77,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 
 		builder.build(outputDirectory);
 
-		String arch = archForRpm.name().toLowerCase();
-		String suffix = "-1."+arch+".rpm";
+		String suffix = "-1." + arch.name().toLowerCase() + ".rpm";
 		File originalRpm = new File(outputDirectory, name + "-" + version + suffix);
 		File rpm = null;
 		if (originalRpm.exists()) {

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

@@ -58,8 +58,8 @@ public class PackagerSettings {
 	protected List<FileAssociation> fileAssociations;
 	protected File packagingJdk;
 	protected Scripts scripts;
-
-	private JavaArch arch;
+	protected Arch arch;
+	
 	/**
 	 * Get packaging JDK
 	 * @return Packaging JDK
@@ -856,23 +856,15 @@ public String getMimeTypesListAsString(String separator) {
 				separator);
 	}
 
-	public JavaArch getArch() {
+	public Arch getArch() {
 		return arch;
 	}
 
-	public PackagerSettings arch(JavaArch arch) {
+	public PackagerSettings arch(Arch 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="

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

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