Index: trunk/Dockerfile =================================================================== --- trunk/Dockerfile (revision 17975) +++ (revision ) @@ -1,15 +1,0 @@ -FROM openjdk:8-jdk-alpine - -RUN apk update && \ - apk add apache-ant && \ - apk add ttf-dejavu && \ - apk add subversion && \ - apk add git && \ - rm /var/cache/apk/* - -COPY . /josm - -RUN mkdir -p /josm/test/report - -CMD cd /josm && \ - ant test-html -DnoJavaFX=true Index: trunk/README =================================================================== --- trunk/README (revision 17975) +++ trunk/README (revision 17976) @@ -62,6 +62,4 @@ - eclipse/ preconfigured Eclipse configuration files - netbeans/ preconfigured Netbeans project -- josm.jnlp Java Web Start launcher file (used on the website for the tested version) -- josm-latest.jnlp Java Web Start launcher file (used on the website for the latest version) - LICENSE the JOSM license terms - native/ OS-specific files @@ -70,4 +68,6 @@ - macosx/ files needed to create the MacOS package - windows/ files needed to create the Windows installer + - josm.jnlp Java Web Start launcher file (used on the website for the tested version) + - josm-latest.jnlp Java Web Start launcher file (used on the website for the latest version) - nodist/ files not included in JOSM binary - data/ data files that are useful for development, but not distributed Index: trunk/docker-test.bat =================================================================== --- trunk/docker-test.bat (revision 17975) +++ (revision ) @@ -1,6 +1,0 @@ -docker build . -t josm/josm -mkdir %CD%\test\report -docker run -it --name josm -v %CD%\test\report:/josm/test/report josm/josm -docker rm josm -docker rmi josm/josm -pause Index: trunk/docker-test.sh =================================================================== --- trunk/docker-test.sh (revision 17975) +++ (revision ) @@ -1,5 +1,0 @@ -docker build . -t josm/josm -mkdir -p test/report -docker run -it --name josm -v `pwd`/test/report:/josm/test/report josm/josm -docker rm josm -docker rmi josm/josm Index: trunk/josm-latest.jnlp =================================================================== --- trunk/josm-latest.jnlp (revision 17975) +++ (revision ) @@ -1,28 +1,0 @@ - - - - - JOSM (development version) - OpenStreetMap - - Java OpenStreetMap editor - JOSM - JOSM - - - - - - - - - - - - - - - - - - Index: trunk/josm.jnlp =================================================================== --- trunk/josm.jnlp (revision 17975) +++ (revision ) @@ -1,28 +1,0 @@ - - - - - JOSM - OpenStreetMap - - Java OpenStreetMap editor - JOSM - JOSM - - - - - - - - - - - - - - - - - - Index: trunk/native/Dockerfile =================================================================== --- trunk/native/Dockerfile (revision 17976) +++ trunk/native/Dockerfile (revision 17976) @@ -0,0 +1,15 @@ +FROM openjdk:8-jdk-alpine + +RUN apk update && \ + apk add apache-ant && \ + apk add ttf-dejavu && \ + apk add subversion && \ + apk add git && \ + rm /var/cache/apk/* + +COPY . /josm + +RUN mkdir -p /josm/test/report + +CMD cd /josm && \ + ant test-html -DnoJavaFX=true Index: trunk/native/docker-test.bat =================================================================== --- trunk/native/docker-test.bat (revision 17976) +++ trunk/native/docker-test.bat (revision 17976) @@ -0,0 +1,6 @@ +docker build . -t josm/josm +mkdir %CD%\test\report +docker run -it --name josm -v %CD%\test\report:/josm/test/report josm/josm +docker rm josm +docker rmi josm/josm +pause Index: trunk/native/docker-test.sh =================================================================== --- trunk/native/docker-test.sh (revision 17976) +++ trunk/native/docker-test.sh (revision 17976) @@ -0,0 +1,5 @@ +docker build . -t josm/josm +mkdir -p test/report +docker run -it --name josm -v `pwd`/test/report:/josm/test/report josm/josm +docker rm josm +docker rmi josm/josm Index: trunk/native/josm-latest.jnlp =================================================================== --- trunk/native/josm-latest.jnlp (revision 17976) +++ trunk/native/josm-latest.jnlp (revision 17976) @@ -0,0 +1,28 @@ + + + + + JOSM (development version) + OpenStreetMap + + Java OpenStreetMap editor + JOSM + JOSM + + + + + + + + + + + + + + + + + + Index: trunk/native/josm.jnlp =================================================================== --- trunk/native/josm.jnlp (revision 17976) +++ trunk/native/josm.jnlp (revision 17976) @@ -0,0 +1,28 @@ + + + + + JOSM + OpenStreetMap + + Java OpenStreetMap editor + JOSM + JOSM + + + + + + + + + + + + + + + + + + Index: trunk/native/snapcraft.yaml =================================================================== --- trunk/native/snapcraft.yaml (revision 17976) +++ trunk/native/snapcraft.yaml (revision 17976) @@ -0,0 +1,47 @@ +name: josm +version: 0.git +summary: Editor for OpenStreetMap +description: | + JOSM is an extensible editor for ​OpenStreetMap (OSM) written in Java. + It supports loading GPX tracks, background imagery and OSM data from + local sources as well as from online sources and allows to edit the + OSM data (nodes, ways and relations) and their metadata tags. + JOSM is open source and licensed under GPL​. + + OpenStreetMap is a project aimed squarely at creating and providing + free geographic data such as street maps to anyone who wants them. + The project was started because most maps you think of as free actually + have legal or technical restrictions on their use, holding back people + from using them in creative, productive or unexpected ways. +confinement: strict +grade: devel +icon: native/linux/tested/usr/share/icons/hicolor/128x128/apps/josm.png + +apps: + josm: + command: josm-launch + desktop: josm.desktop + plugs: [unity7, network, home] + +parts: + local: + plugin: ant + ant-properties: + dist.dir: $SNAPCRAFT_PART_INSTALL + source: . + install: | + cp -a native/linux/tested/usr/share/applications/josm.desktop $SNAPCRAFT_PART_INSTALL/ + cat<<'EOF' > $SNAPCRAFT_PART_INSTALL/josm-launch + #!/bin/sh + # ensure font-config is happy + export XDG_DATA_HOME=$SNAP/usr/share + export FONTCONFIG_PATH=$SNAP/etc/fonts/config.d + export FONTCONFIG_FILE=$SNAP/etc/fonts/fonts.conf + export HOME=$SNAP_USER_DATA + # ensure java is happy as well + export JRE_HOME=$SNAP/usr/lib/jvm/default-java/jre + export JAVA_HOME=$SNAP/usr/lib/jvm/default-java/jre + java -Duser.home=$SNAP_USER_DATA -jar $SNAP/josm-custom.jar + EOF + chmod +x $SNAPCRAFT_PART_INSTALL/josm-launch + Index: trunk/snapcraft.yaml =================================================================== --- trunk/snapcraft.yaml (revision 17975) +++ (revision ) @@ -1,47 +1,0 @@ -name: josm -version: 0.git -summary: Editor for OpenStreetMap -description: | - JOSM is an extensible editor for ​OpenStreetMap (OSM) written in Java. - It supports loading GPX tracks, background imagery and OSM data from - local sources as well as from online sources and allows to edit the - OSM data (nodes, ways and relations) and their metadata tags. - JOSM is open source and licensed under GPL​. - - OpenStreetMap is a project aimed squarely at creating and providing - free geographic data such as street maps to anyone who wants them. - The project was started because most maps you think of as free actually - have legal or technical restrictions on their use, holding back people - from using them in creative, productive or unexpected ways. -confinement: strict -grade: devel -icon: linux/tested/usr/share/icons/hicolor/128x128/apps/josm.png - -apps: - josm: - command: josm-launch - desktop: josm.desktop - plugs: [unity7, network, home] - -parts: - local: - plugin: ant - ant-properties: - dist.dir: $SNAPCRAFT_PART_INSTALL - source: . - install: | - cp -a linux/tested/usr/share/applications/josm.desktop $SNAPCRAFT_PART_INSTALL/ - cat<<'EOF' > $SNAPCRAFT_PART_INSTALL/josm-launch - #!/bin/sh - # ensure font-config is happy - export XDG_DATA_HOME=$SNAP/usr/share - export FONTCONFIG_PATH=$SNAP/etc/fonts/config.d - export FONTCONFIG_FILE=$SNAP/etc/fonts/fonts.conf - export HOME=$SNAP_USER_DATA - # ensure java is happy as well - export JRE_HOME=$SNAP/usr/lib/jvm/default-java/jre - export JAVA_HOME=$SNAP/usr/lib/jvm/default-java/jre - java -Duser.home=$SNAP_USER_DATA -jar $SNAP/josm-custom.jar - EOF - chmod +x $SNAPCRAFT_PART_INSTALL/josm-launch -