Changeset 11580 in josm


Ignore:
Timestamp:
2017-02-18T12:56:44+01:00 (4 months ago)
Author:
stoecker
Message:

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

Location:
trunk/windows
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/windows/josm-setup-unix.sh

    r7853 r11580  
    5151  export VERSION=$1
    5252  export JOSM_BUILD="no"
    53   export WEBKIT_DOWNLOAD="yes"
    5453  export JOSM_FILE=$2
    5554elif [ -n "$1" ]; then
     
    5756  export VERSION=$1
    5857  export JOSM_BUILD="no"
    59   export WEBKIT_DOWNLOAD="no"
    6058  export JOSM_FILE="/home/josm/www/download/josm-tested.jar"
    6159else
     
    6866  export VERSION=`echo ${svncorerevision} | sed -e 's/M//g' -e 's/S//g' -e 's/P//g'`
    6967  export JOSM_BUILD="yes"
    70   export WEBKIT_DOWNLOAD="yes"
    7168  export JOSM_FILE="..\dist\josm-custom.jar"
    7269fi
    7370
    7471echo "Creating Windows Installer for josm-$VERSION"
    75 
    76 echo
    77 echo "##################################################################"
    78 echo "### Download and unzip the webkit stuff"
    79 if [ "x$WEBKIT_DOWNLOAD" == "xyes" ]; then
    80     wget --continue --timestamping http://josm.openstreetmap.de/download/windows/webkit-image.zip
    81 else
    82     if ! [ -f webkit-image.zip ]; then
    83       ln -s /home/josm/www/download/windows/webkit-image.zip .
    84     fi
    85 fi
    86 unzip -o webkit-image.zip
    8772
    8873echo
  • trunk/windows/josm.nsi

    r11467 r11580  
    299299File "../../dist/turnrestrictions.jar"
    300300StrCpy $plugins "$plugins<entry value='turnrestrictions'/>"
    301 SectionEnd
    302 
    303 Section $(JOSM_SEC_WMS) SecWMS
    304 ;-------------------------------------------
    305 SectionIn 1 2
    306 SetShellVarContext current
    307 SetOutPath $INSTDIR\imageformats
    308 File "webkit-image\imageformats\qjpeg4.dll"
    309 SetOutPath $INSTDIR
    310 File "webkit-image\mingwm10.dll"
    311 File "webkit-image\QtCore4.dll"
    312 File "webkit-image\QtGui4.dll"
    313 File "webkit-image\QtNetwork4.dll"
    314 File "webkit-image\QtWebKit4.dll"
    315 File "webkit-image\webkit-image.exe"
    316301SectionEnd
    317302
     
    456441  !insertmacro MUI_DESCRIPTION_TEXT ${SecPluginsGroup} $(JOSM_SECDESC_PLUGINS_GROUP)
    457442  !insertmacro MUI_DESCRIPTION_TEXT ${SecTurnrestrictionsPlugin} $(JOSM_SECDESC_TURNRESTRICTIONS_PLUGIN)
    458   !insertmacro MUI_DESCRIPTION_TEXT ${SecWMS} $(JOSM_SECDESC_WMS)
    459443  !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} $(JOSM_SECDESC_STARTMENU)
    460444  !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopIcon} $(JOSM_SECDESC_DESKTOP_ICON)
  • trunk/windows/langmacros.nsh

    r7838 r11580  
    3838  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_PLUGINS_GROUP                      ${CUR_LANG}
    3939  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_TURNRESTRICTIONS_PLUGIN    ${CUR_LANG}
    40   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_WMS                        ${CUR_LANG}
    4140  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_STARTMENU                          ${CUR_LANG}
    4241  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_DESKTOP_ICON                       ${CUR_LANG}
     
    4746  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_PLUGINS_GROUP          ${CUR_LANG}
    4847  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_TURNRESTRICTIONS_PLUGIN        ${CUR_LANG}
    49   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_WMS                    ${CUR_LANG}
    5048  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_STARTMENU                      ${CUR_LANG}
    5149  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_DESKTOP_ICON           ${CUR_LANG}
Note: See TracChangeset for help on using the changeset viewer.