Changeset 18155 in josm for trunk

Timestamp:

2021-08-22T02:57:40+02:00 (3 years ago)

Author:

Don-vip

Message:

see #17083 - build both exe and msi windows installers, include JOSM version in filename, add additional console launcher

Location:

trunk

Files:

• .github/workflows/ant.yml (modified) (2 diffs)
• native/windows/MLConsole.properties (added)
• native/windows/win-jpackage.sh (modified) (5 diffs)

trunk/.github/workflows/ant.yml

@@ -177 +177 @@
           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.zip
-          asset_name: JOSM-${{ runner.os}}-java${{ matrix.java }}.zip
+          asset_name: JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.zip
           asset_content_type: application/zip
 
+      - name: Upload Windows Installer executable
+        if: ${{ runner.os == 'windows' && matrix.java != '8' && matrix.java != '11' && 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.exe
+          asset_name: JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.exe
+          asset_content_type: application/vnd.microsoft.portable-executable
+
       - name: Upload Windows Installer package
         if: ${{ runner.os == 'windows' && matrix.java != '8' && matrix.java != '11' && always() }}
@@ -189 +201 @@
           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_name: JOSM-${{ runner.os}}-java${{ matrix.java }}-${{ needs.createrelease.outputs.josm_revision }}.msi
           asset_content_type: application/x-ole-storage

trunk/native/windows/win-jpackage.sh

@@ -18 +18 @@
 fi
 
-echo "Building JOSM Windows Installer package"
+echo "Building JOSM Windows Installer packages"
 
 mkdir app
@@ -25 +25 @@
 then
     echo "SIGN_CERT, SIGN_STOREPASS and SIGN_TSA are not set in the environment."
-    echo "A JOSM.msi will be created but not signed."
+    echo "A JOSM.exe and JOSM.msi will be created but not signed."
     SIGNAPP=false
 else
@@ -35 +35 @@
 JPACKAGEOPTIONS=""
 
-echo "Building MSI"
-jpackage $JPACKAGEOPTIONS -n "JOSM" --input dist --main-jar josm-custom.jar \
+echo "Building EXE and MSI"
+for type in exe msi
+do
+    jpackage $JPACKAGEOPTIONS -n "JOSM" --input dist --main-jar josm-custom.jar \
     --main-class org.openstreetmap.josm.gui.MainApplication \
-    --icon ./native/windows/logo.ico --type msi --dest app \
+    --icon ./native/windows/logo.ico --type $type --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" \
@@ -60 +62 @@
     --file-associations native/file-associations/osm.properties \
     --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
+done
 
+mv app/JOSM-1.5.$1.exe app/JOSM.exe
 mv app/JOSM-1.5.$1.msi app/JOSM.msi
+
+# Workaround to https://bugs.openjdk.java.net/browse/JDK-8261845
+# to remove after we switch to Java 17+ for jpackage builds
+chmod u+w app/JOSM.exe
 
 echo "Building done."
@@ -69 +78 @@
     CERTIFICATE_P12=certificate.p12
     echo "$SIGN_CERT" | base64 --decode > $CERTIFICATE_P12
-    signtool.exe sign //f $CERTIFICATE_P12 //d "Java OpenStreetMap Editor" //du "https://josm.openstreetmap.de" //p "$SIGN_STOREPASS" //v //fd SHA256 //tr "$SIGN_TSA" //td SHA256 "app/JOSM.msi"
+    for ext in exe msi
+    do
+        signtool.exe sign //f $CERTIFICATE_P12 //d "Java OpenStreetMap Editor" //du "https://josm.openstreetmap.de" //p "$SIGN_STOREPASS" //v //fd SHA256 //tr "$SIGN_TSA" //td SHA256 "app/JOSM.$ext"
+    done
     rm $CERTIFICATE_P12
 fi