Index: trunk/native/linux/latest/DEBIAN/conffiles =================================================================== --- trunk/native/linux/latest/DEBIAN/conffiles (revision 16006) +++ trunk/native/linux/latest/DEBIAN/conffiles (revision 16006) @@ -0,0 +1,1 @@ +/etc/default/josm-latest Index: trunk/native/linux/latest/DEBIAN/control =================================================================== --- trunk/native/linux/latest/DEBIAN/control (revision 16006) +++ trunk/native/linux/latest/DEBIAN/control (revision 16006) @@ -0,0 +1,24 @@ +Package: josm-latest +Version: 1.5.svn{{VERSION}} +Section: utils +Maintainer: josm developers +Homepage: https://josm.openstreetmap.de +Priority: extra +Architecture: all +Depends: openjdk-11-jre | java11-runtime | openjdk-8-jre | java8-runtime, + proj-data +Recommends: openjfx +Description: Editor for OpenStreetMap (daily development snapshot) + JOSM is an editor for OpenStreetMap (OSM) written in Java. + The current version supports stand alone GPX tracks, GPX track data + from OSM database and existing nodes, line segments and metadata tags + from the OSM database. + . + 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. + + + Index: trunk/native/linux/latest/DEBIAN/postinst =================================================================== --- trunk/native/linux/latest/DEBIAN/postinst (revision 16006) +++ trunk/native/linux/latest/DEBIAN/postinst (revision 16006) @@ -0,0 +1,7 @@ +#!/bin/sh +set -e +# Automatically added by dh_installmenu +if [ "$1" = "configure" ] && [ -x "$(which update-menus 2>/dev/null)" ]; then + update-menus +fi +# End automatically added section Index: trunk/native/linux/latest/DEBIAN/postrm =================================================================== --- trunk/native/linux/latest/DEBIAN/postrm (revision 16006) +++ trunk/native/linux/latest/DEBIAN/postrm (revision 16006) @@ -0,0 +1,5 @@ +#!/bin/sh +set -e +# Automatically added by dh_installmenu +if [ -x "$(which update-menus 2>/dev/null)" ]; then update-menus ; fi +# End automatically added section Index: trunk/native/linux/latest/etc/default/josm-latest =================================================================== --- trunk/native/linux/latest/etc/default/josm-latest (revision 16006) +++ trunk/native/linux/latest/etc/default/josm-latest (revision 16006) @@ -0,0 +1,9 @@ +# Options to pass to java when starting JOSM. +# Uncomment the JAVA_OPTS lines to enable their use by /usr/bin/josm-latest + +# Increase usable memory +#JAVA_OPTS="${JAVA_OPTS} -Xmx2048m" + +# Enable OpenGL pipeline (2D graphic accelerators) +#JAVA_OPTS="${JAVA_OPTS} -Dsun.java2d.opengl=True" + Index: trunk/native/linux/latest/usr/bin/josm-latest =================================================================== --- trunk/native/linux/latest/usr/bin/josm-latest (revision 16006) +++ trunk/native/linux/latest/usr/bin/josm-latest (revision 16006) @@ -0,0 +1,74 @@ +#!/bin/bash +# Simple wrapper script used to start JOSM in Debian +set -e + +# First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK. +# Override to a specific one using $JAVACMD +ALTERNATIVE_JDK=$(readlink -n -f /etc/alternatives/java) + +# Let's get the current architecture -- needed for multiarchified Java +ARCH=$(dpkg --print-architecture 2> /dev/null || true) + +JAVA_CMDS="$JAVA_HOME/bin/java" + +# If OpenJDK is only available headless, do not try it +if dpkg --get-selections "openjdk-*-jre" | grep install$ > /dev/null \ +|| dpkg --get-selections "openjdk-*-jre:$ARCH" | grep install$ > /dev/null ; then + # LTS versions in decreased order + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java" + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java" + # Released versions in decreased order + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-14-openjdk/bin/java /usr/lib/jvm/java-14-openjdk-$ARCH/bin/java" + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-13-openjdk/bin/java /usr/lib/jvm/java-13-openjdk-$ARCH/bin/java" + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-12-openjdk/bin/java /usr/lib/jvm/java-12-openjdk-$ARCH/bin/java" + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java" + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java" + # Development version + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-15-openjdk/bin/java /usr/lib/jvm/java-15-openjdk-$ARCH/bin/java" +fi +# Undetermined version +JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/default-java/bin/java /usr/bin/java" + +if [ -f /etc/default/josm-latest ]; then + . /etc/default/josm-latest +fi + +JAVA_OPTS="-Djosm.restart=true -Djosm.dir.name=JOSM-latest -Djava.net.useSystemProxies=true $JAVA_OPTS" + +if [ -z "${JAVACMD}" ]; then + for jcmd in $JAVA_CMDS; do + if [ "z$ALTERNATIVE_JDK" = "z$(readlink -n -f "$jcmd")" ] && [ -z "${JAVACMD}" ]; then + JAVACMD="$jcmd" + break + fi + done +fi + +if [ -z "${JAVACMD}" ]; then + for jcmd in $JAVA_CMDS; do + if [ -x "$jcmd" ] && [ -z "${JAVACMD}" ]; then + JAVACMD="$jcmd" + break + fi + done +fi + +if [ "$JAVACMD" ]; then + echo "Using $JAVACMD to execute josm-latest." || true + if [[ "${JAVACMD}" =~ 'java-9' ]] || [[ "${JAVACMD}" =~ 'java-10' ]]; then + JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS" + elif [[ "${JAVACMD}" =~ 'java-1' ]]; then + JAVA_OPTS="--add-modules java.scripting,java.sql $JAVA_OPTS" + fi + set +e + while true; do + $JAVACMD $JAVA_OPTS -jar /usr/share/josm-latest/josm-latest.jar "$@" + if [ "z$?" != "z9" ]; then + break + fi + echo ">> restarting josm..." + done +else + echo "No valid JVM found to run JOSM." || true + exit 1 +fi Index: trunk/native/linux/latest/usr/share/applications/org.openstreetmap.josm-latest.desktop =================================================================== --- trunk/native/linux/latest/usr/share/applications/org.openstreetmap.josm-latest.desktop (revision 16006) +++ trunk/native/linux/latest/usr/share/applications/org.openstreetmap.josm-latest.desktop (revision 16006) @@ -0,0 +1,14 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=JOSM (latest snapshot) +GenericName=Java OpenStreetMap Editor (latest) +Comment=Extensible off-line editor for OpenStreetMap (OSM) +Icon=org.openstreetmap.josm-latest +Exec=josm-latest %U +Terminal=false +MimeType=application/x-osm+xml;application/x-gpx+xml;application/geo+json;application/x-josm-session+xml;application/x-josm-session+zip;x-scheme-handler/geo; +StartupNotify=true +Categories=Education;Geoscience;Maps; +StartupWMClass=org-openstreetmap-josm-MainApplication +Keywords=OpenStreetMap;OSM; Index: trunk/native/linux/latest/usr/share/doc/josm-latest/copyright =================================================================== --- trunk/native/linux/latest/usr/share/doc/josm-latest/copyright (revision 16006) +++ trunk/native/linux/latest/usr/share/doc/josm-latest/copyright (revision 16006) @@ -0,0 +1,4 @@ +Copyright (c) 2005-2020 JOSM developers + +License: GPL3+ + Index: trunk/native/linux/latest/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm-latest.svg =================================================================== --- trunk/native/linux/latest/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm-latest.svg (revision 16006) +++ trunk/native/linux/latest/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm-latest.svg (revision 16006) @@ -0,0 +1,208 @@ + + + JOSM Logotype 2019 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + JOSM Logotype 2019 + 2019-08-05 + + + Diamond00744 + + + + + Public Domain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/native/linux/latest/usr/share/man/man1/josm-latest.1 =================================================================== --- trunk/native/linux/latest/usr/share/man/man1/josm-latest.1 (revision 16006) +++ trunk/native/linux/latest/usr/share/man/man1/josm-latest.1 (revision 16006) @@ -0,0 +1,136 @@ +.TH JOSM 1 "July 21, 2016" +.\" Please adjust this date whenever revising the manpage. +.SH NAME +josm \- Java OpenStreetMap Editor +.SH SYNOPSIS +.B josm-latest +.SH DESCRIPTION +.B JOSM +is an editor for OpenStreetMap written in Java 8. +.PP +.B OpenStreetMap +is a project aimed squarely at creating and providing free geographic data such as street maps to anyone +who wants them. It allows you to view, edit and use geographical data in a collaborative way from +anywhere on earth. +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. +.SH OPTIONS +.TP +.B \-h, \-?, \-\-help +Show help +.TP +.B \-\-geometry=x(+|-)x(+|-)y +Standard X geometry argument +.TP +.B [\-\-download=]minlat,minlon,maxlat,maxlon +Download the bounding box +.TP +.B [\-\-download=] +Download the location at the url (with lat=x&lon=y&zoom=z) +.TP +.B [\-\-download=] +Open file (any file type that can be opened with File/Open) +.TP +.B \-\-downloadgps=minlat,minlon,maxlat,maxlon +Download the bounding box as raw gps +.TP +.B \-\-selection= +Select with the given search +.TP +.B \-\-[no\-]maximize +Do [not] launch in maximized mode +.TP +.B \-\-reset\-preferences +Reset the preferences to the default +.TP +.B \-\-load\-preferences= +Change preferences according to the XML file +.TP +.B \-\-set== +Set preference key to value +.TP +.B \-\-language= +Set the language +.TP +.B \-\-version +Display the JOSM version +.TP +.B \-\-debug +Print debugging messages to console +.TP +.B \-\-offline= +Disable access to the given resource(s), separated by comma +.SH FILES +JOSM files are saved according to the XDG Base Directory Specification: +.TP +.B $HOME/.config/JOSM-latest +Preferences +.TP +.B $HOME/.local/share/JOSM-latest +User data +.TP +.B $HOME/.cache/JOSM-latest +Cache +.TP +If the directory $HOME/.josm-latest exists, all files are stored there. +.SH JAVA PROPERTIES +The following options can be set by using Java system properties (i.e. \-Dkey=value +passed to java, or specified inside JAVA_OPTS). +.TP +.B josm.pref= +Set the JOSM preferences directory. +.TP +.B josm.userdata= +Set the JOSM user data directory. +.TP +.B josm.cache= +Set the JOSM cache directory. +.TP +.B josm.home= +Relocate all 3 directories to homedir. Cache directory will be in /cache. +.TP +.B josm.name= +Change the JOSM directory name. +.SH ENVIRONMENT +.IP JAVA_HOME +Specify an alternate Java environment. +.IP JAVA_OPTS +Specify Java options. +For example, to use a HTTP proxy server with this program, set this environment variable +to something like +.I JAVA_OPTS="-Dhttp.proxyHost=yourProxyURL" +before starting josm. +.SH AUTHOR +JOSM was originally designed and coded by Immanuel Scholz, +and is now maintained by the OpenStreetMap community. +.PP +The current JOSM maintainer is Dirk Stöcker. +A lot of administration work is done by Paul Hartmann and Vincent Privat. +.PP +Major code contributions from (in alphabetical order): +.PP +Stefan Breunig +David Earl +Gabriel Ebner +Dave Hansen +Paul Hartmann +Karl Guggisberg +Matthias Julius +Alexei Kasatkin +Jiri Klement +Ulf Lamping +Simon Legner +Raphael Mack +Upliner Mikhalych +Vincent Privat +Frederik Ramm +Dirk Stöcker +.PP +Many minor contributions and patches by others; see SVN history +at https://josm.openstreetmap.de/svn/ for details. Use +"josm-dev AT openstreetmap.org" to contact still active authors. +The logo has been designed by Ilya Palikov. +.PP +This manual page was initially written by Andreas Putzo , +for the Debian project (but may be used by others). Index: trunk/native/linux/latest/usr/share/metainfo/org.openstreetmap.josm-latest.appdata.xml =================================================================== --- trunk/native/linux/latest/usr/share/metainfo/org.openstreetmap.josm-latest.appdata.xml (revision 16006) +++ trunk/native/linux/latest/usr/share/metainfo/org.openstreetmap.josm-latest.appdata.xml (revision 16006) @@ -0,0 +1,30 @@ + + + org.openstreetmap.josm-latest + CC-BY-SA-3.0 + GPL-2.0+ + JOSM developers + JOSM + Java OpenStreetMap Editor + +

