Merge pull request #279 from kerner1000/feature/custom-tarball-name

Support custom tarball name

Author: fvarrui

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

@@ -36,8 +36,11 @@ protected File doApply(Packager packager) throws Exception {
 		File appFolder = packager.getAppFolder();
 		File executable = packager.getExecutable();
 		String jreDirectoryName = packager.getJreDirectoryName();
-		
-		File tarFile = new File(outputDirectory, name + "-" + version + "-" + platform + ".tar.gz");
+
+		// tgz file name
+		String finalName = packager.getTarballName() != null ? packager.getTarballName() : name + "-" + version + "-" + platform;
+		String format = ".tar.gz";
+		File tarFile = new File(outputDirectory, finalName + format);
 
 		Tar tarTask = createTarTask();
 		tarTask.setProperty("archiveFileName", tarFile.getName());

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

@@ -35,8 +35,9 @@ protected File doApply(Packager packager) throws Exception {
 		File appFolder = packager.getAppFolder();
 		File executable = packager.getExecutable();
 		String jreDirectoryName = packager.getJreDirectoryName();
-		
-		File zipFile = new File(outputDirectory, name + "-" + version + "-" + platform + ".zip");
+
+		String zipFileName = packager.getZipballName() != null ? packager.getZipballName() : name + "-" + version + "-" + platform + ".zip";
+		File zipFile = new File(outputDirectory, zipFileName);
 
 		Zip zipTask = createZipTask();
 		zipTask.setProperty("archiveFileName", zipFile.getName());

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

@@ -47,7 +47,7 @@ protected File doApply(Packager packager) {
 			VelocityUtils.render(platform + "/assembly.xml.vtl", assemblyFile, packager);
 
 			// tgz file name
-			String finalName = name + "-" + version + "-" + platform;
+			String finalName = packager.getTarballName() != null ? packager.getTarballName() : name + "-" + version + "-" + platform;
 			String format = "tar.gz";
 
 			// invokes plugin to assemble tarball

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

@@ -47,7 +47,7 @@ protected File doApply(Packager packager) {
 			VelocityUtils.render(platform + "/assembly.xml.vtl", assemblyFile, packager);
 
 			// zip file name and format
-			String finalName = name + "-" + version + "-" + platform;
+			String finalName = packager.getZipballName() != null ? packager.getZipballName() : name + "-" + version + "-" + platform;
 			String format = "zip";
 
 			// invokes plugin to assemble zipball and/or tarball

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

@@ -244,12 +244,18 @@ public class PackageMojo extends AbstractMojo {
 	@Parameter(defaultValue = "false", property = "createTarball", required = false)
 	private Boolean createTarball;
 
+	@Parameter(property = "tarballName", required = false)
+	private String tarballName;
+
 	/**
 	 * Bundles app in a zipball file
 	 */
 	@Parameter(defaultValue = "false", property = "createZipball", required = false)
 	private Boolean createZipball;
 
+	@Parameter(property = "zipballName", required = false)
+	private String zipballName;
+
 	/**
 	 * Extra properties for customized Velocity templates, accesible through '$this.extra' map. 
 	 */
@@ -340,7 +346,9 @@ public void execute() throws MojoExecutionException {
 						.classpath(classpath)
 						.copyDependencies(copyDependencies)
 						.createTarball(createTarball)
+						.tarballName(tarballName)
 						.createZipball(createZipball)
+						.zipballName(zipballName)
 						.customizedJre(customizedJre)
 						.description(description)
 						.displayName(displayName)

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

@@ -47,7 +47,9 @@ public class PackagerSettings {
 	protected LinuxConfig linuxConfig;
 	protected MacConfig macConfig;
 	protected Boolean createTarball;
+	protected String tarballName;
 	protected Boolean createZipball;
+	protected String zipballName;
 	protected Map<String, String> extra;
 	protected boolean useResourcesAsWorkingDir;
 	protected File assetsDir;
@@ -736,6 +738,15 @@ public PackagerSettings createTarball(Boolean createTarball) {
 		return this;
 	}
 
+	public PackagerSettings tarballName(String tarballName) {
+		this.tarballName = tarballName;
+		return this;
+	}
+
+	public String getTarballName() {
+		return tarballName;
+	}
+
 	/**
 	 * Set create zipball
 	 * @param createZipball Create zipball
@@ -746,6 +757,15 @@ public PackagerSettings createZipball(Boolean createZipball) {
 		return this;
 	}
 
+	public PackagerSettings zipballName(String zipballName) {
+		this.zipballName = zipballName;
+		return this;
+	}
+
+	public String getZipballName() {
+		return zipballName;
+	}
+
 	/**
 	 * Set extra parameters map
 	 * @param extra Extra parameters map