Changeset 18161 in josm

Timestamp:

2021-08-22T18:50:06+02:00 (4 years ago)

Author:

Don-vip

Message:

see #17083, see #17858 - include JavaFX 16 in macOS/Windows packages

Location:

trunk

Files:

• .github/workflows/ant.yml (modified) (3 diffs)
• native/macosx/macos-jpackage.sh (modified) (2 diffs)
• native/windows/win-jpackage.sh (modified) (2 diffs)

trunk/.github/workflows/ant.yml

@@ -4 +4 @@
   # ANT_HOME is also our ant version
   ANT_HOME: 'apache-ant-1.10.11'
+  JAVAFX_VERSION: '16'
 on:
   push:
@@ -150 +151 @@
           APPLE_ID_PW: ${{ secrets.APPLE_ID_PW }}
         run: |
+          if [ ! -f tools/openjfx-${JAVAFX_VERSION}_${{ runner.os }}-jmods.zip ]; then
+            curl -o tools/openjfx-${JAVAFX_VERSION}_${{ runner.os }}-jmods.zip https://download2.gluonhq.com/openjfx/${JAVAFX_VERSION}/openjfx-${JAVAFX_VERSION}_osx-x64_bin-jmods.zip
+          fi
+          unzip tools/openjfx-${JAVAFX_VERSION}_${{ runner.os }}-jmods.zip
+          mv javafx-jmods-${JAVAFX_VERSION}/*.jmod $JAVA_HOME/jmods/
           ./native/macosx/macos-jpackage.sh ${{ needs.createrelease.outputs.josm_revision }}
 
@@ -165 +171 @@
           SIGN_TSA: ${{ secrets.SIGN_TSA }}
         run: |
+          if [ ! -f tools/openjfx-${JAVAFX_VERSION}_${{ runner.os }}-jmods.zip ]; then
+            curl -o tools/openjfx-${JAVAFX_VERSION}_${{ runner.os }}-jmods.zip https://download2.gluonhq.com/openjfx/${JAVAFX_VERSION}/openjfx-${JAVAFX_VERSION}_windows-x64_bin-jmods.zip
+          fi
+          unzip tools/openjfx-${JAVAFX_VERSION}_${{ runner.os }}-jmods.zip
+          mv javafx-jmods-${JAVAFX_VERSION}/*.jmod $JAVA_HOME/jmods/
           ./native/windows/win-jpackage.sh ${{ needs.createrelease.outputs.josm_revision }}
 

trunk/native/macosx/macos-jpackage.sh

@@ -61 +61 @@
     --main-class org.openstreetmap.josm.gui.MainApplication \
     --icon ./native/macosx/JOSM.icns --type app-image --dest app \
+    --java-options "--add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web" \
     --java-options "--add-exports=java.base/sun.security.action=ALL-UNNAMED" \
     --java-options "--add-exports=java.desktop/com.apple.eawt=ALL-UNNAMED" \
@@ -87 +88 @@
     --file-associations native/file-associations/osm.properties \
     --file-associations native/file-associations/zip.properties \
-    --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
+    --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,javafx.controls,javafx.media,javafx.swing,javafx.web
 
 echo "Building done."

trunk/native/windows/win-jpackage.sh

@@ -41 +41 @@
     --main-class org.openstreetmap.josm.gui.MainApplication \
     --icon ./native/windows/logo.ico --type $type --dest app \
+    --java-options "--add-modules java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web" \
     --java-options "--add-exports=java.base/sun.security.action=ALL-UNNAMED" \
     --java-options "--add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED" \
@@ -65 +66 @@
     --file-associations native/file-associations/zip.properties \
     --add-launcher HWConsole=native/windows/MLConsole.properties \
-    --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
+    --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,javafx.controls,javafx.media,javafx.swing,javafx.web
 done