Changeset 18138 in josm for trunk/native


Ignore:
Timestamp:
2021-08-20T17:24:54+02:00 (4 years ago)
Author:
Don-vip
Message:

see #17083 - fix Windows installer package generation

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1717validator-*
        1818.josm-local
         19app

  • trunk/native/macosx/macos-jpackage.sh

    r18137 r18138  
    7272    --app-version "$1" \
    7373    --copyright "JOSM, and all its integral parts, are released under the GNU General Public License v2 or later" \
    74     --vendor "https://josm.openstreetmap.de" \
     74    --vendor "JOSM" \
    7575    --mac-sign \
    7676    --mac-package-identifier de.openstreetmap.josm \

  • trunk/native/windows/win-jpackage.sh

    • Property svn:executable set to *
    r18136 r18138  
    1212fi
    1313
    14 echo "Building JOSM.app"
     14echo "Building JOSM Windows Installer package"
    1515
    1616mkdir app
    … …  
    2121    jpackage $JPACKAGEOPTIONS -n "JOSM" --input dist --main-jar josm-custom.jar \
    2222    --main-class org.openstreetmap.josm.gui.MainApplication \
    23     --icon ./native/windows/logo.ico --type app-image --dest app \
     23    --icon ./native/windows/logo.ico --type msi --dest app \
    2424    --java-options "--add-exports=java.base/sun.security.action=ALL-UNNAMED" \
    2525    --java-options "--add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED" \
    … …  
    3232    --java-options "--add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED" \
    3333    --java-options "--add-opens=java.prefs/java.util.prefs=ALL-UNNAMED" \
    34     --app-version "$1" \
     34    --app-version "1.5.$1" \
    3535    --copyright "JOSM, and all its integral parts, are released under the GNU General Public License v2 or later" \
    36     --vendor "https://josm.openstreetmap.de" \
     36    --vendor "JOSM" \
    3737    --file-associations native/file-associations/bz2.properties \
    3838    --file-associations native/file-associations/geojson.properties \
    … …  
    4545    --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
    4646
     47mv app/JOSM-1.5.$1.msi app/JOSM.msi
     48
    4749echo "Building done."
Note: See TracChangeset for help on using the changeset viewer.