From 5c07d1d9565c4dac3b02be9727c9ece15e649a49 Mon Sep 17 00:00:00 2001 From: Antonin Huaut Date: Wed, 9 Mar 2022 13:08:35 +0100 Subject: [PATCH 1/5] Update winConfig: missing property --- docs/windows-specific-properties.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/windows-specific-properties.md b/docs/windows-specific-properties.md index 1e6e5e7c..42d32073 100644 --- a/docs/windows-specific-properties.md +++ b/docs/windows-specific-properties.md @@ -38,6 +38,7 @@ true|false true|false true|false + true|false true|false true|false true|false @@ -107,6 +108,7 @@ | `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. | +| `disableRunAfterInstall` | :x: | `true` | If this is set to `true`, Setup will not **launch the application** after install. | | `disableWelcomePage` | :x: | `true` | If this is set to `true`, Setup will not show **Welcome Page**. | | `createDesktopIconTask` | :x: | `true` | If this is set to `true`, Setup will not ask for **desktop icon creation**. | | `removeOldLibs` | :x: | `false` | If there's a previous installation, removes old `libs` folder before install. | From 5bf0dd9b2f84aea8ee8113088c2e413ecf2707ab Mon Sep 17 00:00:00 2001 From: Michael Sims Date: Thu, 10 Mar 2022 08:49:46 -0800 Subject: [PATCH 2/5] Reformatted xml code snippets in docs/maven/plugin-configuration-samples.md for easier readibility. --- docs/maven/plugin-configuration-samples.md | 338 ++++++++++----------- 1 file changed, 160 insertions(+), 178 deletions(-) diff --git a/docs/maven/plugin-configuration-samples.md b/docs/maven/plugin-configuration-samples.md index ddff9496..fc4a1cfd 100644 --- a/docs/maven/plugin-configuration-samples.md +++ b/docs/maven/plugin-configuration-samples.md @@ -1,238 +1,220 @@ # Plugin configuration samples for Maven - ## Minimal config - ```xml - io.github.fvarrui - javapackager - {latest-plugin-version-here} - - - package - - package - - - fvarrui.sample.Main - - - + io.github.fvarrui + javapackager + {latest-plugin-version-here} + + + package + + package + + + fvarrui.sample.Main + + + ``` - Also, JavaPackager plugin is able to get some properties from `pom.xml`, so you don't need to specify them twice: - ```xml - - fvarrui.sample.Main - - - - - io.github.fvarrui - javapackager - {latest-plugin-version-here} - - - package - - package - - - - - - + + fvarrui.sample.Main + + + + + io.github.fvarrui + javapackager + {latest-plugin-version-here} + + + package + + package + + + + + + ``` > :warning: This minimal configuration will not bundle a JRE, so final user will need one in order to run the app. - ## Bundle with a customized JRE - ```xml - io.github.fvarrui - javapackager - {latest-plugin-version-here} - - - package - - package - - - fvarrui.sample.Main - true - - - + io.github.fvarrui + javapackager + {latest-plugin-version-here} + + + package + + package + + + fvarrui.sample.Main + true + + + ``` - > `customizedJre` is `true` by default, so you don't have to specify it. - ## Bundle with a full JRE - ```xml - io.github.fvarrui - javapackager - {latest-plugin-version-here} - - - package - - package - - - fvarrui.sample.Main - true - false - - - + io.github.fvarrui + javapackager + {latest-plugin-version-here} + + + package + + package + + + fvarrui.sample.Main + true + false + + + ``` - ## Bundle with an existing JRE - ```xml - io.github.fvarrui - javapackager - {latest-plugin-version-here} - - - package - - package - - - fvarrui.sample.Main - true - C:\Program Files\Java\jre1.8.0_231 - - - + io.github.fvarrui + javapackager + {latest-plugin-version-here} + + + package + + package + + + fvarrui.sample.Main + true + C:\Program Files\Java\jre1.8.0_311 + + + ``` - ## Bundle your own fat JAR - ```xml - io.github.fvarrui - javapackager - {latest-plugin-version-here} - - - package - - package - - - fvarrui.sample.Main - true - path/to/your/own/fat.jar - false - - - + io.github.fvarrui + javapackager + {latest-plugin-version-here} + + + package + + package + + + fvarrui.sample.Main + true + path/to/your/own/fat.jar + false + + + ``` - ## Multiple executions - ```xml - io.github.fvarrui - javapackager - {latest-plugin-version-here} + io.github.fvarrui + javapackager + {latest-plugin-version-here} - fvarrui.sample.Main + fvarrui.sample.Main - - - bundle-with-jre - package - - package - - - Sample - true - - - - bundle-without-jre - package - - package - - - Sample-nojre - false - - - + + + bundle-with-jre + package + + package + + + Sample + true + + + + bundle-without-jre + package + + package + + + Sample-nojre + false + + + ``` - E.g. on Windows, last configuration will generate next artifacts: * `Sample_x.y.z.exe` with a bundled JRE. * `Sample-nojre_x.y.z.exe` without JRE. - ## Bundling for multiple platforms - ```xml - io.github.fvarrui - javapackager - {latest-plugin-version-here} + io.github.fvarrui + javapackager + {latest-plugin-version-here} true - fvarrui.sample.Main + fvarrui.sample.Main false - - - - bundling-for-windows - package - - package - - + + + + bundling-for-windows + package + + package + + windows true - - - - bundling-for-linux - package - - package - - + + + + bundling-for-linux + package + + package + + linux true X:\\path\to\linux\jdk - - - - bundling-for-mac - package - - package - - + + + + bundling-for-mac + package + + package + + mac true X:\\path\to\mac\jdk - - - + + + ``` From f0481d06e6e532f23c1db2bb0322bbbda6870e8c Mon Sep 17 00:00:00 2001 From: Francisco Vargas Ruiz <4354486+fvarrui@users.noreply.github.com> Date: Fri, 8 Apr 2022 16:39:31 +0100 Subject: [PATCH 3/5] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5d383b04..211dc6e2 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,7 @@ It was born while teaching to my students how to build and distribute their Java ## Apps packaged with JavaPackager - [Spektar Design Lab](https://spektar.io/) +- [Astro Pixel Processor](https://www.astropixelprocessor.com/) ## How to use this plugin From 7705cff23902db6844ce50d5763d4b53d8cb7dc4 Mon Sep 17 00:00:00 2001 From: Michael Sims Date: Wed, 4 May 2022 03:51:53 -0700 Subject: [PATCH 4/5] Readme Update --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 211dc6e2..f8a83367 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,7 @@ It was born while teaching to my students how to build and distribute their Java - [Spektar Design Lab](https://spektar.io/) - [Astro Pixel Processor](https://www.astropixelprocessor.com/) +- [GistFX](https://github.com/RedmondSims/GistFX) ## How to use this plugin From 838f23e4e6e592b7da382683634284e684cb1044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Kourdouli?= Date: Mon, 23 May 2022 21:45:04 +0200 Subject: [PATCH 5/5] Make WindowsSigning Serializable --- .../io/github/fvarrui/javapackager/model/WindowsSigning.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/github/fvarrui/javapackager/model/WindowsSigning.java b/src/main/java/io/github/fvarrui/javapackager/model/WindowsSigning.java index e677fa18..f565b314 100644 --- a/src/main/java/io/github/fvarrui/javapackager/model/WindowsSigning.java +++ b/src/main/java/io/github/fvarrui/javapackager/model/WindowsSigning.java @@ -1,13 +1,16 @@ package io.github.fvarrui.javapackager.model; import java.io.File; +import java.io.Serializable; import org.apache.commons.lang3.StringUtils; /** * Info needed for signing EXEs on Windows */ -public class WindowsSigning { +public class WindowsSigning implements Serializable { + + private static final long serialVersionUID = 2559089741502151307L; private String storetype; private File keystore;