Changeset 18136 in josm

Timestamp:

2021-08-20T16:29:19+02:00 (3 years ago)

Author:

Don-vip

Message:

see #17083 - generate jpackaged application on Windows too

Location:

trunk

Files:

• .github/workflows/ant.yml (modified) (1 diff)
• native/file-associations (added)
• native/file-associations/bz2.properties (moved) (moved from trunk/native/macosx/bz2.properties )
• native/file-associations/geojson.properties (moved) (moved from trunk/native/macosx/geojson.properties )
• native/file-associations/gpx.properties (moved) (moved from trunk/native/macosx/gpx.properties )
• native/file-associations/gz.properties (moved) (moved from trunk/native/macosx/gz.properties )
• native/file-associations/jos.properties (moved) (moved from trunk/native/macosx/jos.properties )
• native/file-associations/joz.properties (moved) (moved from trunk/native/macosx/joz.properties )
• native/file-associations/osm.properties (moved) (moved from trunk/native/macosx/osm.properties )
• native/file-associations/zip.properties (moved) (moved from trunk/native/macosx/zip.properties )
• native/macosx/macos-jpackage.sh (modified) (1 diff)
• native/windows/win-jpackage.sh (added)

trunk/.github/workflows/ant.yml

@@ -149 +149 @@
           ./native/macosx/macos-jpackage.sh ${{ needs.createrelease.outputs.josm_revision }}
 
-      - name: Upload macOS app
-        if: ${{ runner.os == 'macos' && always() }}
+      - name: Build and package for Windows
+        if: ${{ runner.os == 'windows' && always() }}
+        run: |
+          ./native/windows/win-jpackage.sh ${{ needs.createrelease.outputs.josm_revision }}
+
+      - name: Upload native app
+        if: ${{ ( runner.os == 'macos' || runner.os == 'windows' ) && always() }}
         id: upload-app
         uses: actions/upload-release-asset@v1

trunk/native/macosx/macos-jpackage.sh

@@ -55 +55 @@
 fi
 
-echo "Building and signin app"
+echo "Building and signing app"
     jpackage $JPACKAGEOPTIONS -n "JOSM" --input dist --main-jar josm-custom.jar \
     --main-class org.openstreetmap.josm.gui.MainApplication \