+ JOSM is an extensible off-line editor for ​OpenStreetMap (OSM) written in ​Java. +

+

+ It supports loading stand-alone GPX tracks and GPX track data from the OSM database as well as loading and + editing existing nodes, ways, metadata tags and relations from the OSM database. +

+ + + Education + Geoscience + Maps + + + org.openstreetmap.josm-latest.desktop + + https://josm.openstreetmap.de/svn/trunk/linux/josm-screenshot.png + + https://josm.openstreetmap.de + josm-dev_at_openstreetmap.org + Index: trunk/native/linux/latest/usr/share/mime/packages/josm-latest.xml =================================================================== --- trunk/native/linux/latest/usr/share/mime/packages/josm-latest.xml (revision 16006) +++ trunk/native/linux/latest/usr/share/mime/packages/josm-latest.xml (revision 16006) @@ -0,0 +1,18 @@ + + + + + OSM XML file + + + + + JOSM session file + + + + + JOSM session archive + + + Index: trunk/native/linux/tested/DEBIAN/conffiles =================================================================== --- trunk/native/linux/tested/DEBIAN/conffiles (revision 16006) +++ trunk/native/linux/tested/DEBIAN/conffiles (revision 16006) @@ -0,0 +1,1 @@ +/etc/default/josm Index: trunk/native/linux/tested/DEBIAN/control =================================================================== --- trunk/native/linux/tested/DEBIAN/control (revision 16006) +++ trunk/native/linux/tested/DEBIAN/control (revision 16006) @@ -0,0 +1,26 @@ +Package: josm +Version: 1.5.svn{{VERSION}} +Section: utils +Maintainer: josm developers +Homepage: https://josm.openstreetmap.de +Priority: extra +Architecture: all +Depends: openjdk-11-jre | java11-runtime | openjdk-8-jre | java8-runtime, + proj-data +Recommends: openjfx +Conflicts: josm-plugins +Replaces: josm-plugins +Description: Editor for OpenStreetMap + JOSM is an editor for OpenStreetMap (OSM) written in Java. + The current version supports stand alone GPX tracks, GPX track data + from OSM database and existing nodes, line segments and metadata tags + from the OSM database. + . + 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. + + + Index: trunk/native/linux/tested/DEBIAN/postinst =================================================================== --- trunk/native/linux/tested/DEBIAN/postinst (revision 16006) +++ trunk/native/linux/tested/DEBIAN/postinst (revision 16006) @@ -0,0 +1,7 @@ +#!/bin/sh +set -e +# Automatically added by dh_installmenu +if [ "$1" = "configure" ] && [ -x "$(which update-menus 2>/dev/null)" ]; then + update-menus +fi +# End automatically added section Index: trunk/native/linux/tested/DEBIAN/postrm =================================================================== --- trunk/native/linux/tested/DEBIAN/postrm (revision 16006) +++ trunk/native/linux/tested/DEBIAN/postrm (revision 16006) @@ -0,0 +1,5 @@ +#!/bin/sh +set -e +# Automatically added by dh_installmenu +if [ -x "$(which update-menus 2>/dev/null)" ]; then update-menus ; fi +# End automatically added section Index: trunk/native/linux/tested/etc/default/josm =================================================================== --- trunk/native/linux/tested/etc/default/josm (revision 16006) +++ trunk/native/linux/tested/etc/default/josm (revision 16006) @@ -0,0 +1,9 @@ +# Options to pass to java when starting JOSM. +# Uncomment the JAVA_OPTS lines to enable their use by /usr/bin/josm + +# Increase usable memory +#JAVA_OPTS="${JAVA_OPTS} -Xmx2048m" + +# Enable OpenGL pipeline (2D graphic accelerators) +#JAVA_OPTS="${JAVA_OPTS} -Dsun.java2d.opengl=True" + Index: trunk/native/linux/tested/usr/bin/josm =================================================================== --- trunk/native/linux/tested/usr/bin/josm (revision 16006) +++ trunk/native/linux/tested/usr/bin/josm (revision 16006) @@ -0,0 +1,74 @@ +#!/bin/bash +# Simple wrapper script used to start JOSM in Debian +set -e + +# First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK. +# Override to a specific one using $JAVACMD +ALTERNATIVE_JDK=$(readlink -n -f /etc/alternatives/java) + +# Let's get the current architecture -- needed for multiarchified Java +ARCH=$(dpkg --print-architecture 2> /dev/null || true) + +JAVA_CMDS="$JAVA_HOME/bin/java" + +# If OpenJDK is only available headless, do not try it +if dpkg --get-selections "openjdk-*-jre" | grep install$ > /dev/null \ +|| dpkg --get-selections "openjdk-*-jre:$ARCH" | grep install$ > /dev/null ; then + # LTS versions in decreased order + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java" + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java" + # Released versions in decreased order + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-14-openjdk/bin/java /usr/lib/jvm/java-14-openjdk-$ARCH/bin/java" + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-13-openjdk/bin/java /usr/lib/jvm/java-13-openjdk-$ARCH/bin/java" + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-12-openjdk/bin/java /usr/lib/jvm/java-12-openjdk-$ARCH/bin/java" + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java" + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java" + # Development version + JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-15-openjdk/bin/java /usr/lib/jvm/java-15-openjdk-$ARCH/bin/java" +fi +# Undetermined version +JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/default-java/bin/java /usr/bin/java" + +if [ -f /etc/default/josm ]; then + . /etc/default/josm +fi + +JAVA_OPTS="-Djosm.restart=true -Djava.net.useSystemProxies=true $JAVA_OPTS" + +if [ -z "${JAVACMD}" ]; then + for jcmd in $JAVA_CMDS; do + if [ "z$ALTERNATIVE_JDK" = "z$(readlink -n -f "$jcmd")" ] && [ -z "${JAVACMD}" ]; then + JAVACMD="$jcmd" + break + fi + done +fi + +if [ -z "${JAVACMD}" ]; then + for jcmd in $JAVA_CMDS; do + if [ -x "$jcmd" ] && [ -z "${JAVACMD}" ]; then + JAVACMD="$jcmd" + break + fi + done +fi + +if [ "$JAVACMD" ]; then + echo "Using $JAVACMD to execute josm." || true + if [[ "${JAVACMD}" =~ 'java-9' ]] || [[ "${JAVACMD}" =~ 'java-10' ]]; then + JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS" + elif [[ "${JAVACMD}" =~ 'java-1' ]]; then + JAVA_OPTS="--add-modules java.scripting,java.sql $JAVA_OPTS" + fi + set +e + while true; do + $JAVACMD $JAVA_OPTS -jar /usr/share/josm/josm.jar "$@" + if [ "z$?" != "z9" ]; then + break + fi + echo ">> restarting josm..." + done +else + echo "No valid JVM found to run JOSM." || true + exit 1 +fi Index: trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop =================================================================== --- trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop (revision 16006) +++ trunk/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop (revision 16006) @@ -0,0 +1,14 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=JOSM +GenericName=Java OpenStreetMap Editor +Comment=Extensible off-line editor for OpenStreetMap (OSM) +Icon=org.openstreetmap.josm +Exec=josm %U +Terminal=false +MimeType=application/x-osm+xml;application/x-gpx+xml;application/geo+json;application/x-josm-session+xml;application/x-josm-session+zip;x-scheme-handler/geo; +StartupNotify=true +Categories=Education;Geoscience;Maps; +StartupWMClass=org-openstreetmap-josm-MainApplication +Keywords=OpenStreetMap;OSM; Index: trunk/native/linux/tested/usr/share/doc/josm/copyright =================================================================== --- trunk/native/linux/tested/usr/share/doc/josm/copyright (revision 16006) +++ trunk/native/linux/tested/usr/share/doc/josm/copyright (revision 16006) @@ -0,0 +1,4 @@ +Copyright (c) 2005-2020 JOSM developers + +License: GPL3+ + Index: trunk/native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg =================================================================== --- trunk/native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg (revision 16006) +++ trunk/native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg (revision 16006) @@ -0,0 +1,208 @@ + + + JOSM Logotype 2019 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + JOSM Logotype 2019 + 2019-08-05 + + + Diamond00744 + + + + + Public Domain + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: trunk/native/linux/tested/usr/share/man/man1/josm.1 =================================================================== --- trunk/native/linux/tested/usr/share/man/man1/josm.1 (revision 16006) +++ trunk/native/linux/tested/usr/share/man/man1/josm.1 (revision 16006) @@ -0,0 +1,136 @@ +.TH JOSM 1 "July 21, 2016" +.\" Please adjust this date whenever revising the manpage. +.SH NAME +josm \- Java OpenStreetMap Editor +.SH SYNOPSIS +.B josm +.SH DESCRIPTION +.B JOSM +is an editor for OpenStreetMap written in Java 8. +.PP +.B OpenStreetMap +is a project aimed squarely at creating and providing free geographic data such as street maps to anyone +who wants them. It allows you to view, edit and use geographical data in a collaborative way from +anywhere on earth. +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. +.SH OPTIONS +.TP +.B \-h, \-?, \-\-help +Show help +.TP +.B \-\-geometry=x(+|-)x(+|-)y +Standard X geometry argument +.TP +.B [\-\-download=]minlat,minlon,maxlat,maxlon +Download the bounding box +.TP +.B [\-\-download=] +Download the location at the url (with lat=x&lon=y&zoom=z) +.TP +.B [\-\-download=] +Open file (any file type that can be opened with File/Open) +.TP +.B \-\-downloadgps=minlat,minlon,maxlat,maxlon +Download the bounding box as raw gps +.TP +.B \-\-selection= +Select with the given search +.TP +.B \-\-[no\-]maximize +Do [not] launch in maximized mode +.TP +.B \-\-reset\-preferences +Reset the preferences to the default +.TP +.B \-\-load\-preferences= +Change preferences according to the XML file +.TP +.B \-\-set== +Set preference key to value +.TP +.B \-\-language= +Set the language +.TP +.B \-\-version +Display the JOSM version +.TP +.B \-\-debug +Print debugging messages to console +.TP +.B \-\-offline= +Disable access to the given resource(s), separated by comma +.SH FILES +JOSM files are saved according to the XDG Base Directory Specification: +.TP +.B $HOME/.config/JOSM +Preferences +.TP +.B $HOME/.local/share/JOSM +User data +.TP +.B $HOME/.cache/JOSM +Cache +.TP +If the directory $HOME/.josm exists, all files are stored there. +.SH JAVA PROPERTIES +The following options can be set by using Java system properties (i.e. \-Dkey=value +passed to java, or specified inside JAVA_OPTS). +.TP +.B josm.pref= +Set the JOSM preferences directory. +.TP +.B josm.userdata= +Set the JOSM user data directory. +.TP +.B josm.cache= +Set the JOSM cache directory. +.TP +.B josm.home= +Relocate all 3 directories to homedir. Cache directory will be in /cache. +.TP +.B josm.name= +Change the JOSM directory name. +.SH ENVIRONMENT +.IP JAVA_HOME +Specify an alternate Java environment. +.IP JAVA_OPTS +Specify Java options. +For example, to use a HTTP proxy server with this program, set this environment variable +to something like +.I JAVA_OPTS="-Dhttp.proxyHost=yourProxyURL" +before starting josm. +.SH AUTHOR +JOSM was originally designed and coded by Immanuel Scholz, +and is now maintained by the OpenStreetMap community. +.PP +The current JOSM maintainer is Dirk Stöcker. +A lot of administration work is done by Paul Hartmann and Vincent Privat. +.PP +Major code contributions from (in alphabetical order): +.PP +Stefan Breunig +David Earl +Gabriel Ebner +Dave Hansen +Paul Hartmann +Karl Guggisberg +Matthias Julius +Alexei Kasatkin +Jiri Klement +Ulf Lamping +Simon Legner +Raphael Mack +Upliner Mikhalych +Vincent Privat +Frederik Ramm +Dirk Stöcker +.PP +Many minor contributions and patches by others; see SVN history +at https://josm.openstreetmap.de/svn/ for details. Use +"josm-dev AT openstreetmap.org" to contact still active authors. +The logo has been designed by Ilya Palikov. +.PP +This manual page was initially written by Andreas Putzo , +for the Debian project (but may be used by others). Index: trunk/native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml =================================================================== --- trunk/native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml (revision 16006) +++ trunk/native/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml (revision 16006) @@ -0,0 +1,30 @@ + + + org.openstreetmap.josm + CC-BY-SA-3.0 + GPL-2.0+ + JOSM developers + JOSM + Java OpenStreetMap Editor + +

