Skip to content

Commit 5205786

Browse files
committed
new property for template config list
1 parent 37b124f commit 5205786

File tree

4 files changed

+82
-9
lines changed

4 files changed

+82
-9
lines changed

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import io.github.fvarrui.javapackager.model.Manifest;
2222
import io.github.fvarrui.javapackager.model.Platform;
2323
import io.github.fvarrui.javapackager.model.Scripts;
24+
import io.github.fvarrui.javapackager.model.Template;
2425
import io.github.fvarrui.javapackager.model.WindowsConfig;
2526
import io.github.fvarrui.javapackager.packagers.Context;
2627
import io.github.fvarrui.javapackager.packagers.Packager;
@@ -572,6 +573,18 @@ public Arch getArch() {
572573
public void setArch(Arch arch) {
573574
this.arch = arch;
574575
}
576+
577+
@Input
578+
@Optional
579+
private List<Template> templates;
580+
581+
public List<Template> getTemplates() {
582+
return templates;
583+
}
584+
585+
public void setTemplates(List<Template> templates) {
586+
this.templates = templates;
587+
}
575588

576589
// ===============
577590
// create packager
@@ -623,6 +636,7 @@ protected Packager createPackager() throws Exception {
623636
.packagingJdk(defaultIfNull(packagingJdk, extension.getPackagingJdk(), Context.getGradleContext().getDefaultToolchain()))
624637
.runnableJar(defaultIfNull(runnableJar, extension.getRunnableJar()))
625638
.scripts(defaultIfNull(scripts, extension.getScripts()))
639+
.templates(defaultIfNull(templates, extension.getTemplates()))
626640
.useResourcesAsWorkingDir(defaultIfNull(useResourcesAsWorkingDir, extension.isUseResourcesAsWorkingDir()))
627641
.url(defaultIfNull(url, extension.getUrl()))
628642
.version(defaultIfNull(version, extension.getVersion(), getProject().getVersion().toString()))

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,12 @@ public class PackageMojo extends AbstractMojo {
321321
*/
322322
@Parameter(property = "arch", required = false)
323323
private Arch arch;
324+
325+
/**
326+
* Templates configuration
327+
*/
328+
@Parameter(property = "templates", required = false)
329+
private List<Template> templates;
324330

325331
public void execute() throws MojoExecutionException {
326332

@@ -376,6 +382,7 @@ public void execute() throws MojoExecutionException {
376382
.packagingJdk(packagingJdk)
377383
.runnableJar(runnableJar)
378384
.scripts(scripts)
385+
.templates(templates)
379386
.useResourcesAsWorkingDir(useResourcesAsWorkingDir)
380387
.url(url)
381388
.version(version)
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package io.github.fvarrui.javapackager.model;
2+
3+
public class Template {
4+
5+
private String name;
6+
private boolean bom = true;
7+
8+
public String getName() {
9+
return name;
10+
}
11+
12+
public void setName(String name) {
13+
this.name = name;
14+
}
15+
16+
public boolean isBom() {
17+
return bom;
18+
}
19+
20+
public void setBom(boolean bom) {
21+
this.bom = bom;
22+
}
23+
24+
@Override
25+
public String toString() {
26+
return "Template [name=" + name + ", bom=" + bom + "]";
27+
}
28+
29+
}

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

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import io.github.fvarrui.javapackager.model.Manifest;
1616
import io.github.fvarrui.javapackager.model.Platform;
1717
import io.github.fvarrui.javapackager.model.Scripts;
18+
import io.github.fvarrui.javapackager.model.Template;
1819
import io.github.fvarrui.javapackager.model.WindowsConfig;
1920

2021
/**
@@ -68,6 +69,7 @@ public class PackagerSettings {
6869
protected File packagingJdk;
6970
protected Scripts scripts;
7071
protected Arch arch;
72+
protected List<Template> templates;
7173

7274
/**
7375
* Get packaging JDK
@@ -412,6 +414,14 @@ public List<FileAssociation> getFileAssociations() {
412414
public Scripts getScripts() {
413415
return scripts;
414416
}
417+
418+
/**
419+
* Get templates
420+
* @return Templates config list
421+
*/
422+
public List<Template> getTemplates() {
423+
return templates;
424+
}
415425

416426
// fluent api
417427

@@ -862,6 +872,17 @@ public PackagerSettings scripts(Scripts scripts) {
862872
this.scripts = scripts;
863873
return this;
864874
}
875+
876+
/**
877+
* Set templates config
878+
* @param templates Templates list config
879+
* @return Packager settings
880+
*/
881+
public PackagerSettings templates(List<Template> templates) {
882+
this.templates = templates;
883+
return this;
884+
}
885+
865886

866887
// some helpful methods
867888

@@ -893,21 +914,23 @@ public PackagerSettings arch(Arch arch) {
893914

894915
@Override
895916
public String toString() {
896-
return "PackagerSettings [" + "outputDirectory=" + outputDirectory + ", " + "licenseFile=" + licenseFile + ", "
897-
+ "iconFile=" + iconFile + ", " + "generateInstaller=" + generateInstaller + ", " + "forceInstaller="
898-
+ forceInstaller + ", " + "mainClass=" + mainClass + ", name=" + name + ", displayName=" + displayName
899-
+ ", version=" + version + ", description=" + description + ", url=" + url + ", administratorRequired="
917+
return "PackagerSettings [outputDirectory=" + outputDirectory + ", licenseFile=" + licenseFile + ", iconFile="
918+
+ iconFile + ", generateInstaller=" + generateInstaller + ", forceInstaller=" + forceInstaller
919+
+ ", mainClass=" + mainClass + ", name=" + name + ", displayName=" + displayName + ", version="
920+
+ version + ", description=" + description + ", url=" + url + ", administratorRequired="
900921
+ administratorRequired + ", organizationName=" + organizationName + ", organizationUrl="
901922
+ organizationUrl + ", organizationEmail=" + organizationEmail + ", bundleJre=" + bundleJre
902923
+ ", customizedJre=" + customizedJre + ", jrePath=" + jrePath + ", jdkPath=" + jdkPath
903924
+ ", additionalResources=" + additionalResources + ", modules=" + modules + ", additionalModules="
904925
+ additionalModules + ", platform=" + platform + ", envPath=" + envPath + ", vmArgs=" + vmArgs
905926
+ ", runnableJar=" + runnableJar + ", copyDependencies=" + copyDependencies + ", jreDirectoryName="
906927
+ jreDirectoryName + ", winConfig=" + winConfig + ", linuxConfig=" + linuxConfig + ", macConfig="
907-
+ macConfig + ", createTarball=" + createTarball + ", createZipball=" + createZipball + ", extra="
908-
+ extra + ", useResourcesAsWorkingDir=" + useResourcesAsWorkingDir + ", assetsDir=" + assetsDir
909-
+ ", classpath=" + classpath + ", jreMinVersion=" + jreMinVersion + ", manifest=" + manifest
910-
+ ", additionalModulePaths=" + additionalModulePaths + ", fileAssociations=" + fileAssociations
911-
+ ", packagingJdk=" + packagingJdk + ", scripts=" + scripts + ", arch=" + arch + "]";
928+
+ macConfig + ", createTarball=" + createTarball + ", tarballName=" + tarballName + ", createZipball="
929+
+ createZipball + ", zipballName=" + zipballName + ", extra=" + extra + ", useResourcesAsWorkingDir="
930+
+ useResourcesAsWorkingDir + ", assetsDir=" + assetsDir + ", classpath=" + classpath
931+
+ ", jreMinVersion=" + jreMinVersion + ", manifest=" + manifest + ", additionalModulePaths="
932+
+ additionalModulePaths + ", fileAssociations=" + fileAssociations + ", packagingJdk=" + packagingJdk
933+
+ ", scripts=" + scripts + ", arch=" + arch + ", templates=" + templates + "]";
912934
}
935+
913936
}

0 commit comments

Comments
 (0)