Changeset 11580 in josm

Timestamp:

2017-02-18T12:56:44+01:00 (7 years ago)

Author:

stoecker

Message:

see #13470 - drop last remaining HTML imagery part in windows installer (uninstaller still contains something)

Location:

trunk/windows

Files:

• josm-setup-unix.sh (modified) (3 diffs)
• josm.nsi (modified) (2 diffs)
• langmacros.nsh (modified) (2 diffs)

trunk/windows/josm-setup-unix.sh

@@ -51 +51 @@
   export VERSION=$1
   export JOSM_BUILD="no"
-  export WEBKIT_DOWNLOAD="yes"
   export JOSM_FILE=$2
 elif [ -n "$1" ]; then
@@ -57 +56 @@
   export VERSION=$1
   export JOSM_BUILD="no"
-  export WEBKIT_DOWNLOAD="no"
   export JOSM_FILE="/home/josm/www/download/josm-tested.jar"
 else
@@ -68 +66 @@
   export VERSION=`echo ${svncorerevision} | sed -e 's/M//g' -e 's/S//g' -e 's/P//g'`
   export JOSM_BUILD="yes"
-  export WEBKIT_DOWNLOAD="yes"
   export JOSM_FILE="..\dist\josm-custom.jar"
 fi
 
 echo "Creating Windows Installer for josm-$VERSION"
-
-echo 
-echo "##################################################################"
-echo "### Download and unzip the webkit stuff"
-if [ "x$WEBKIT_DOWNLOAD" == "xyes" ]; then
-    wget --continue --timestamping http://josm.openstreetmap.de/download/windows/webkit-image.zip
-else
-    if ! [ -f webkit-image.zip ]; then
-      ln -s /home/josm/www/download/windows/webkit-image.zip .
-    fi
-fi
-unzip -o webkit-image.zip
 
 echo 

trunk/windows/josm.nsi

@@ -299 +299 @@
 File "../../dist/turnrestrictions.jar"
 StrCpy $plugins "$plugins<entry value='turnrestrictions'/>"
-SectionEnd
-
-Section $(JOSM_SEC_WMS) SecWMS
-;-------------------------------------------
-SectionIn 1 2
-SetShellVarContext current
-SetOutPath $INSTDIR\imageformats
-File "webkit-image\imageformats\qjpeg4.dll"
-SetOutPath $INSTDIR
-File "webkit-image\mingwm10.dll"
-File "webkit-image\QtCore4.dll"
-File "webkit-image\QtGui4.dll"
-File "webkit-image\QtNetwork4.dll"
-File "webkit-image\QtWebKit4.dll"
-File "webkit-image\webkit-image.exe"
 SectionEnd
 
@@ -456 +441 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPluginsGroup} $(JOSM_SECDESC_PLUGINS_GROUP)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecTurnrestrictionsPlugin} $(JOSM_SECDESC_TURNRESTRICTIONS_PLUGIN)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecWMS} $(JOSM_SECDESC_WMS)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} $(JOSM_SECDESC_STARTMENU)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopIcon} $(JOSM_SECDESC_DESKTOP_ICON)

trunk/windows/langmacros.nsh

@@ -38 +38 @@
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_PLUGINS_GROUP                      ${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_TURNRESTRICTIONS_PLUGIN    ${CUR_LANG}
-  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_WMS                        ${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_STARTMENU                          ${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_DESKTOP_ICON                       ${CUR_LANG}
@@ -47 +46 @@
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_PLUGINS_GROUP          ${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_TURNRESTRICTIONS_PLUGIN        ${CUR_LANG}
-  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_WMS                    ${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_STARTMENU                      ${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_DESKTOP_ICON           ${CUR_LANG}