+ JOSM is an extensible off-line editor for ​OpenStreetMap (OSM) written in ​Java. +

+

+ It supports loading stand-alone GPX tracks and GPX track data from the OSM database as well as loading and + editing existing nodes, ways, metadata tags and relations from the OSM database. +

+ + + Education + Geoscience + Maps + + + org.openstreetmap.josm.desktop + + https://josm.openstreetmap.de/svn/trunk/linux/josm-screenshot.png + + https://josm.openstreetmap.de + josm-dev_at_openstreetmap.org + Index: trunk/native/linux/tested/usr/share/mime/packages/josm.xml =================================================================== --- trunk/native/linux/tested/usr/share/mime/packages/josm.xml (revision 16006) +++ trunk/native/linux/tested/usr/share/mime/packages/josm.xml (revision 16006) @@ -0,0 +1,18 @@ + + + + + OSM XML file + + + + + JOSM session file + + + + + JOSM session archive + + + Index: trunk/native/macosx/JOSM.app/Contents/Info.plist_template.xml =================================================================== --- trunk/native/macosx/JOSM.app/Contents/Info.plist_template.xml (revision 16006) +++ trunk/native/macosx/JOSM.app/Contents/Info.plist_template.xml (revision 16006) @@ -0,0 +1,265 @@ +NSSupportsAutomaticGraphicsSwitching + +CFBundleAllowMixedLocalizations +true +UTExportedTypeDeclarations + + + + UTTypeIdentifier + org.openstreetmap.josm.osm + UTTypeDescription + JOSM File + UTTypeIconFile + JOSM.icns + UTTypeReferenceURL + http://wiki.openstreetmap.org/wiki/JOSM_file_format + UTTypeConformsTo + + public.xml + + UTTypeTagSpecification + + com.apple.ostype + JOSM + public.filename-extension + + osm + + public.mime-type + application/x-osm+xml + + + + + UTTypeIdentifier + org.openstreetmap.josm.jos + UTTypeDescription + JOS File + UTTypeIconFile + JOSM.icns + UTTypeConformsTo + + public.xml + + UTTypeTagSpecification + + com.apple.ostype + JOSM + public.filename-extension + + jos + + public.mime-type + application/x-josm-session+xml + + + + + UTTypeIdentifier + org.openstreetmap.josm.joz + UTTypeDescription + JOZ File + UTTypeIconFile + JOSM.icns + UTTypeConformsTo + + com.pkware.zip-archive + + UTTypeTagSpecification + + com.apple.ostype + JOSM + public.filename-extension + + joz + + public.mime-type + application/x-josm-session+zip + + + + + UTTypeIdentifier + public.geojson + UTTypeDescription + GeoJSON File + UTTypeIconFile + JOSM.icns + UTTypeConformsTo + + public.json + + UTTypeTagSpecification + + com.apple.ostype + GeoJSON + public.filename-extension + + geojson + + + + +UTImportedTypeDeclarations + + + + UTTypeIdentifier + com.topografix.gpx + UTTypeReferenceURL + http://www.topografix.com/GPX/1/1/ + UTTypeDescription + GPS Exchange Format (GPX) + UTTypeConformsTo + + public.xml + + UTTypeTagSpecification + + public.filename-extension + + gpx + + public.mime-type + application/gpx+xml + + + + + UTTypeIdentifier + com.apple.dt.document.gpx + UTTypeReferenceURL + http://www.topografix.com/GPX/1/1/ + UTTypeDescription + GPX File + UTTypeConformsTo + + public.xml + + UTTypeTagSpecification + + public.filename-extension + + gpx + + public.mime-type + application/gpx+xml + + + +CFBundleDocumentTypes + + + + CFBundleTypeIconFile + JOSM.icns + CFBundleTypeName + OSM Files + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.openstreetmap.josm.osm + + NSExportableTypes + + org.openstreetmap.josm.osm + com.topografix.gpx + com.pkware.zip-archive + org.gnu.gnu-zip-archive + public.archive.bzip2 + + + + + CFBundleTypeIconFile + JOSM.icns + CFBundleTypeName + JOS Files + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.openstreetmap.josm.jos + + + + + CFBundleTypeIconFile + JOSM.icns + CFBundleTypeName + JOZ Files + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + org.openstreetmap.josm.joz + + + + + CFBundleTypeIconFile + JOSM.icns + CFBundleTypeName + GeoJSON Files + CFBundleTypeRole + Editor + LSHandlerRank + Owner + LSItemContentTypes + + public.geojson + + + + + CFBundleTypeIconFile + JOSM.icns + CFBundleTypeName + GPX Files + CFBundleTypeRole + Editor + LSHandlerRank + Alternate + LSItemContentTypes + + com.topografix.gpx + com.apple.dt.document.gpx + + NSExportableTypes + + org.openstreetmap.josm.osm + + + + + CFBundleTypeIconFile + JOSM.icns + CFBundleTypeName + OSM Compressed Files + CFBundleTypeRole + Editor + LSHandlerRank + Alternate + LSItemContentTypes + + com.pkware.zip-archive + org.gnu.gnu-zip-archive + public.archive.bzip2 + + NSExportableTypes + + org.openstreetmap.josm.osm + com.pkware.zip-archive + org.gnu.gnu-zip-archive + public.archive.bzip2 + + + Index: trunk/native/windows/README.txt =================================================================== --- trunk/native/windows/README.txt (revision 16006) +++ trunk/native/windows/README.txt (revision 16006) @@ -0,0 +1,66 @@ +This is the Win32 installer generator for JOSM, to create a Windows +like installer. This should ease installation and provides a reasonable set of +default preferences for Windows users. + +Currently only josm and a small assortment of josm plugins is included in the +installer. + +As other osm related applications like osmarender and mapnik have a lot more +UNIX related dependencies that will make them complicated to install, only JOSM +is currently installed "the easy way". + + +install +------- +simply execute josm-setup-latest.exe + +uninstall +--------- +use "control panel / software" to uninstall + + +current state of the art +------------------------ +The installer will currently add: +- josm into "C:\Program Files\JOSM" (or the corresponding international dir) +- josm icons to the desktop and quick launch bar +- josm file associations to .osm and .gpx files +- some assorted plugins (more to follow?) +- default preferences to the current user profile (if not already existing) + +When the installed josm.exe is executed, it should ask the user to download +Java runtime if it's not already installed. + +build the installer +------------------- +1.) You will need to download and install the following on your machine: +- cygwin bash and wget +- launch4j - http://launch4j.sourceforge.net/ (currently 3.6, older 2.x will NOT work!) +- NSIS - http://nsis.sourceforge.net/ (any recent version should do) + +2.) Edit the two absolute paths in the file josm-setup-unix.sh (in the calls +to launch4jc and makensis) + +3.) Start a cygwin shell and call ./josm-setup-unix.sh + +how the installer is build +-------------------------- +First, wget will download the required files (e.g. the josm plugins) into the +downloads subdir. Then jaunch4j wraps the josm.jar into a josm.exe, which +makes registration of file extensions a lot easier. Then NSIS is called to +create the actual josm-setup-latest.exe. + +known issues +------------ +- absolute paths in josm-setup-unix.sh +- josm should support "global settings" instead of only the personal profile +- install all josm plugins by default and only enable them according to user wishes? + +build the installer under Linux / Debian +---------------------------------------- +It's possible to build the installer under Linux. Beside the things mentioned above, +the NSIS Debian package currently has an incomplete System.dll (in the plugins directory). +This dll needs to be replaced by the System.dll included in the NSIS zip package, e.g. from +http://nsis.sourceforge.net/Development_Files. +More details can be found in the following NSIS forum thread: +http://forums.winamp.com/showthread.php?s=bb7fa5bf8173e31c05e083340ca2c242&postid=2211132 Index: trunk/native/windows/josm-setup-unix.sh =================================================================== --- trunk/native/windows/josm-setup-unix.sh (revision 16006) +++ trunk/native/windows/josm-setup-unix.sh (revision 16006) @@ -0,0 +1,136 @@ +#!/bin/bash + +# Creates an josm-setup-xy.exe File +# +# for working on a debian-unix system install the nsis package with +# apt-get install nsis +# replace the /usr/share/nsis/Plugins/System.dll with the Version from the nsis .zip File +# The one coming with the debian package is missing the Call:: Function +# See also /usr/share/doc/nsis/README.Debian +# +# Then download launch4j from http://launch4j.sourceforge.net/ +# wget http://softlayer-ams.dl.sourceforge.net/project/launch4j/launch4j-3/3.5/launch4j-3.5-linux.tgz +# and unpack it to /usr/share/launch4j +# +# On Debian/Ubuntu 64bits, follow then this procedure +# http://sourceforge.net/p/launch4j/feature-requests/74/#2051 +# if you get this error: launch4j: net.sf.launch4j.ExecException: java.io.IOException: +# Cannot run program "/usr/share/launch4j/bin/windres": error=2, No such file or directory + +## settings ## + +# trying to find launch4j +if [ -s "/cygdrive/c/Program Files (x86)/Launch4j/launch4jc.exe" ]; then + # Windows under cygwin or MobaXterm + LAUNCH4J="/cygdrive/c/Program Files (x86)/Launch4j/launch4jc.exe" +elif [ -s /usr/share/launch4j/launch4j.jar ]; then + # as described above + LAUNCH4J="java -jar /usr/share/launch4j/launch4j.jar" +elif [ -s ../launch4j/launch4j.jar ]; then + LAUNCH4J="java -jar ../launch4j/launch4j.jar" +elif [ -s $HOME/launch4j/launch4j.jar ]; then + LAUNCH4J="java -jar $HOME/launch4j/launch4j.jar" +else + # launch4j installed locally under this nsis folder + LAUNCH4J="java -jar ./launch4j/launch4j.jar" +fi +echo Using launch4j: $LAUNCH4J + +# trying to find makensis +if [ -s "/cygdrive/c/Program Files (x86)/NSIS/makensis.exe" ]; then + # Windows under cygwin or MobaXterm + MAKENSIS="/cygdrive/c/Program Files (x86)/NSIS/makensis.exe" +else + # UNIX like + MAKENSIS=/usr/bin/makensis +fi +echo Using NSIS: $MAKENSIS + +if [ -n "$2" ]; then + # 2 arguments: for Ant build.xml and Jenkins CI + export VERSION=$1 + export JOSM_BUILD="no" + export JOSM_FILE=$2 +elif [ -n "$1" ]; then + # 1 argument: for official JOSM server + export VERSION=$1 + export JOSM_BUILD="no" + export JOSM_FILE="/home/josm/www/download/josm-tested.jar" +else + # no argument: for everyone else + svncorerevision=`svnversion -n ..` + #svnpluginsrevision=`svnversion -n ../../plugins` + #svnrevision="$svncorerevision-$svnpluginsrevision" + + #export VERSION=custom-${svnrevision} + export VERSION=`echo ${svncorerevision} | sed -e 's/M//g' -e 's/S//g' -e 's/P//g'` + export JOSM_BUILD="yes" + export JOSM_FILE="..\dist\josm-custom.jar" +fi + +echo "Creating Windows Installer for josm-$VERSION" + +echo +echo "##################################################################" +echo "### Build the Complete josm + Plugin Stuff" +if [ "x$JOSM_BUILD" == "xyes" ]; then + ( + echo "Build the Complete josm Stuff" + + echo "Compile Josm" + cd ../core + ant -q clean + ant -q compile || exit -1 + cd .. + + echo "Compile Josm Plugins" + cd plugins + ant -q clean + ant -q dist || exit -1 + ) || exit -1 +fi + +/bin/cp $JOSM_FILE josm-tested.jar + +function build_exe { + + export TARGET=$1 # josm / josm64. Used in file name of launcher and installer + + /bin/rm -f "launch4j_${TARGET}.xml" + /bin/sed -e "s/%TARGET%/$1/" -e "s/%RTBITS%/$2/" -e "s/%INIHEAP%/$3/" -e "s/%MAXHEAP%/$4/" -e "s/%VERSION%/$VERSION/" "launch4j.xml" > "launch4j_${TARGET}.xml" + + echo + echo "##################################################################" + echo "### convert jar to ${TARGET}.exe with launch4j" + # (an exe file makes attaching to file extensions a lot easier) + # launch4j - http://launch4j.sourceforge.net/ + # delete old exe file first + /bin/rm -f ${TARGET}*.exe + $LAUNCH4J "launch4j_${TARGET}.xml" + # comment previous line and uncomment next one on Windows + #"$LAUNCH4J" "launch4j_${TARGET}.xml" + + if ! [ -s ${TARGET}.exe ]; then + echo "NO ${TARGET}.exe File Created" + exit -1 + fi + + /bin/rm -f "launch4j_${TARGET}.xml" + + echo + echo "##################################################################" + echo "### create the ${TARGET}-installer-${VERSION}.exe with makensis" + # NSIS - http://nsis.sourceforge.net/Main_Page + # apt-get install nsis + "$MAKENSIS" -V2 -DVERSION=$VERSION -DDEST=$TARGET josm.nsi + + # keep the intermediate file, for debugging + /bin/rm -f ${TARGET}-intermediate.exe 2>/dev/null >/dev/null + /bin/mv ${TARGET}.exe ${TARGET}-intermediate.exe 2>/dev/null >/dev/null +} + +build_exe "josm" "64\/32" 256 2048 +# 64-bit binary generation commented until possible with launch4j / nsis +# build_exe "josm64" "64" 256 2048 + +/bin/rm -f josm-tested.jar 2>/dev/null >/dev/null Index: trunk/native/windows/josm.nsi =================================================================== --- trunk/native/windows/josm.nsi (revision 16006) +++ trunk/native/windows/josm.nsi (revision 16006) @@ -0,0 +1,479 @@ +; +; josm.nsi +; + +; Set the compression mechanism first. +SetCompressor /SOLID lzma + +; Load StdUtils plugin (ANSI until we switch to Unicode installer with NSIS 3) +!addplugindir plugins/stdutils/Plugins/ANSI +!addincludedir plugins/stdutils/Include + +!include "StdUtils.nsh" + +; make sure the installer will get elevated rights on UAC-enabled system (Vista+) +RequestExecutionLevel admin + +; Used to refresh the display of file association +!define SHCNE_ASSOCCHANGED 0x08000000 +!define SHCNF_IDLIST 0 + +; Used to add associations between file extensions and JOSM +!define OSM_ASSOC "josm-file" + +; ============================================================================ +; Header configuration +; ============================================================================ +; The name of the installer +Name "JOSM ${VERSION}" + +; The file to write +OutFile "${DEST}-setup-${VERSION}.exe" + +XPStyle on + +Var /GLOBAL plugins + +; ============================================================================ +; Modern UI +; ============================================================================ + +!include "MUI2.nsh" + +; Icon of installer and uninstaller +!define MUI_ICON "logo.ico" +!define MUI_UNICON "logo.ico" + +!define MUI_COMPONENTSPAGE_SMALLDESC +!define MUI_FINISHPAGE_NOAUTOCLOSE +!define MUI_UNFINISHPAGE_NOAUTOCLOSE +!define MUI_WELCOMEFINISHPAGE_BITMAP "josm-nsis-brand.bmp" +!define MUI_WELCOMEPAGE_TEXT $(JOSM_WELCOME_TEXT) + +!define MUI_FINISHPAGE_RUN +!define MUI_FINISHPAGE_RUN_FUNCTION LaunchJOSM + +; Function used to Launch JOSM in user (non-elevated) mode +Function LaunchJOSM + ${StdUtils.ExecShellAsUser} $0 "$INSTDIR\${DEST}.exe" "open" "" +FunctionEnd + +; ============================================================================ +; MUI Pages +; ============================================================================ + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "..\LICENSE" +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +!insertmacro MUI_UNPAGE_WELCOME +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_COMPONENTS +!insertmacro MUI_UNPAGE_INSTFILES +!insertmacro MUI_UNPAGE_FINISH + +; ============================================================================ +; MUI Languages +; ============================================================================ + + ;Remember the installer language + !define MUI_LANGDLL_REGISTRY_ROOT "HKLM" + !define MUI_LANGDLL_REGISTRY_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\JOSM" + !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" + + ;; English goes first because its the default. The rest are + ;; in alphabetical order (at least the strings actually displayed + ;; will be). + + !insertmacro MUI_LANGUAGE "English" + !insertmacro MUI_LANGUAGE "French" + !insertmacro MUI_LANGUAGE "German" + +;-------------------------------- +;Translations + + !define JOSM_DEFAULT_LANGFILE "locale\english.nsh" + + !include "langmacros.nsh" + + !insertmacro JOSM_MACRO_INCLUDE_LANGFILE "ENGLISH" "locale\english.nsh" + !insertmacro JOSM_MACRO_INCLUDE_LANGFILE "FRENCH" "locale\french.nsh" + !insertmacro JOSM_MACRO_INCLUDE_LANGFILE "GERMAN" "locale\german.nsh" + +; Uninstall stuff +!define MUI_UNCONFIRMPAGE_TEXT_TOP ${un.JOSM_UNCONFIRMPAGE_TEXT_TOP} + +; ============================================================================ +; Installation types +; ============================================================================ + +InstType "$(JOSM_FULL_INSTALL)" + +InstType "un.$(un.JOSM_DEFAULT_UNINSTALL)" +InstType "un.$(un.JOSM_FULL_UNINSTALL)" + +; ============================================================================ +; Section macros +; ============================================================================ +!include "Sections.nsh" + +; ========= Macro to unselect and disable a section ========= + +!macro DisableSection SECTION + + Push $0 + SectionGetFlags "${SECTION}" $0 + IntOp $0 $0 & ${SECTION_OFF} + IntOp $0 $0 | ${SF_RO} + SectionSetFlags "${SECTION}" $0 + Pop $0 + +!macroend + +; ========= Macro to enable (unreadonly) a section ========= +!define SECTION_ENABLE 0xFFFFFFEF +!macro EnableSection SECTION + + Push $0 + SectionGetFlags "${SECTION}" $0 + IntOp $0 $0 & ${SECTION_ENABLE} + SectionSetFlags "${SECTION}" $0 + Pop $0 + +!macroend + +; ============================================================================ +; Command Line +; ============================================================================ +!include "FileFunc.nsh" + +; ============================================================================ +; Directory selection page configuration +; ============================================================================ +; The text to prompt the user to enter a directory +DirText $(JOSM_DIR_TEXT) + +; The default installation directory +InstallDir $PROGRAMFILES\JOSM\ + +; See if this is an upgrade; if so, use the old InstallDir as default +InstallDirRegKey HKEY_LOCAL_MACHINE SOFTWARE\JOSM "InstallDir" + + +; ============================================================================ +; Install page configuration +; ============================================================================ +ShowInstDetails show +ShowUninstDetails show + +; ============================================================================ +; Functions and macros +; ============================================================================ + +; update file extension icons +!macro UpdateIcons + Push $R0 + Push $R1 + Push $R2 + + !define UPDATEICONS_UNIQUE ${__LINE__} + + IfFileExists "$SYSDIR\shell32.dll" UpdateIcons.next1_${UPDATEICONS_UNIQUE} UpdateIcons.error1_${UPDATEICONS_UNIQUE} +UpdateIcons.next1_${UPDATEICONS_UNIQUE}: + GetDllVersion "$SYSDIR\shell32.dll" $R0 $R1 + IntOp $R2 $R0 / 0x00010000 + IntCmp $R2 4 UpdateIcons.next2_${UPDATEICONS_UNIQUE} UpdateIcons.error2_${UPDATEICONS_UNIQUE} +UpdateIcons.next2_${UPDATEICONS_UNIQUE}: + System::Call 'shell32.dll::SHChangeNotify(i, i, i, i) v (${SHCNE_ASSOCCHANGED}, ${SHCNF_IDLIST}, 0, 0)' + Goto UpdateIcons.quit_${UPDATEICONS_UNIQUE} + +UpdateIcons.error1_${UPDATEICONS_UNIQUE}: + MessageBox MB_OK|MB_ICONSTOP $(JOSM_UPDATEICONS_ERROR1) + Goto UpdateIcons.quit_${UPDATEICONS_UNIQUE} +UpdateIcons.error2_${UPDATEICONS_UNIQUE}: + MessageBox MB_OK|MB_ICONINFORMATION $(JOSM_UPDATEICONS_ERROR2) + Goto UpdateIcons.quit_${UPDATEICONS_UNIQUE} +UpdateIcons.quit_${UPDATEICONS_UNIQUE}: + !undef UPDATEICONS_UNIQUE + Pop $R2 + Pop $R1 + Pop $R0 + +!macroend + +; associate a file extension to an icon +Function Associate + ; $R0 should contain the prefix to associate to JOSM + Push $R1 + + ReadRegStr $R1 HKCR $R0 "" + StrCmp $R1 "" Associate.doRegister + Goto Associate.end +Associate.doRegister: + ;The extension is not associated to any program, we can do the link + WriteRegStr HKCR $R0 "" ${OSM_ASSOC} +Associate.end: + pop $R1 +FunctionEnd + +; disassociate a file extension from an icon +Function un.unlink + ; $R0 should contain the prefix to unlink + Push $R1 + + ReadRegStr $R1 HKCR $R0 "" + StrCmp $R1 ${OSM_ASSOC} un.unlink.doUnlink + Goto un.unlink.end +un.unlink.doUnlink: + ; The extension is associated with JOSM so, we must destroy this! + DeleteRegKey HKCR $R0 +un.unlink.end: + pop $R1 +FunctionEnd + +Function .onInit + !insertmacro MUI_LANGDLL_DISPLAY +FunctionEnd + +Function un.onInit + !insertmacro MUI_UNGETLANGUAGE +FunctionEnd + +; ============================================================================ +; Installation execution commands +; ============================================================================ + +Section "-Required" +;------------------------------------------- + +; +; Install for every user +; +SectionIn 1 2 RO +SetShellVarContext current + +SetOutPath $INSTDIR + +; Write the uninstall keys for Windows +WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\JOSM" "DisplayVersion" "${VERSION}" +WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\JOSM" "DisplayName" "JOSM ${VERSION}" +WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\JOSM" "UninstallString" '"$INSTDIR\uninstall.exe"' +WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\JOSM" "Publisher" "OpenStreetMap JOSM team" +WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\JOSM" "HelpLink" "mailto:josm-dev@openstreetmap.org." +WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\JOSM" "URLInfoAbout" "https://josm.openstreetmap.de" +WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\JOSM" "URLUpdateInfo" "https://josm.openstreetmap.de" +WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\JOSM" "NoModify" 1 +WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\JOSM" "NoRepair" 1 +WriteUninstaller "uninstall.exe" + +; Write an entry for ShellExecute +WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${DEST}.exe" "" '$INSTDIR\${DEST}.exe' +WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${DEST}.exe" "Path" '$INSTDIR' + +SectionEnd ; "Required" + + +Section $(JOSM_SEC_JOSM) SecJosm +;------------------------------------------- +SectionIn 1 +SetOutPath $INSTDIR +File "${DEST}.exe" +File "josm-tested.jar" + +; XXX - should be provided/done by josm.jar itself and not here! +SetShellVarContext current +SetOutPath "$APPDATA\JOSM" + +SectionEnd + +SectionGroup $(JOSM_SEC_PLUGINS_GROUP) SecPluginsGroup + +Section $(JOSM_SEC_IMAGERY_OFFSET_DB_PLUGIN) SecImageryOffsetDbPlugin +;------------------------------------------- +SectionIn 1 2 +SetShellVarContext current +SetOutPath $APPDATA\JOSM\plugins +File "../../dist/imagery_offset_db.jar" +StrCpy $plugins "$plugins" +SectionEnd + +Section $(JOSM_SEC_TURNRESTRICTIONS_PLUGIN) SecTurnrestrictionsPlugin +;------------------------------------------- +SectionIn 1 2 +SetShellVarContext current +SetOutPath $APPDATA\JOSM\plugins +File "../../dist/turnrestrictions.jar" +StrCpy $plugins "$plugins" +SectionEnd + +SectionGroupEnd ; "Plugins" + +Section $(JOSM_SEC_STARTMENU) SecStartMenu +;------------------------------------------- +SectionIn 1 2 +; To quote "http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dnwue/html/ch11d.asp": +; "Do not include Readme, Help, or Uninstall entries on the Programs menu." +CreateShortCut "$SMPROGRAMS\JOSM.lnk" "$INSTDIR\${DEST}.exe" "" "$INSTDIR\${DEST}.exe" 0 "" "" $(JOSM_LINK_TEXT) +SectionEnd + +Section $(JOSM_SEC_DESKTOP_ICON) SecDesktopIcon +;------------------------------------------- +; Create desktop icon +; Desktop icon for a program should not be installed as default! +CreateShortCut "$DESKTOP\JOSM.lnk" "$INSTDIR\${DEST}.exe" "" "$INSTDIR\${DEST}.exe" 0 "" "" $(JOSM_LINK_TEXT) +SectionEnd + +Section $(JOSM_SEC_QUICKLAUNCH_ICON) SecQuickLaunchIcon +;------------------------------------------- +; Create quick launch icon. Does not really exist as of Windows 7/8 but still advanced users use it. +; Only disable it by default, see #10241 +CreateShortCut "$QUICKLAUNCH\JOSM.lnk" "$INSTDIR\${DEST}.exe" "" "$INSTDIR\${DEST}.exe" 0 "" "" $(JOSM_LINK_TEXT) +SectionEnd + +Section $(JOSM_SEC_FILE_EXTENSIONS) SecFileExtensions +;------------------------------------------- +SectionIn 1 2 +; Create File Extensions +WriteRegStr HKCR ${OSM_ASSOC} "" "OpenStreetMap data" +WriteRegStr HKCR "${OSM_ASSOC}\Shell\open\command" "" '"$INSTDIR\${DEST}.exe" "%1"' +WriteRegStr HKCR "${OSM_ASSOC}\DefaultIcon" "" '"$INSTDIR\${DEST}.exe",0' +push $R0 + StrCpy $R0 ".osm" + Call Associate + StrCpy $R0 ".geojson" + Call Associate + StrCpy $R0 ".gpx" + Call Associate + StrCpy $R0 ".jos" + Call Associate + StrCpy $R0 ".joz" + Call Associate +; if somethings added here, add it also to the uninstall section +pop $R0 +!insertmacro UpdateIcons +SectionEnd + +Section "-PluginSetting" +;------------------------------------------- +SectionIn 1 2 +;MessageBox MB_OK "PluginSetting!" IDOK 0 +; XXX - should better be handled inside JOSM (recent plugin manager is going in the right direction) +SetShellVarContext current +!include LogicLib.nsh +IfFileExists "$APPDATA\JOSM\preferences" settings_exists +IfFileExists "$APPDATA\JOSM\preferences.xml" settings_exists +FileOpen $R0 "$APPDATA\JOSM\preferences.xml" w +FileWrite $R0 "$plugins" +FileClose $R0 +settings_exists: +SectionEnd + +Section "un.$(un.JOSM_SEC_UNINSTALL)" un.SecUinstall +;------------------------------------------- + +; +; UnInstall for every user +; +SectionIn 1 2 +SetShellVarContext current + +ClearErrors +Delete "$INSTDIR\josm-tested.jar" +IfErrors 0 NoJOSMErrorMsg + MessageBox MB_OK $(un.JOSM_IN_USE_ERROR) IDOK 0 ;skipped if josm.jar removed + Abort $(un.JOSM_IN_USE_ERROR) +NoJOSMErrorMsg: +Delete "$INSTDIR\${DEST}.exe" +Delete "$INSTDIR\imageformats\qjpeg4.dll" +RMDir "$INSTDIR\imageformats" +Delete "$INSTDIR\mingwm10.dll" +Delete "$INSTDIR\QtCore4.dll" +Delete "$INSTDIR\QtGui4.dll" +Delete "$INSTDIR\QtNetwork4.dll" +Delete "$INSTDIR\QtWebKit4.dll" +Delete "$INSTDIR\webkit-image.exe" +Delete "$INSTDIR\uninstall.exe" + +DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\JOSM" +DeleteRegKey HKEY_LOCAL_MACHINE "Software\${DEST}.exe" +DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${DEST}.exe" + +; Remove Language preference info +DeleteRegKey HKCU "Software/JOSM" ;${MUI_LANGDLL_REGISTRY_ROOT} ${MUI_LANGDLL_REGISTRY_KEY} + +push $R0 + StrCpy $R0 ".osm" + Call un.unlink + StrCpy $R0 ".geojson" + Call un.unlink + StrCpy $R0 ".gpx" + Call un.unlink + StrCpy $R0 ".jos" + Call un.unlink + StrCpy $R0 ".joz" + Call un.unlink +pop $R0 + +DeleteRegKey HKCR ${OSM_ASSOC} +DeleteRegKey HKCR "${OSM_ASSOC}\Shell\open\command" +DeleteRegKey HKCR "${OSM_ASSOC}\DefaultIcon" +!insertmacro UpdateIcons + +Delete "$SMPROGRAMS\josm.lnk" +Delete "$DESKTOP\josm.lnk" +Delete "$QUICKLAUNCH\josm.lnk" + +RMDir "$INSTDIR" + +SectionEnd ; "Uninstall" + +Section /o "un.$(un.JOSM_SEC_PERSONAL_SETTINGS)" un.SecPersonalSettings +;------------------------------------------- +SectionIn 2 +SetShellVarContext current +Delete "$APPDATA\JOSM\plugins\turnrestrictions\*.*" +RMDir "$APPDATA\JOSM\plugins\turnrestrictions" +Delete "$APPDATA\JOSM\plugins\*.*" +RMDir "$APPDATA\JOSM\plugins" + +Delete "$APPDATA\JOSM\motd.html" +Delete "$APPDATA\JOSM\preferences.xml" +RMDir "$APPDATA\JOSM" +SectionEnd + +Section "-Un.Finally" +;------------------------------------------- +SectionIn 1 2 +; this test must be done after all other things uninstalled (e.g. Global Settings) +IfSilent NoFinalErrorMsg +IfFileExists "$INSTDIR" 0 NoFinalErrorMsg + MessageBox MB_OK $(un.JOSM_INSTDIR_ERROR) IDOK 0 ; skipped if dir doesn't exist +NoFinalErrorMsg: +SectionEnd + +; ============================================================================ +; PLEASE MAKE SURE, THAT THE DESCRIPTIVE TEXT FITS INTO THE DESCRIPTION FIELD! +; ============================================================================ +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${SecJosm} $(JOSM_SECDESC_JOSM) + !insertmacro MUI_DESCRIPTION_TEXT ${SecPluginsGroup} $(JOSM_SECDESC_PLUGINS_GROUP) + !insertmacro MUI_DESCRIPTION_TEXT ${SecImageryOffsetDbPlugin} $(JOSM_SECDESC_IMAGERY_OFFSET_DB_PLUGIN) + !insertmacro MUI_DESCRIPTION_TEXT ${SecTurnrestrictionsPlugin} $(JOSM_SECDESC_TURNRESTRICTIONS_PLUGIN) + !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} $(JOSM_SECDESC_STARTMENU) + !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopIcon} $(JOSM_SECDESC_DESKTOP_ICON) + !insertmacro MUI_DESCRIPTION_TEXT ${SecQuickLaunchIcon} $(JOSM_SECDESC_QUICKLAUNCH_ICON) + !insertmacro MUI_DESCRIPTION_TEXT ${SecFileExtensions} $(JOSM_SECDESC_FILE_EXTENSIONS) +!insertmacro MUI_FUNCTION_DESCRIPTION_END + +!insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${un.SecUinstall} $(un.JOSM_SECDESC_UNINSTALL) + !insertmacro MUI_DESCRIPTION_TEXT ${un.SecPersonalSettings} $(un.JOSM_SECDESC_PERSONAL_SETTINGS) +!insertmacro MUI_UNFUNCTION_DESCRIPTION_END + +; ============================================================================ +; Callback functions +; ============================================================================ + Index: trunk/native/windows/langmacros.nsh =================================================================== --- trunk/native/windows/langmacros.nsh (revision 16006) +++ trunk/native/windows/langmacros.nsh (revision 16006) @@ -0,0 +1,84 @@ +;; +;; Windows JOSM NSIS installer language macros +;; + +!macro JOSM_MACRO_DEFAULT_STRING LABEL VALUE + !ifndef "${LABEL}" + !define "${LABEL}" "${VALUE}" + !ifdef INSERT_DEFAULT + !warning "${LANG} lang file mising ${LABEL}, using default.." + !endif + !endif +!macroend + +!macro JOSM_MACRO_LANGSTRING_INSERT LABEL LANG + LangString "${LABEL}" "${LANG_${LANG}}" "${${LABEL}}" + !undef "${LABEL}" +!macroend + +!macro JOSM_MACRO_LANGUAGEFILE_BEGIN LANG + !define CUR_LANG "${LANG}" +!macroend + +!macro JOSM_MACRO_LANGUAGEFILE_END + !define INSERT_DEFAULT + !include "${JOSM_DEFAULT_LANGFILE}" + !undef INSERT_DEFAULT + + ; JOSM Language file Version 2 + ; String labels should match those from the default language file. + + + + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_WELCOME_TEXT ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_DIR_TEXT ${CUR_LANG} + + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_FULL_INSTALL ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_JOSM ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_PLUGINS_GROUP ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_IMAGERY_OFFSET_DB_PLUGIN ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_TURNRESTRICTIONS_PLUGIN ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_STARTMENU ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_DESKTOP_ICON ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_QUICKLAUNCH_ICON ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_FILE_EXTENSIONS ${CUR_LANG} + + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_JOSM ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_PLUGINS_GROUP ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_IMAGERY_OFFSET_DB_PLUGIN ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_TURNRESTRICTIONS_PLUGIN ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_STARTMENU ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_DESKTOP_ICON ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_QUICKLAUNCH_ICON ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_FILE_EXTENSIONS ${CUR_LANG} + + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_UPDATEICONS_ERROR1 ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_UPDATEICONS_ERROR2 ${CUR_LANG} + + !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_LINK_TEXT ${CUR_LANG} + + + !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_UNCONFIRMPAGE_TEXT_TOP ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_DEFAULT_UNINSTALL ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_FULL_UNINSTALL ${CUR_LANG} + + !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_IN_USE_ERROR ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_INSTDIR_ERROR ${CUR_LANG} + + + !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_SEC_UNINSTALL ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_SEC_PERSONAL_SETTINGS ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_SEC_PLUGINS ${CUR_LANG} + + !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_SECDESC_UNINSTALL ${CUR_LANG} + !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_SECDESC_PERSONAL_SETTINGS ${CUR_LANG} + + + !undef CUR_LANG +!macroend + +!macro JOSM_MACRO_INCLUDE_LANGFILE LANG FILE + !insertmacro JOSM_MACRO_LANGUAGEFILE_BEGIN "${LANG}" + !include "${FILE}" + !insertmacro JOSM_MACRO_LANGUAGEFILE_END +!macroend Index: trunk/native/windows/launch4j.xml =================================================================== --- trunk/native/windows/launch4j.xml (revision 16006) +++ trunk/native/windows/launch4j.xml (revision 16006) @@ -0,0 +1,35 @@ + + gui + %TARGET%.exe + josm-tested.jar + true + + https://java.com/download + + + + normal + true + logo.ico + + + 1.8.0 + + preferJre + %RTBITS% + %INIHEAP% + %MAXHEAP% + + + 1.5.0.%VERSION% + %VERSION% + Java OpenStreetMap Editor + GNU General Public License v2 or later + 1.5.0.%VERSION% + %VERSION% + JOSM + OpenStreetMap + %TARGET% + %TARGET%.exe + + Index: trunk/native/windows/locale/english.nsh =================================================================== --- trunk/native/windows/locale/english.nsh (revision 16006) +++ trunk/native/windows/locale/english.nsh (revision 16006) @@ -0,0 +1,51 @@ +;; +;; english.nsh +;; +;; Default language strings for the Windows JOSM NSIS installer. +;; Windows Code page: 1252 +;; +;; Note: If translating this file, replace "!insertmacro JOSM_MACRO_DEFAULT_STRING" +;; with "!define". + +; Make sure to update the JOSM_MACRO_LANGUAGEFILE_END macro in +; langmacros.nsh when updating this file + +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_WELCOME_TEXT "This wizard will guide you through the installation of the Java OpenStreetMap Editor (JOSM).$\r$\n$\r$\nBefore starting the installation, make sure any JOSM applications are not running.$\r$\n$\r$\nClick 'Next' to continue." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_DIR_TEXT "Choose a directory in which to install JOSM." + +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_FULL_INSTALL "JOSM (full install)" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_JOSM "JOSM" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_PLUGINS_GROUP "Plugins" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_IMAGERY_OFFSET_DB_PLUGIN "ImageryOffsetDatabase" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_TURNRESTRICTIONS_PLUGIN "TurnRestrictions" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_STARTMENU "Start Menu Entry" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_DESKTOP_ICON "Desktop Icon" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_QUICKLAUNCH_ICON "Quick Launch Icon" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_FILE_EXTENSIONS "File Extensions" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_JOSM "JOSM is the Java OpenStreetMap editor for .osm files." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_PLUGINS_GROUP "An assortment of useful JOSM plugins." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_IMAGERY_OFFSET_DB_PLUGIN "Database of imagery offsets: share and aquire imagery offsets with one button." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_TURNRESTRICTIONS_PLUGIN "Allows to enter and maintain information about turn restrictions." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_STARTMENU "Add a JOSM start menu entry." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_DESKTOP_ICON "Add a JOSM desktop icon." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_QUICKLAUNCH_ICON "Add a JOSM icon to the quick launch bar." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_FILE_EXTENSIONS "Add JOSM file extensions for .osm and .gpx files." + +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_UPDATEICONS_ERROR1 "Can't find 'shell32.dll' library. Impossible to update icons" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_UPDATEICONS_ERROR2 "You should install the free 'Microsoft Layer for Unicode' to update JOSM file icons" + +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_LINK_TEXT "Java OpenStreetMap - Editor" + +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_UNCONFIRMPAGE_TEXT_TOP "The following Java OpenStreetMap editor (JOSM) installation will be uninstalled. Click 'Next' to continue." +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_DEFAULT_UNINSTALL "Default (keep Personal Settings and plugins)" +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_FULL_UNINSTALL "All (remove all)" + +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_IN_USE_ERROR "Please note: josm could not be removed, it's probably in use!" +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_INSTDIR_ERROR "Please note: The directory $INSTDIR could not be removed!" + +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SEC_UNINSTALL "JOSM" +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SEC_PERSONAL_SETTINGS "Personal settings" +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SEC_PLUGINS "Personal plugins" + +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_UNINSTALL "Uninstall JOSM." +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_PERSONAL_SETTINGS "Uninstall personal settings from your profile: $PROFILE." Index: trunk/native/windows/locale/french.nsh =================================================================== --- trunk/native/windows/locale/french.nsh (revision 16006) +++ trunk/native/windows/locale/french.nsh (revision 16006) @@ -0,0 +1,51 @@ +;; +;; french.nsh +;; +;; French language strings for the Windows JOSM NSIS installer. +;; Windows Code page: 1252 +;; +;; Author: Vincent Privat , 2011. +;; + +; Make sure to update the JOSM_MACRO_LANGUAGEFILE_END macro in +; langmacros.nsh when updating this file + +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_WELCOME_TEXT "Cet assistant va vous guider à travers l'installation de l'éditeur Java OpenStreetMap (JOSM).$\r$\n$\r$\nAvant de lancer l'installation, assurez-vous que JOSM n'est pas déjà en cours d'exécution.$\r$\n$\r$\nVeuillez cliquer sur 'Suivant' pour continuer." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_DIR_TEXT "Veuillez choisir un dossier où installer JOSM." + +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_FULL_INSTALL "JOSM (installation complète)" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_JOSM "JOSM" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_PLUGINS_GROUP "Greffons" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_IMAGERY_OFFSET_DB_PLUGIN "ImageryOffsetDatabase" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_TURNRESTRICTIONS_PLUGIN "TurnRestrictions" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_STARTMENU "Entrée dans le menu Démarrer" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_DESKTOP_ICON "Icône sur le Bureau" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_QUICKLAUNCH_ICON "Icône dans la barre de lancement rapide" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_FILE_EXTENSIONS "Extensions de fichier" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_JOSM "JOSM est l'éditeur Java OpenStreetMap pour les fichiers .osm." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_PLUGINS_GROUP "Une sélection de greffons utiles pour JOSM." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_IMAGERY_OFFSET_DB_PLUGIN "Base de données de décalages d'imagerie: partager et acquérir des décalages d'imagerie avec un seul bouton." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_TURNRESTRICTIONS_PLUGIN "Permet de saisir et de maintenir des informations sur les restrictions de tourner." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_STARTMENU "Ajoute une entrée JOSM au menu démarrer." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_DESKTOP_ICON "Ajoute une icône JOSM au Bureau." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_QUICKLAUNCH_ICON "Ajoute une icône JOSM à la barre de lancement rapide." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_FILE_EXTENSIONS "Associe JOSM aux extensions de fichier .osm et .gpx." + +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_UPDATEICONS_ERROR1 "La bibliothèque 'shell32.dll' est introuvable. Impossible de mettre à jour les icônes" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_UPDATEICONS_ERROR2 "Vous devriez installer le complément gratuit 'Microsoft Layer for Unicode' pour mettre à jour les fichiers d'icônes de JOSM" + +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_LINK_TEXT "Éditeur Java OpenStreetMap" + +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_UNCONFIRMPAGE_TEXT_TOP "L'installation suivante de l'éditeur Java OpenStreetMap (JOSM) va être désinstallée. Veuillez cliquer sur 'Suivant' pour continuer." +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_DEFAULT_UNINSTALL "Défaut (conserve les paramètres personnels et les greffons)" +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_FULL_UNINSTALL "Tout (supprime l'intégralité des fichiers)" + +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_IN_USE_ERROR "Attention: JOSM n'a pas pu être retiré, il est probablement en utilisation !" +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_INSTDIR_ERROR "Attention: Le dossier $INSTDIR n'a pas pu être supprimé !" + +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SEC_UNINSTALL "JOSM" +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SEC_PERSONAL_SETTINGS "Paramètres personnels" +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SEC_PLUGINS "Greffons personnels" + +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_UNINSTALL "Désinstaller JOSM." +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_PERSONAL_SETTINGS "Désinstaller les paramètres personnels de votre profil: $PROFILE." Index: trunk/native/windows/locale/german.nsh =================================================================== --- trunk/native/windows/locale/german.nsh (revision 16006) +++ trunk/native/windows/locale/german.nsh (revision 16006) @@ -0,0 +1,51 @@ +;; +;; german.nsh +;; +;; German language strings for the Windows JOSM NSIS installer. +;; Windows Code page: 1252 +;; +;; Author: Bjoern Voigt , 2003. +;; Version 2 + +; Make sure to update the JOSM_MACRO_LANGUAGEFILE_END macro in +; langmacros.nsh when updating this file + +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_WELCOME_TEXT "Diese Installationshilfe wird Sie durch den Installationsvorgang des JAVA OpenStreetMap Editors (JOSM) führen.$\r$\n$\r$\nBevor Sie die Installation starten, stellen Sie bitte sicher das JOSM nicht bereits läuft.$\r$\n$\r$\nAuf 'Weiter' klicken um fortzufahren." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_DIR_TEXT "Bitte das Verzeichnis auswählen, in das JOSM installiert werden soll." + +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_FULL_INSTALL "JOSM (Komplettinstallation)" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_JOSM "JOSM" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_PLUGINS_GROUP "Plugins" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_IMAGERY_OFFSET_DB_PLUGIN "ImageryOffsetDatabase" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_TURNRESTRICTIONS_PLUGIN "TurnRestrictions" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_STARTMENU "Startmenü Eintrag" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_DESKTOP_ICON "Desktop Icon" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_QUICKLAUNCH_ICON "Schnellstartleiste Icon" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_FILE_EXTENSIONS "Dateiendungen" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_JOSM "JOSM ist der JAVA OpenStreetMap Editor für .osm Dateien." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_PLUGINS_GROUP "Eine Auswahl an nützlichen JOSM Plugins." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_IMAGERY_OFFSET_DB_PLUGIN "Datenbank der Bildversätze: Teilen und übernehmen Sie Bildversätze mit nur einer Schaltfläche." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_TURNRESTRICTIONS_PLUGIN "Erleichtert die Eingabe und Pflege von Informationen zu Abbiegebeschränkungen." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_STARTMENU "Fügt JOSM zum Startmenü hinzu." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_DESKTOP_ICON "Fügt ein JOSM Icon zum Desktop hinzu." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_QUICKLAUNCH_ICON "Fügt ein JOSM Icon zur Schnellstartleiste (Quick Launch) hinzu." +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SECDESC_FILE_EXTENSIONS "Fügt JOSM Dateiendungen für .osm and .gpx Dateien hinzu." + +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_UPDATEICONS_ERROR1 "Kann die Bibliothek 'shell32.dll' nicht finden. Das Update der Icons ist nicht möglich" +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_UPDATEICONS_ERROR2 "Sie sollten die kostenlose 'Microsoft Layer for Unicode' installieren um die Icons updaten zu können" + +!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_LINK_TEXT "JAVA OpenStreetMap - Editor" + +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_UNCONFIRMPAGE_TEXT_TOP "Die folgende JAVA OpenStreetMap editor (JOSM) Installation wird deinstalliert. Auf 'Weiter' klicken um fortzufahren." +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_DEFAULT_UNINSTALL "Default (persönliche Einstellungen und Plugins behalten)" +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_FULL_UNINSTALL "Alles (alles entfernen)" + +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_IN_USE_ERROR "Achtung: josm konnte nicht entfernt werden, möglicherweise wird es noch benutzt!" +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_INSTDIR_ERROR "Achtung: Das Verzeichnis $INSTDIR konnte nicht entfernt werden!" + +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SEC_UNINSTALL "JOSM" +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SEC_PERSONAL_SETTINGS "Persönliche Einstellungen" +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SEC_PLUGINS "Persönliche Plugins" + +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_UNINSTALL "Deinstalliere JOSM." +!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_PERSONAL_SETTINGS "Deinstalliere persönliche Einstellungen von Ihrem Profil: $PROFILE." Index: trunk/native/windows/plugins/stdutils/BUILD_TAG.txt =================================================================== --- trunk/native/windows/plugins/stdutils/BUILD_TAG.txt (revision 16006) +++ trunk/native/windows/plugins/stdutils/BUILD_TAG.txt (revision 16006) @@ -0,0 +1,4 @@ +StdUtils plug-in for NSIS +Copyright (C) 2004-2017 LoRd_MuldeR + +Built on 12.12.2017, at 13:37:20,09. Index: trunk/native/windows/plugins/stdutils/Include/StdUtils.nsh =================================================================== --- trunk/native/windows/plugins/stdutils/Include/StdUtils.nsh (revision 16006) +++ trunk/native/windows/plugins/stdutils/Include/StdUtils.nsh (revision 16006) @@ -0,0 +1,451 @@ +################################################################################# +# StdUtils plug-in for NSIS +# Copyright (C) 2004-2017 LoRd_MuldeR +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# http://www.gnu.org/licenses/lgpl-2.1.txt +################################################################################# + +# DEVELOPER NOTES: +# - Please see "https://github.com/lordmulder/stdutils/" for news and updates! +# - Please see "Docs\StdUtils\StdUtils.html" for detailed function descriptions! +# - Please see "Examples\StdUtils\StdUtilsTest.nsi" for usage examples! + +################################################################################# +# FUNCTION DECLARTIONS +################################################################################# + +!ifndef ___STDUTILS__NSH___ +!define ___STDUTILS__NSH___ + +!define StdUtils.Time '!insertmacro _StdUtils_Time' #time(), as in C standard library +!define StdUtils.GetMinutes '!insertmacro _StdUtils_GetMinutes' #GetSystemTimeAsFileTime(), returns the number of minutes +!define StdUtils.GetHours '!insertmacro _StdUtils_GetHours' #GetSystemTimeAsFileTime(), returns the number of hours +!define StdUtils.GetDays '!insertmacro _StdUtils_GetDays' #GetSystemTimeAsFileTime(), returns the number of days +!define StdUtils.Rand '!insertmacro _StdUtils_Rand' #rand(), as in C standard library +!define StdUtils.RandMax '!insertmacro _StdUtils_RandMax' #rand(), as in C standard library, with maximum value +!define StdUtils.RandMinMax '!insertmacro _StdUtils_RandMinMax' #rand(), as in C standard library, with minimum/maximum value +!define StdUtils.RandList '!insertmacro _StdUtils_RandList' #rand(), as in C standard library, with list support +!define StdUtils.FormatStr '!insertmacro _StdUtils_FormatStr' #sprintf(), as in C standard library, one '%d' placeholder +!define StdUtils.FormatStr2 '!insertmacro _StdUtils_FormatStr2' #sprintf(), as in C standard library, two '%d' placeholders +!define StdUtils.FormatStr3 '!insertmacro _StdUtils_FormatStr3' #sprintf(), as in C standard library, three '%d' placeholders +!define StdUtils.ScanStr '!insertmacro _StdUtils_ScanStr' #sscanf(), as in C standard library, one '%d' placeholder +!define StdUtils.ScanStr2 '!insertmacro _StdUtils_ScanStr2' #sscanf(), as in C standard library, two '%d' placeholders +!define StdUtils.ScanStr3 '!insertmacro _StdUtils_ScanStr3' #sscanf(), as in C standard library, three '%d' placeholders +!define StdUtils.TrimStr '!insertmacro _StdUtils_TrimStr' #Remove whitspaces from string, left and right +!define StdUtils.TrimStrLeft '!insertmacro _StdUtils_TrimStrLeft' #Remove whitspaces from string, left side only +!define StdUtils.TrimStrRight '!insertmacro _StdUtils_TrimStrRight' #Remove whitspaces from string, right side only +!define StdUtils.RevStr '!insertmacro _StdUtils_RevStr' #Reverse a string, e.g. "reverse me" <-> "em esrever" +!define StdUtils.ValidFileName '!insertmacro _StdUtils_ValidFileName' #Test whether string is a valid file name - no paths allowed +!define StdUtils.ValidPathSpec '!insertmacro _StdUtils_ValidPathSpec' #Test whether string is a valid full(!) path specification +!define StdUtils.SHFileMove '!insertmacro _StdUtils_SHFileMove' #SHFileOperation(), using the FO_MOVE operation +!define StdUtils.SHFileCopy '!insertmacro _StdUtils_SHFileCopy' #SHFileOperation(), using the FO_COPY operation +!define StdUtils.AppendToFile '!insertmacro _StdUtils_AppendToFile' #Append contents of an existing file to another file +!define StdUtils.ExecShellAsUser '!insertmacro _StdUtils_ExecShlUser' #ShellExecute() as NON-elevated user from elevated installer +!define StdUtils.InvokeShellVerb '!insertmacro _StdUtils_InvkeShlVrb' #Invokes a "shell verb", e.g. for pinning items to the taskbar +!define StdUtils.ExecShellWaitEx '!insertmacro _StdUtils_ExecShlWaitEx' #ShellExecuteEx(), returns the handle of the new process +!define StdUtils.WaitForProcEx '!insertmacro _StdUtils_WaitForProcEx' #WaitForSingleObject(), e.g. to wait for a running process +!define StdUtils.GetParameter '!insertmacro _StdUtils_GetParameter' #Get the value of a specific command-line option +!define StdUtils.TestParameter '!insertmacro _StdUtils_TestParameter' #Test whether a specific command-line option has been set +!define StdUtils.ParameterCnt '!insertmacro _StdUtils_ParameterCnt' #Get number of command-line tokens, similar to argc in main() +!define StdUtils.ParameterStr '!insertmacro _StdUtils_ParameterStr' #Get the n-th command-line token, similar to argv[i] in main() +!define StdUtils.GetAllParameters '!insertmacro _StdUtils_GetAllParams' #Get complete command-line, but without executable name +!define StdUtils.GetRealOSVersion '!insertmacro _StdUtils_GetRealOSVer' #Get the *real* Windows version number, even on Windows 8.1+ +!define StdUtils.GetRealOSBuildNo '!insertmacro _StdUtils_GetRealOSBld' #Get the *real* Windows build number, even on Windows 8.1+ +!define StdUtils.GetRealOSName '!insertmacro _StdUtils_GetRealOSStr' #Get the *real* Windows version, as a "friendly" name +!define StdUtils.GetOSEdition '!insertmacro _StdUtils_GetOSEdition' #Get the Windows edition, i.e. "workstation" or "server" +!define StdUtils.GetOSReleaseId '!insertmacro _StdUtils_GetOSRelIdNo' #Get the Windows release identifier (on Windows 10) +!define StdUtils.VerifyOSVersion '!insertmacro _StdUtils_VrfyRealOSVer' #Compare *real* operating system to an expected version number +!define StdUtils.VerifyOSBuildNo '!insertmacro _StdUtils_VrfyRealOSBld' #Compare *real* operating system to an expected build number +!define StdUtils.HashText '!insertmacro _StdUtils_HashText' #Compute hash from text string (CRC32, MD5, SHA1/2/3, BLAKE2) +!define StdUtils.HashFile '!insertmacro _StdUtils_HashFile' #Compute hash from file (CRC32, MD5, SHA1/2/3, BLAKE2) +!define StdUtils.NormalizePath '!insertmacro _StdUtils_NormalizePath' #Simplifies the path to produce a direct, well-formed path +!define StdUtils.GetParentPath '!insertmacro _StdUtils_GetParentPath' #Get parent path by removing the last component from the path +!define StdUtils.SplitPath '!insertmacro _StdUtils_SplitPath' #Split the components of the given path +!define StdUtils.GetDrivePart '!insertmacro _StdUtils_GetDrivePart' #Get drive component of path +!define StdUtils.GetDirectoryPart '!insertmacro _StdUtils_GetDirPart' #Get directory component of path +!define StdUtils.GetFileNamePart '!insertmacro _StdUtils_GetFNamePart' #Get file name component of path +!define StdUtils.GetExtensionPart '!insertmacro _StdUtils_GetExtnPart' #Get file extension component of path +!define StdUtils.TimerCreate '!insertmacro _StdUtils_TimerCreate' #Create a new event-timer that will be triggered periodically +!define StdUtils.TimerDestroy '!insertmacro _StdUtils_TimerDestroy' #Destroy a running timer created with TimerCreate() +!define StdUtils.GetLibVersion '!insertmacro _StdUtils_GetLibVersion' #Get the current StdUtils library version (for debugging) +!define StdUtils.SetVerbose '!insertmacro _StdUtils_SetVerbose' #Enable or disable "verbose" mode (for debugging) + + +################################################################################# +# MACRO DEFINITIONS +################################################################################# + +!macro _StdUtils_Time out + StdUtils::Time /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_GetMinutes out + StdUtils::GetMinutes /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_GetHours out + StdUtils::GetHours /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_GetDays out + StdUtils::GetDays /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_Rand out + StdUtils::Rand /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_RandMax out max + push ${max} + StdUtils::RandMax /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_RandMinMax out min max + push ${min} + push ${max} + StdUtils::RandMinMax /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_RandList count max + push ${max} + push ${count} + StdUtils::RandList /NOUNLOAD +!macroend + +!macro _StdUtils_FormatStr out format val + push '${format}' + push ${val} + StdUtils::FormatStr /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_FormatStr2 out format val1 val2 + push '${format}' + push ${val1} + push ${val2} + StdUtils::FormatStr2 /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_FormatStr3 out format val1 val2 val3 + push '${format}' + push ${val1} + push ${val2} + push ${val3} + StdUtils::FormatStr3 /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_ScanStr out format input default + push '${format}' + push '${input}' + push ${default} + StdUtils::ScanStr /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_ScanStr2 out1 out2 format input default1 default2 + push '${format}' + push '${input}' + push ${default1} + push ${default2} + StdUtils::ScanStr2 /NOUNLOAD + pop ${out1} + pop ${out2} +!macroend + +!macro _StdUtils_ScanStr3 out1 out2 out3 format input default1 default2 default3 + push '${format}' + push '${input}' + push ${default1} + push ${default2} + push ${default3} + StdUtils::ScanStr3 /NOUNLOAD + pop ${out1} + pop ${out2} + pop ${out3} +!macroend + +!macro _StdUtils_TrimStr var + push ${var} + StdUtils::TrimStr /NOUNLOAD + pop ${var} +!macroend + +!macro _StdUtils_TrimStrLeft var + push ${var} + StdUtils::TrimStrLeft /NOUNLOAD + pop ${var} +!macroend + +!macro _StdUtils_TrimStrRight var + push ${var} + StdUtils::TrimStrRight /NOUNLOAD + pop ${var} +!macroend + +!macro _StdUtils_RevStr var + push ${var} + StdUtils::RevStr /NOUNLOAD + pop ${var} +!macroend + +!macro _StdUtils_ValidFileName out test + push '${test}' + StdUtils::ValidFileName /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_ValidPathSpec out test + push '${test}' + StdUtils::ValidPathSpec /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_SHFileMove out from to hwnd + push '${from}' + push '${to}' + push ${hwnd} + StdUtils::SHFileMove /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_SHFileCopy out from to hwnd + push '${from}' + push '${to}' + push ${hwnd} + StdUtils::SHFileCopy /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_AppendToFile out from dest offset maxlen + push '${from}' + push '${dest}' + push ${offset} + push ${maxlen} + StdUtils::AppendToFile /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_ExecShlUser out file verb args + push '${file}' + push '${verb}' + push '${args}' + StdUtils::ExecShellAsUser /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_InvkeShlVrb out path file verb_id + push "${path}" + push "${file}" + push ${verb_id} + StdUtils::InvokeShellVerb /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_ExecShlWaitEx out_res out_val file verb args + push '${file}' + push '${verb}' + push '${args}' + StdUtils::ExecShellWaitEx /NOUNLOAD + pop ${out_res} + pop ${out_val} +!macroend + +!macro _StdUtils_WaitForProcEx out handle + push '${handle}' + StdUtils::WaitForProcEx /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_GetParameter out name default + push '${name}' + push '${default}' + StdUtils::GetParameter /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_TestParameter out name + push '${name}' + StdUtils::TestParameter /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_ParameterCnt out + StdUtils::ParameterCnt /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_ParameterStr out index + push ${index} + StdUtils::ParameterStr /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_GetAllParams out truncate + push '${truncate}' + StdUtils::GetAllParameters /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_GetRealOSVer out_major out_minor out_spack + StdUtils::GetRealOsVersion /NOUNLOAD + pop ${out_major} + pop ${out_minor} + pop ${out_spack} +!macroend + +!macro _StdUtils_GetRealOSBld out + StdUtils::GetRealOsBuildNo /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_GetRealOSStr out + StdUtils::GetRealOsName /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_VrfyRealOSVer out major minor spack + push '${major}' + push '${minor}' + push '${spack}' + StdUtils::VerifyRealOsVersion /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_VrfyRealOSBld out build + push '${build}' + StdUtils::VerifyRealOsBuildNo /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_GetOSEdition out + StdUtils::GetOsEdition /NOUNLOAD + pop ${out} +!macroend + + +!macro _StdUtils_GetOSRelIdNo out + StdUtils::GetOsReleaseId /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_HashText out type text + push '${type}' + push '${text}' + StdUtils::HashText /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_HashFile out type file + push '${type}' + push '${file}' + StdUtils::HashFile /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_NormalizePath out path + push '${path}' + StdUtils::NormalizePath /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_GetParentPath out path + push '${path}' + StdUtils::GetParentPath /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_SplitPath out_drive out_dir out_fname out_ext path + push '${path}' + StdUtils::SplitPath /NOUNLOAD + pop ${out_drive} + pop ${out_dir} + pop ${out_fname} + pop ${out_ext} +!macroend + +!macro _StdUtils_GetDrivePart out path + push '${path}' + StdUtils::GetDrivePart /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_GetDirPart out path + push '${path}' + StdUtils::GetDirectoryPart /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_GetFNamePart out path + push '${path}' + StdUtils::GetFileNamePart /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_GetExtnPart out path + push '${path}' + StdUtils::GetExtensionPart /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_TimerCreate out callback interval + GetFunctionAddress ${out} ${callback} + push ${out} + push ${interval} + StdUtils::TimerCreate /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_TimerDestroy out timer_id + push ${timer_id} + StdUtils::TimerDestroy /NOUNLOAD + pop ${out} +!macroend + +!macro _StdUtils_GetLibVersion out_ver out_tst + StdUtils::GetLibVersion /NOUNLOAD + pop ${out_ver} + pop ${out_tst} +!macroend + +!macro _StdUtils_SetVerbose on + !if "${on}" != "0" + StdUtils::EnableVerboseMode /NOUNLOAD + !else + StdUtils::DisableVerboseMode /NOUNLOAD + !endif +!macroend + + +################################################################################# +# MAGIC NUMBERS +################################################################################# + +!define StdUtils.Const.ShellVerb.PinToTaskbar 0 +!define StdUtils.Const.ShellVerb.UnpinFromTaskbar 1 +!define StdUtils.Const.ShellVerb.PinToStart 2 +!define StdUtils.Const.ShellVerb.UnpinFromStart 3 + +!endif # !___STDUTILS__NSH___ Index: trunk/native/windows/plugins/stdutils/LGPL.txt =================================================================== --- trunk/native/windows/plugins/stdutils/LGPL.txt (revision 16006) +++ trunk/native/windows/plugins/stdutils/LGPL.txt (revision 16006) @@ -0,0 +1,511 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! Index: trunk/native/windows/plugins/stdutils/LGPL_CLARIFICATION.txt =================================================================== --- trunk/native/windows/plugins/stdutils/LGPL_CLARIFICATION.txt (revision 16006) +++ trunk/native/windows/plugins/stdutils/LGPL_CLARIFICATION.txt (revision 16006) @@ -0,0 +1,31 @@ +StdUtils plug-in LGPL Clarification +=================================== + +The author of the StdUtils plug-in Library for NSIS adds the following clarification to the GNU Lesser General Public License version 2.1: + +Installer programs created with NSIS (Nullsoft Scriptable Install System) that incorporate and use the StdUtils plug-in Library, strictly through the NSIS plug-in interface, and that contain/distribute *verbatim* copies of the StdUtils plug-in Library are considered a "work that uses the Library"; they do NOT(!) represent a derivative of the Library. + +This means that if you incorporate a *verbatim* (unmodified) copy of the provided StdUtils plug-in DLL into your NSIS-based installer, then you still *are* allowed to distribute that installer under the license of your choice, including (but not limited to) "proprietary" licenses. + + +Rationalization +--------------- + +Technically, incorporating a plug-in DLL into your NSIS-based installer is NO(!) different from storing the plug-in DLL in an, e.g., ZIP archive. The plug-in DLL therefore will NOT(!) be linked "statically" to the actual installer program (i.e. the NSIS "exehead"), but instead resides in the "data" (archive) section of the installer file as a payload. + +The plug-in DLL will be extracted from the installer file and will be called/linked by the installer program (i.e. the NSIS "exehead") at runtime, in the form of a separate DLL file. The calling application consequently does NOT(!) need to be distributed under the GNU Lesser General Public License; it *may* be distributed under a proprietary license. + + +Limitations +----------- + +Even though the StdUtils plug-in Library *may* be incorporated into "proprietary" installer programs, the plug-in DLL itself will still be distributed under the terms of the General Public License version 2.1, which means that all restrictions of the General Public License version 2.1 must still be adhered to! + +In particular this means that: + +(a) If you make any modifications to the StdUtils plug-in Library, either by modifying the provided DLL file directly or by recompiling the DLL file from a *modified* version of the original source codes, then you MUST(!) ship your *modified* source codes alongside with the installer and share them under the same license terms as the original library. + +(b) If you include any code of the StdUtils plug-in Library directly into your software, rather than making your software call the StdUtils plug-in Library at runtime (as a separate DLL file), then your software becomes derivative of the Library and therefore your software as a whole MUST(!) be distributed under the General Public License version 2.1. + + +LoRd_MudeR Index: trunk/native/windows/plugins/stdutils/ReadMe.txt =================================================================== --- trunk/native/windows/plugins/stdutils/ReadMe.txt (revision 16006) +++ trunk/native/windows/plugins/stdutils/ReadMe.txt (revision 16006) @@ -0,0 +1,30 @@ + + StdUtils plug-in for NSIS + Copyright (C) 2004-2017 LoRd_MuldeR + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + http://www.gnu.org/licenses/lgpl-2.1.txt + + ---- + + The author of the StdUtils plug-in Library for NSIS adds the + following clarification to the GNU Lesser General Public License + version 2.1: Installer programs (executables) created with NSIS + (Nullsoft Scriptable Install System) that make use of the StdUtils + plug-in Library (strictly through the NSIS plug-in interface) and + that contain/distribute verbatim copies of the StdUtils plug-in + Library are considered a "work that uses the Library"; they do NOT + represent a derivative of the Library.