Changeset 18801 in josm for trunk/native


Ignore:
Timestamp:
2023-08-09T15:30:01+02:00 (19 months ago)
Author:
taylor.smock
Message:

Fix #22832: Code cleanup and some simplification, documentation fixes (patch by gaben)

There should not be any functional changes in this patch; it is intended to do
the following:

  • Simplify and cleanup code (example: Arrays.asList(item) -> Collections.singletonList(item))
  • Fix typos in documentation (which also corrects the documentation to match what actually happens, in some cases)
Location:
trunk/native
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/native/docker-test.sh

    r17976 r18801  
     1#!/bin/bash
     2
    13docker build . -t josm/josm
    24mkdir -p test/report
    3 docker run -it --name josm -v `pwd`/test/report:/josm/test/report josm/josm
     5docker run -it --name josm -v "$(pwd)"/test/report:/josm/test/report josm/josm
    46docker rm josm
    57docker rmi josm/josm
  • trunk/native/windows/win-jpackage.sh

    r18525 r18801  
    3838#sed -i "s|%josm-source-dir%|$(pwd)|g" native/windows/main.wxs
    3939cp native/windows/main.wxs native/windows/main.wxs.bak
    40 sed -i 's?%josm-source-dir%?'`pwd`'?' native/windows/main.wxs
     40sed -i "s?%josm-source-dir%?$(pwd)?" native/windows/main.wxs
    4141sed -i 's?"/c/?"c:/?g' native/windows/main.wxs
    4242sed -i 's?"/d/?"d:/?g' native/windows/main.wxs
     
    4747for type in exe msi
    4848do
    49     jpackage $JPACKAGEOPTIONS -n "JOSM" --input dist --main-jar josm-custom.jar \
     49    jpackage "$JPACKAGEOPTIONS" -n "JOSM" --input dist --main-jar josm-custom.jar \
    5050    --main-class org.openstreetmap.josm.gui.MainApplication \
    5151    --icon ./native/windows/logo.ico --type $type --dest app \
     
    8686mv native/windows/main.wxs.bak native/windows/main.wxs
    8787
    88 mv app/JOSM-1.5.$1.exe app/JOSM.exe
    89 mv app/JOSM-1.5.$1.msi app/JOSM.msi
     88mv app/JOSM-1.5."$1".exe app/JOSM.exe
     89mv app/JOSM-1.5."$1".msi app/JOSM.msi
    9090
    9191# Workaround to https://bugs.openjdk.java.net/browse/JDK-8261845
Note: See TracChangeset for help on using the changeset viewer.