Changeset 17373 in josm for trunk/native/macosx


Ignore:
Timestamp:
2020-11-28T17:39:56+01:00 (10 months 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/native/macosx/macos-jpackage.sh

    r17244 r17373  
    1818
    1919mkdir app
    20 jpackage -n "JOSM" --input dist --main-jar josm-custom.jar \
    21     --main-class org.openstreetmap.josm.gui.MainApplication \
    22     --icon ./native/macosx/JOSM.icns --type app-image --dest app \
    23     --java-options "-Xmx8192m" --app-version $1 \
    24     --copyright "JOSM, and all its integral parts, are released under the GNU General Public License v2 or later" \
    25     --vendor "https://josm.openstreetmap.de" \
    26     --file-associations native/macosx/bz2.properties \
    27     --file-associations native/macosx/geojson.properties \
    28     --file-associations native/macosx/gpx.properties \
    29     --file-associations native/macosx/gz.properties \
    30     --file-associations native/macosx/jos.properties \
    31     --file-associations native/macosx/joz.properties \
    32     --file-associations native/macosx/osm.properties \
    33     --file-associations native/macosx/zip.properties \
    34     --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
    35 
    36 echo "Building done."
    3720
    3821if [[ $IMPORT_AND_UNLOCK_KEYCHAIN == 1 ]]; then
     
    5336
    5437    KEYCHAIN=build.keychain
     38    KEYCHAINPATH=~/Library/Keychains/$KEYCHAIN-db
    5539    KEYCHAIN_PW=`head /dev/urandom | base64 | head -c 20`
    5640    CERTIFICATE_P12=certificate.p12
     
    6751fi
    6852
    69 echo "Signing App Bundle…"
     53echo "Building and signin app"
     54    jpackage -n "JOSM" --input dist --main-jar josm-custom.jar \
     55    --main-class org.openstreetmap.josm.gui.MainApplication \
     56    --icon ./native/macosx/JOSM.icns --type app-image --dest app \
     57    --java-options "-Xmx8192m" \
     58     --java-options "-Dapple.awt.application.appearance=system" \
     59    --app-version $1 \
     60    --copyright "JOSM, and all its integral parts, are released under the GNU General Public License v2 or later" \
     61    --vendor "https://josm.openstreetmap.de" \
     62    --mac-sign \
     63    --mac-package-identifier de.openstreetmap.josm \
     64    --mac-package-signing-prefix de.openstreetmap.josm \
     65    --mac-signing-keychain $KEYCHAINPATH \
     66    --file-associations native/macosx/bz2.properties \
     67    --file-associations native/macosx/geojson.properties \
     68    --file-associations native/macosx/gpx.properties \
     69    --file-associations native/macosx/gz.properties \
     70    --file-associations native/macosx/jos.properties \
     71    --file-associations native/macosx/joz.properties \
     72    --file-associations native/macosx/osm.properties \
     73    --file-associations native/macosx/zip.properties \
     74    --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
    7075
    71 codesign -vvv --timestamp --options runtime --deep --force --sign "$SIGNING_KEY_NAME" \
    72     app/JOSM.app/Contents/MacOS/JOSM \
    73     app/JOSM.app/Contents/runtime/Contents/Home/lib/*.jar \
    74     app/JOSM.app/Contents/runtime/Contents/Home/lib/*.dylib \
    75     app/JOSM.app/Contents/runtime/Contents/MacOS/libjli.dylib
    76 
    77 codesign -vvv --timestamp --entitlements native/macosx/josm.entitlements --options runtime --force --sign "$SIGNING_KEY_NAME" app/JOSM.app
    78 
    79 codesign -vvv app/JOSM.app
     76echo "Building done."
    8077
    8178echo "Preparing for notarization"
Note: See TracChangeset for help on using the changeset viewer.