Changeset 17373 in josm for trunk/native/macosx

Timestamp:

2020-11-28T17:39:56+01:00 (4 years ago)

Author:

Don-vip

Message:

see #20146 - Improvements to macOS build and github actions (patch by Stereo)

From ​https://github.com/openstreetmap/josm/pull/67:

• Separate the create-release github action to pass the release url to all subsequent jobs, to be able to...
• Upload .jar artefacts from all runs, and a separate .app for all java versions for macOS
• Better caching for ant/junit
• Support for the release workflow from #20146
• A few cosmetic fixes, more readable syntax, etc.

File:

• trunk/native/macosx/macos-jpackage.sh (modified) (3 diffs)

trunk/native/macosx/macos-jpackage.sh

@@ -18 +18 @@
 
 mkdir app
-jpackage -n "JOSM" --input dist --main-jar josm-custom.jar \
-    --main-class org.openstreetmap.josm.gui.MainApplication \
-    --icon ./native/macosx/JOSM.icns --type app-image --dest app \
-    --java-options "-Xmx8192m" --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" \
-    --file-associations native/macosx/bz2.properties \
-    --file-associations native/macosx/geojson.properties \
-    --file-associations native/macosx/gpx.properties \
-    --file-associations native/macosx/gz.properties \
-    --file-associations native/macosx/jos.properties \
-    --file-associations native/macosx/joz.properties \
-    --file-associations native/macosx/osm.properties \
-    --file-associations native/macosx/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
-
-echo "Building done."
 
 if [[ $IMPORT_AND_UNLOCK_KEYCHAIN == 1 ]]; then
@@ -53 +36 @@
 
     KEYCHAIN=build.keychain
+    KEYCHAINPATH=~/Library/Keychains/$KEYCHAIN-db
     KEYCHAIN_PW=`head /dev/urandom | base64 | head -c 20`
     CERTIFICATE_P12=certificate.p12
@@ -67 +51 @@
 fi
 
-echo "Signing App Bundle…"
+echo "Building and signin app"
+    jpackage -n "JOSM" --input dist --main-jar josm-custom.jar \
+    --main-class org.openstreetmap.josm.gui.MainApplication \
+    --icon ./native/macosx/JOSM.icns --type app-image --dest app \
+    --java-options "-Xmx8192m" \
+     --java-options "-Dapple.awt.application.appearance=system" \
+    --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" \
+    --mac-sign \
+    --mac-package-identifier de.openstreetmap.josm \
+    --mac-package-signing-prefix de.openstreetmap.josm \
+    --mac-signing-keychain $KEYCHAINPATH \
+    --file-associations native/macosx/bz2.properties \
+    --file-associations native/macosx/geojson.properties \
+    --file-associations native/macosx/gpx.properties \
+    --file-associations native/macosx/gz.properties \
+    --file-associations native/macosx/jos.properties \
+    --file-associations native/macosx/joz.properties \
+    --file-associations native/macosx/osm.properties \
+    --file-associations native/macosx/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
 
-codesign -vvv --timestamp --options runtime --deep --force --sign "$SIGNING_KEY_NAME" \
-    app/JOSM.app/Contents/MacOS/JOSM \
-    app/JOSM.app/Contents/runtime/Contents/Home/lib/*.jar \
-    app/JOSM.app/Contents/runtime/Contents/Home/lib/*.dylib \
-    app/JOSM.app/Contents/runtime/Contents/MacOS/libjli.dylib
-
-codesign -vvv --timestamp --entitlements native/macosx/josm.entitlements --options runtime --force --sign "$SIGNING_KEY_NAME" app/JOSM.app
-
-codesign -vvv app/JOSM.app
+echo "Building done."
 
 echo "Preparing for notarization"