Changeset 18138 in josm

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)
• .github/workflows/ant.yml (modified) (4 diffs)
• native/macosx/macos-jpackage.sh (modified) (1 diff)
• native/windows/win-jpackage.sh (modified) (4 diffs, 1 prop)

trunk

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

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

trunk/.github/workflows/ant.yml

@@ -4 +4 @@
   # ANT_HOME is also our ant version
   ANT_HOME: 'apache-ant-1.10.11'
+  WIX_HOME: 'wix3'
+  WIX_URL: 'https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip'
 on:
   push:
@@ -56 +58 @@
         with:
           tag_name: ${{ env.josm_release_tag }}
-          release_name: JOSM.app release ${{ env.josm_release_tag }}
+          release_name: JOSM release ${{ env.josm_release_tag }}
           body: |
-            JOSM.app release ${{ env.josm_release_tag }}
+            JOSM release ${{ env.josm_release_tag }}
           draft: false
           prerelease: ${{ env.josm_prerelease }}
@@ -152 +154 @@
         if: ${{ runner.os == 'windows' && always() }}
         run: |
+          if [ ! -f tools/${{ env.WIX_HOME }}-binaries.zip ]; then
+            curl -o tools/${{ env.WIX_HOME }}-binaries.zip ${{ env.WIX_URL }}
+          fi
+          Expand-Archive -Path tools/${{ env.WIX_HOME }}-binaries.zip -DestinationPath ${{ env.WIX_HOME }}
+          echo "${{ env.WIX_HOME }}" >> $GITHUB_PATH
           ./native/windows/win-jpackage.sh ${{ needs.createrelease.outputs.josm_revision }}
 
-      - name: Upload native app
-        if: ${{ ( runner.os == 'macos' || runner.os == 'windows' ) && always() }}
+      - name: Upload macOS app
+        if: ${{ runner.os == 'macos' && always() }}
         id: upload-app
         uses: actions/upload-release-asset@v1
@@ -165 +172 @@
           asset_name: JOSM-${{ runner.os}}-java${{ matrix.java }}.zip
           asset_content_type: application/zip
+
+      - name: Upload Windows Installer package
+        if: ${{ runner.os == 'windows' && always() }}
+        id: upload-msi
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.createrelease.outputs.upload_url }} # This pulls from the CREATE RELEASE job above, referencing its ID to get its outputs object, which include a `upload_url`.
+          asset_path: app/JOSM.msi
+          asset_name: JOSM-${{ runner.os}}-java${{ matrix.java }}.msi
+          asset_content_type: application/x-ole-storage

trunk/native/macosx/macos-jpackage.sh

@@ -72 +72 @@
     --app-version "$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" \
     --mac-sign \
     --mac-package-identifier de.openstreetmap.josm \

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