Skip to content

Commit a7d8a19

Browse files
committed
Make zipball name configurable
1 parent af123b2 commit a7d8a19

File tree

4 files changed

+18
-3
lines changed

4 files changed

+18
-3
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,9 @@ protected File doApply(Packager packager) throws Exception {
3535
File appFolder = packager.getAppFolder();
3636
File executable = packager.getExecutable();
3737
String jreDirectoryName = packager.getJreDirectoryName();
38-
39-
File zipFile = new File(outputDirectory, name + "-" + version + "-" + platform + ".zip");
38+
39+
String zipFileName = packager.getZipballName() != null ? packager.getZipballName() : name + "-" + version + "-" + platform + ".zip";
40+
File zipFile = new File(outputDirectory, zipFileName);
4041

4142
Zip zipTask = createZipTask();
4243
zipTask.setProperty("archiveFileName", zipFile.getName());

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ protected File doApply(Packager packager) {
4747
VelocityUtils.render(platform + "/assembly.xml.vtl", assemblyFile, packager);
4848

4949
// zip file name and format
50-
String finalName = name + "-" + version + "-" + platform;
50+
String finalName = packager.getZipballName() != null ? packager.getZipballName() : name + "-" + version + "-" + platform;
5151
String format = "zip";
5252

5353
// invokes plugin to assemble zipball and/or tarball

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,9 @@ public class PackageMojo extends AbstractMojo {
253253
@Parameter(defaultValue = "false", property = "createZipball", required = false)
254254
private Boolean createZipball;
255255

256+
@Parameter(property = "zipballName", required = false)
257+
private String zipballName;
258+
256259
/**
257260
* Extra properties for customized Velocity templates, accesible through '$this.extra' map.
258261
*/
@@ -345,6 +348,7 @@ public void execute() throws MojoExecutionException {
345348
.createTarball(createTarball)
346349
.tarballName(tarballName)
347350
.createZipball(createZipball)
351+
.zipballName(zipballName)
348352
.customizedJre(customizedJre)
349353
.description(description)
350354
.displayName(displayName)

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ public class PackagerSettings {
4949
protected Boolean createTarball;
5050
protected String tarballName;
5151
protected Boolean createZipball;
52+
protected String zipballName;
5253
protected Map<String, String> extra;
5354
protected boolean useResourcesAsWorkingDir;
5455
protected File assetsDir;
@@ -756,6 +757,15 @@ public PackagerSettings createZipball(Boolean createZipball) {
756757
return this;
757758
}
758759

760+
public PackagerSettings zipballName(String zipballName) {
761+
this.zipballName = zipballName;
762+
return this;
763+
}
764+
765+
public String getZipballName() {
766+
return zipballName;
767+
}
768+
759769
/**
760770
* Set extra parameters map
761771
* @param extra Extra parameters map

0 commit comments

Comments
 (0)