Skip to content

Commit 5e97fc6

Browse files
committed
add arch to mojo
1 parent 8e832a8 commit 5e97fc6

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.util.List;
88
import java.util.Map;
99

10+
import io.github.fvarrui.javapackager.model.*;
1011
import org.apache.maven.execution.MavenSession;
1112
import org.apache.maven.plugin.AbstractMojo;
1213
import org.apache.maven.plugin.BuildPluginManager;
@@ -18,13 +19,6 @@
1819
import org.apache.maven.plugins.annotations.ResolutionScope;
1920
import org.apache.maven.project.MavenProject;
2021

21-
import io.github.fvarrui.javapackager.model.FileAssociation;
22-
import io.github.fvarrui.javapackager.model.LinuxConfig;
23-
import io.github.fvarrui.javapackager.model.MacConfig;
24-
import io.github.fvarrui.javapackager.model.Manifest;
25-
import io.github.fvarrui.javapackager.model.Platform;
26-
import io.github.fvarrui.javapackager.model.Scripts;
27-
import io.github.fvarrui.javapackager.model.WindowsConfig;
2822
import io.github.fvarrui.javapackager.packagers.Context;
2923
import io.github.fvarrui.javapackager.packagers.Packager;
3024
import io.github.fvarrui.javapackager.packagers.PackagerFactory;
@@ -314,7 +308,10 @@ public class PackageMojo extends AbstractMojo {
314308
*/
315309
@Parameter(property = "scripts", required = false)
316310
private Scripts scripts;
317-
311+
312+
@Parameter(property = "arch", required = false, defaultValue="x64")
313+
private JavaArch arch;
314+
318315
public void execute() throws MojoExecutionException {
319316

320317
Context.setContext(
@@ -370,7 +367,8 @@ public void execute() throws MojoExecutionException {
370367
.url(url)
371368
.version(version)
372369
.vmArgs(vmArgs)
373-
.winConfig(winConfig);
370+
.winConfig(winConfig)
371+
.arch(arch);
374372

375373
// generate app, installers and bundles
376374
packager.createApp();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -860,17 +860,17 @@ public JavaArch getArch() {
860860
return arch;
861861
}
862862

863-
public void arch(JavaArch arch) {
863+
public PackagerSettings arch(JavaArch arch) {
864864
this.arch = arch;
865+
return this;
865866
}
866867

867868
public String getArchForDeb() {
868-
return arch != null ? arch.getDeb() : "amd64";
869+
return arch.getDeb();
869870
}
870871

871872
public Architecture getArchForRpm() {
872-
String s = arch != null ? arch.getRpm() : "X86_64";
873-
return Architecture.valueOf(s);
873+
return Architecture.valueOf(arch.getRpm());
874874
}
875875

876876
@Override

0 commit comments

Comments
 (0)