Changeset 18138 in josm for trunk/native/windows/win-jpackage.sh

Timestamp:

2021-08-20T17:24:54+02:00 (3 years ago)

Author:

Don-vip

Message:

see #17083 - fix Windows installer package generation

Location:

trunk

Files:

• . (modified) (1 prop)
• native/windows/win-jpackage.sh (modified) (4 diffs, 1 prop)

trunk

@@ -17 +17 @@
 validator-*
 .josm-local
+app

@@ -17 +17 @@
 validator-*
 .josm-local
+app

trunk/native/windows/win-jpackage.sh

@@ -12 +12 @@
 fi
 
-echo "Building JOSM.app"
+echo "Building JOSM Windows Installer package"
 
 mkdir app
@@ -21 +21 @@
     jpackage $JPACKAGEOPTIONS -n "JOSM" --input dist --main-jar josm-custom.jar \
     --main-class org.openstreetmap.josm.gui.MainApplication \
-    --icon ./native/windows/logo.ico --type app-image --dest app \
+    --icon ./native/windows/logo.ico --type msi --dest app \
     --java-options "--add-exports=java.base/sun.security.action=ALL-UNNAMED" \
     --java-options "--add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED" \
@@ -32 +32 @@
     --java-options "--add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED" \
     --java-options "--add-opens=java.prefs/java.util.prefs=ALL-UNNAMED" \
-    --app-version "$1" \
+    --app-version "1.5.$1" \
     --copyright "JOSM, and all its integral parts, are released under the GNU General Public License v2 or later" \
-    --vendor "https://josm.openstreetmap.de" \
+    --vendor "JOSM" \
     --file-associations native/file-associations/bz2.properties \
     --file-associations native/file-associations/geojson.properties \
@@ -45 +45 @@
     --add-modules java.base,java.datatransfer,java.desktop,java.logging,java.management,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.sql,java.transaction.xa,java.xml,jdk.crypto.ec,jdk.jfr,jdk.jsobject,jdk.unsupported,jdk.unsupported.desktop,jdk.xml.dom
 
+mv app/JOSM-1.5.$1.msi app/JOSM.msi
+
 echo "Building done."

@@ -17 +17 @@
 validator-*
 .josm-local
+app