Skip to content

Commit ec70746

Browse files
committed
U get default architecture value from system
1 parent 09c0949 commit ec70746

File tree

4 files changed

+29
-9
lines changed

4 files changed

+29
-9
lines changed

src/main/java/io/github/fvarrui/javapackager/gradle/PackagePluginExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public PackagePluginExtension(Project project) {
5353
this.outputDirectory = project.getBuildDir();
5454
this.scripts = new Scripts();
5555
this.forceInstaller = false;
56-
this.arch = Arch.x64;
56+
this.arch = Arch.getDefault();
5757
}
5858

5959
public LinuxConfig linuxConfig(Closure<LinuxConfig> closure) {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.github.fvarrui.javapackager.maven;
22

33
import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
4+
import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
45
import static org.twdata.maven.mojoexecutor.MojoExecutor.executionEnvironment;
56

67
import java.io.File;
@@ -312,7 +313,7 @@ public class PackageMojo extends AbstractMojo {
312313
/**
313314
* Architecture
314315
*/
315-
@Parameter(property = "arch", required = false, defaultValue="x64")
316+
@Parameter(property = "arch", required = false)
316317
private Arch arch;
317318

318319
public void execute() throws MojoExecutionException {
@@ -333,7 +334,7 @@ public void execute() throws MojoExecutionException {
333334
.additionalModulePaths(additionalModulePaths)
334335
.additionalResources(additionalResources)
335336
.administratorRequired(administratorRequired)
336-
.arch(arch)
337+
.arch(defaultIfNull(arch, Arch.getDefault()))
337338
.assetsDir(assetsDir)
338339
.bundleJre(bundleJre)
339340
.classpath(classpath)

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.github.fvarrui.javapackager.model;
22

3+
import org.apache.commons.lang3.SystemUtils;
4+
35
public enum Arch {
46
aarch64("arm64", "AARCH64"),
57
x64("amd64", "X86_64"),
@@ -21,4 +23,22 @@ public String getRpm() {
2123
return rpm;
2224
}
2325

26+
public static Arch getDefault() {
27+
switch (SystemUtils.OS_ARCH) {
28+
case "x86":
29+
case "i386":
30+
case "i486":
31+
case "i586":
32+
case "i686":
33+
return x86;
34+
case "x86_64":
35+
case "amd64":
36+
return x64;
37+
case "aarch64":
38+
return aarch64;
39+
default:
40+
throw new IllegalArgumentException("Unknown architecture " + SystemUtils.OS_ARCH);
41+
}
42+
}
43+
2444
}

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -852,8 +852,7 @@ public boolean isThereFileAssociations() {
852852
* @return Mime type list string
853853
*/
854854
public String getMimeTypesListAsString(String separator) {
855-
return StringUtils.join(fileAssociations.stream().map(fa -> fa.getMimeType()).collect(Collectors.toList()),
856-
separator);
855+
return StringUtils.join(fileAssociations.stream().map(fa -> fa.getMimeType()).collect(Collectors.toList()), separator);
857856
}
858857

859858
public Arch getArch() {
@@ -867,10 +866,10 @@ public PackagerSettings arch(Arch arch) {
867866

868867
@Override
869868
public String toString() {
870-
return "PackagerSettings [outputDirectory=" + outputDirectory + ", licenseFile=" + licenseFile + ", iconFile="
871-
+ iconFile + ", generateInstaller=" + generateInstaller + ", forceInstaller=" + forceInstaller
872-
+ ", mainClass=" + mainClass + ", name=" + name + ", displayName=" + displayName + ", version="
873-
+ version + ", description=" + description + ", url=" + url + ", administratorRequired="
869+
return "PackagerSettings [" + "outputDirectory=" + outputDirectory + ", " + "licenseFile=" + licenseFile + ", "
870+
+ "iconFile=" + iconFile + ", " + "generateInstaller=" + generateInstaller + ", " + "forceInstaller="
871+
+ forceInstaller + ", " + "mainClass=" + mainClass + ", name=" + name + ", displayName=" + displayName
872+
+ ", version=" + version + ", description=" + description + ", url=" + url + ", administratorRequired="
874873
+ administratorRequired + ", organizationName=" + organizationName + ", organizationUrl="
875874
+ organizationUrl + ", organizationEmail=" + organizationEmail + ", bundleJre=" + bundleJre
876875
+ ", customizedJre=" + customizedJre + ", jrePath=" + jrePath + ", jdkPath=" + jdkPath

0 commit comments

Comments
 (0)