Changeset 17239 in josm


Ignore:
Timestamp:
2020-10-19T03:04:49+02:00 (6 weeks ago)
Author:
Don-vip
Message:

see #19937 - Fix building on java 15. Disable java 14 fully, 16-ea for macOS (patch by Stereo)

See https://github.com/openstreetmap/josm/pull/66

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/.github/workflows/ant.yml

    r17236 r17239  
    2323      matrix:
    2424        # test against latest update of each major Java version, as well as specific updates of LTS versions:
    25         java: [8, 11, 14, 15, 16-ea]
     25        java: [8, 11, 15, 16-ea]
    2626        os: [ubuntu-latest, macos-latest, windows-latest]
    2727        headless: ["true", "false"]
     
    3030            os: macos-latest
    3131          - java: 11
     32            os: macos-latest
     33          - java: 16-ea
    3234            os: macos-latest
    3335          - headless: "false"
     
    125127        with:
    126128          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing its ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
    127           asset_path: dist/JOSM.zip
     129          asset_path: app/JOSM.zip
    128130          asset_name: JOSM-${{ runner.os}}-java${{ matrix.java }}.zip
    129131          asset_content_type: application/zip
     
    136138        with:
    137139          upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing its ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
    138           asset_path: dist/josm-custom.jar
     140          asset_path: app/josm-custom.jar
    139141          asset_name: josm-latest.jar
    140142          asset_content_type: application/java-archive
  • trunk/native/macosx/macos-jpackage.sh

    r17236 r17239  
    1717echo "Building JOSM.app"
    1818
     19mkdir app
    1920jpackage -n "JOSM" --input dist --main-jar josm-custom.jar \
    2021    --main-class org.openstreetmap.josm.gui.MainApplication \
    21     --icon ./native/macosx/JOSM.icns --type app-image --dest dist \
     22    --icon ./native/macosx/JOSM.icns --type app-image --dest app \
    2223    --java-options "-Xmx8192m" --app-version $1 \
    2324    --copyright "JOSM, and all its integral parts, are released under the GNU General Public License v2 or later" \
     
    6970
    7071codesign -vvv --timestamp --options runtime --deep --force --sign "$SIGNING_KEY_NAME" \
    71     dist/JOSM.app/Contents/MacOS/JOSM \
    72     dist/JOSM.app/Contents/MacOS/libapplauncher.dylib \
    73     dist/JOSM.app/Contents/runtime/Contents/Home/lib/*.jar \
    74     dist/JOSM.app/Contents/runtime/Contents/Home/lib/*.dylib \
    75     dist/JOSM.app/Contents/runtime/Contents/MacOS/libjli.dylib
     72    app/JOSM.app/Contents/MacOS/JOSM \
     73    app/JOSM.app/Contents/MacOS/libapplauncher.dylib \
     74    app/JOSM.app/Contents/runtime/Contents/Home/lib/*.jar \
     75    app/JOSM.app/Contents/runtime/Contents/Home/lib/*.dylib \
     76    app/JOSM.app/Contents/runtime/Contents/MacOS/libjli.dylib
    7677
    77 codesign -vvv --timestamp --entitlements native/macosx/josm.entitlements --options runtime --force --sign "$SIGNING_KEY_NAME" dist/JOSM.app
     78codesign -vvv --timestamp --entitlements native/macosx/josm.entitlements --options runtime --force --sign "$SIGNING_KEY_NAME" app/JOSM.app
    7879
    79 codesign -vvv dist/JOSM.app
     80codesign -vvv app/JOSM.app
    8081
    8182echo "Preparing for notarization"
    82 ditto -c -k --zlibCompressionLevel 9 --keepParent dist/JOSM.app dist/JOSM.zip
     83ditto -c -k --zlibCompressionLevel 9 --keepParent app/JOSM.app app/JOSM.zip
    8384
    8485echo "Uploading to Apple"
    85 xcrun altool --notarize-app -f dist/JOSM.zip -p "$APPLE_ID_PW" -u "thomas.skowron@fossgis.de" --primary-bundle-id de.openstreetmap.josm
     86xcrun altool --notarize-app -f app/JOSM.zip -p "$APPLE_ID_PW" -u "thomas.skowron@fossgis.de" --primary-bundle-id de.openstreetmap.josm
Note: See TracChangeset for help on using the changeset viewer.