Merge branch 'devel' into topic/xcg/fix_deb_generation

Author: fvarrui

README.md

@@ -5,8 +5,6 @@
 
 JavaPackager is a hybrid plugin for **Maven** and **Gradle** which provides an easy way to package Java applications in native Windows, MacOS or GNU/Linux executables, and generate installers for them.
 
-> SNAPSHOT version (available in `devel` branch) is not released to Maven Central, so you have to [install it manually](#how-to-build-and-install-the-plugin).
-
 > :eyes: See [JavaPackager changes and fixes](https://github.com/fvarrui/JavaPackager/releases).
 
 ## History
@@ -261,7 +259,7 @@ You can use [default templates](https://github.com/fvarrui/JavaPackager/tree/mas
 
 ### Additional JVM options at runtime
 
-When you build your app, all configuration details are hardcoded into the executable and cannot be changed without recreating it or hacking with a resource editor. JavaPackager introduces a feature that allows to pass additional JVM options at runtime from an `.l4j.ini` file (like [Launch4j](http://launch4j.sourceforge.net/docs.html) does, but available for all platforms in the same way). So, you can specify these options in the packager's configuration (packaging time), in INI file (runtime) or in both. 
+When you build your app, all configuration details are hardcoded into the executable and cannot be changed without recreating or hacking it with a resource editor. JavaPackager introduces a feature that allows to pass additional JVM options at runtime from an `.l4j.ini` file (like [Launch4j](http://launch4j.sourceforge.net/docs.html) does, but available for all platforms in the same way). So, you can specify these options in the packager's configuration (packaging time), in INI file (runtime) or in both. 
 
 The INI file's name must correspond to `${name}.l4j.ini` and it has to be located next to the executable on Windows and GNU/Linux, and in `Resources` folder on MacOS.
 
@@ -389,9 +387,3 @@ Run next command (ommit `./` on Windows):
 ```bash
 ./gradlew publish closeAndReleaseRepository
 ```
-
-> Related [guide](https://nemerosa.ghost.io/2015/07/01/publishing-to-the-maven-central-using-gradle/).
-
-## Future features
-
-Check the [TO-DO list](https://github.com/fvarrui/JavaPackager/projects/1#column-7704117) to know the features we plan to add to JavaPackager.

build.gradle

@@ -64,7 +64,7 @@ dependencies {
 }
 
 group = 'io.github.fvarrui'
-version = '1.7.2'
+version = '1.7.3-SNAPSHOT'
 description = 'Hybrid Maven/Gradle plugin to package Java applications as native Windows, Mac OS X or GNU/Linux executables and create installers for them'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
@@ -114,27 +114,37 @@ publishing {
 				name = project.name
 				groupId = project.group
 				artifactId = project.name
-				version = project.version
-				description = project.description
 				packaging = 'maven-plugin'
-				url = 'https://github.com/fvarrui/JavaPackager'
-				scm {
-					connection = 'scm:git:git://github.com/fvarrui/JavaPackager.git'
-					developerConnection = 'scm:git:git@github.com:fvarrui/fvarrui.git'
+			}
+		}
+	}
+
+	afterEvaluate {
+		publications {
+			withType(MavenPublication) {
+				// customize all publications here
+				pom {
+					version = project.version
+					description = project.description
 					url = 'https://github.com/fvarrui/JavaPackager'
-				}
-				licenses {
-					license {
-						name = 'GPL-v3.0'
-						url = 'http://www.gnu.org/licenses/gpl-3.0.txt'
-						distribution = 'repo'
+					scm {
+						connection = 'scm:git:git://github.com/fvarrui/JavaPackager.git'
+						developerConnection = 'scm:git:git@github.com:fvarrui/fvarrui.git'
+						url = 'https://github.com/fvarrui/JavaPackager'
 					}
-				}
-				developers {
-					developer {
-						id = 'fvarrui'
-						name = 'Francisco Vargas Ruiz'
-						url = 'https://github.com/fvarrui'
+					licenses {
+						license {
+							name = 'GPL-v3.0'
+							url = 'http://www.gnu.org/licenses/gpl-3.0.txt'
+							distribution = 'repo'
+						}
+					}
+					developers {
+						developer {
+							id = 'fvarrui'
+							name = 'Francisco Vargas Ruiz'
+							url = 'https://github.com/fvarrui'
+						}
 					}
 				}
 			}
@@ -186,7 +196,7 @@ nexusStaging {
 }
 
 task updateUniversalJavaApplicationStub(type : Download) {
-	def version = '20220410.162252'
+	def version = '20230601.235708'
 	group 'Update assets'
 	description 'Downloads compiled and scripted versions of universalJavaApplicationStub to src/main/resources/mac overriding the existing ones.'	
 	src([
@@ -209,4 +219,3 @@ task updateWhyJavaLauncher(type : Download) {
 	dest file('src/main/resources/windows')
     overwrite true
 }
-

docs/windows-specific-properties.md

@@ -21,6 +21,7 @@
     <copyright>${organizationName}</copyright>
     <productName>${name}</productName>
     <internalName>${name}</internalName>
+    <txtShortcutName>${name}</txtShortcutName>
     <originalFilename>${name}.exe</originalFilename>
 
     <!-- choose EXE creation tool -->
@@ -103,6 +104,7 @@
 | ------------------------- | --------- | ------------------------------------------------------------------------------------------ | ---------------------------------------------------------------------------------------------- |
 | `setupMode`               | :x:       | `installForAllUsers`                                                                       | Setup installation mode: require administrative privileges or not. [*](#setupmode)             |
 | `setupLanguages`          | :x:       | `<english>compiler:Default.isl</english><spanish>compiler:Languages\Spanish.isl</spanish>` | Map with setup languages.                                                                      |
+| `shortcutName`            | :x:       | `${name}`                                                                                  | Sets the name of the user optional shortcut created on the desktop                             |
 | `disableDirPage`          | :x:       | `true`                                                                                     | If this is set to `true`, Setup will not show the **Select Destination Location** wizard page. |
 | `disableProgramGroupPage` | :x:       | `true`                                                                                     | If this is set to `true`, Setup will not show the **Select Start Menu Folder** wizard page.    |
 | `disableFinishedPage`     | :x:       | `true`                                                                                     | If this is set to `true`, Setup will not show the **Setup Completed** wizard page.             |

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

@@ -1,5 +1,6 @@
 package io.github.fvarrui.javapackager.gradle;
 
+import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.Packager;
 import io.github.fvarrui.javapackager.packagers.PackagerFactory;
 
@@ -52,7 +53,7 @@ protected Packager createPackager() throws Exception {
 					.organizationName(extension.getOrganizationName())
 					.organizationUrl(extension.getOrganizationUrl())
 					.outputDirectory(extension.getOutputDirectory())
-					.packagingJdk(extension.getPackagingJdk())
+					.packagingJdk(defaultIfNull(extension.getPackagingJdk(), Context.getGradleContext().getDefaultToolchain()))
 					.runnableJar(extension.getRunnableJar())
 					.scripts(extension.getScripts())
 					.useResourcesAsWorkingDir(extension.isUseResourcesAsWorkingDir())

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

@@ -80,14 +80,13 @@ protected File doApply(Packager packager) {
 					plugin(
 							groupId("org.apache.maven.plugins"),
 							artifactId("maven-jar-plugin"), 
-							version("3.1.1")
+							version("3.3.0")
 					),
 					goal("jar"),
 					configuration(
 							element("classifier", classifier),
 							element("archive", archive.toArray(new Element[archive.size()])),
-							element("outputDirectory", jarFile.getParentFile().getAbsolutePath()),
-							element("finalName", name + "-" + version)
+							element("outputDirectory", jarFile.getParentFile().getAbsolutePath())
 					),
 					env);
 

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

@@ -30,6 +30,7 @@ public class WindowsConfig implements Serializable {
 	private String trademarks;
 	private String txtFileVersion;
 	private String txtProductVersion;
+	private String shortcutName;
 	private boolean disableDirPage = true;
 	private boolean disableProgramGroupPage = true;
 	private boolean disableFinishedPage = true;
@@ -153,6 +154,14 @@ public void setTxtProductVersion(String txtProductVersion) {
 		this.txtProductVersion = txtProductVersion;
 	}
 
+	public String getShortcutName() {
+		return shortcutName;
+	}
+
+	public void setShortcutName(String shortcutName) {
+		this.shortcutName = shortcutName;
+	}
+
 	public String getInternalName() {
 		return internalName;
 	}
@@ -312,6 +321,7 @@ public String toString() {
 				+ ", internalName=" + internalName + ", language=" + language + ", originalFilename=" + originalFilename
 				+ ", productName=" + productName + ", productVersion=" + productVersion + ", trademarks=" + trademarks
 				+ ", txtFileVersion=" + txtFileVersion + ", txtProductVersion=" + txtProductVersion
+				+ ", shortcutName=" + shortcutName
 				+ ", disableDirPage=" + disableDirPage + ", disableProgramGroupPage=" + disableProgramGroupPage
 				+ ", disableFinishedPage=" + disableFinishedPage + ", disableRunAfterInstall=" + disableRunAfterInstall
 				+ ", disableWelcomePage=" + disableWelcomePage + ", createDesktopIconTask=" + createDesktopIconTask
@@ -331,6 +341,7 @@ public void setDefaults(Packager packager) {
 		this.setFileVersion(defaultIfBlank(this.getFileVersion(), "1.0.0.0"));
 		this.setTxtFileVersion(defaultIfBlank(this.getTxtFileVersion(), "" + packager.getVersion()));
 		this.setProductVersion(defaultIfBlank(this.getProductVersion(), "1.0.0.0"));
+		this.setShortcutName(defaultIfBlank(this.getShortcutName(), packager.getName()));
 		this.setTxtProductVersion(defaultIfBlank(this.getTxtProductVersion(), "" + packager.getVersion()));
 		this.setCompanyName(defaultIfBlank(this.getCompanyName(), packager.getOrganizationName()));
 		this.setCopyright(defaultIfBlank(this.getCopyright(), packager.getOrganizationName()));
@@ -340,5 +351,4 @@ public void setDefaults(Packager packager) {
 		this.setOriginalFilename(defaultIfBlank(this.getOriginalFilename(), packager.getName() + ".exe"));
 		this.setMsiUpgradeCode(defaultIfBlank(this.getMsiUpgradeCode(), UUID.randomUUID().toString()));
 	}
-
 }

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

@@ -134,7 +134,11 @@ protected File doApply(MacPackager packager) throws Exception {
 		if (!isAarch64) {
 			// makes the top window open itself on mount:
 			Logger.info("Blessing ...");
-			execute("bless", "--folder", mountFolder, "--openfolder", mountFolder);
+			try {
+				execute("bless", "--folder", mountFolder, "--openfolder", mountFolder); }
+			catch (Exception e){
+				Logger.warn("Error blessing " + mountFolder + " due to: " + e.getMessage());
+			}
 		}
 
 		// tells the volume that it has a special file attribute

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

@@ -184,7 +184,14 @@ public void resolveResources() throws Exception {
 		// adds to additional resources
 		if (additionalResources != null) {
 			if (licenseFile != null) additionalResources.add(licenseFile);
-			additionalResources.add(iconFile);
+			
+			// skip adding icon file if target platform is windows
+			if (!getPlatform().equals(Platform.windows)) {
+				additionalResources.add(iconFile);
+			} else {
+				Logger.warn("Skipped adding the icon file as additional resource because the target platform is Windows");
+			}
+			
 			Logger.info("Effective additional resources " + additionalResources);
 		}