Changeset 24717 in osm for applications/editors/josm/nsis/josm.nsi

Timestamp:

2010-12-12T13:23:25+01:00 (16 years ago)

Author:

stoecker

Message:

fix installer due to plugin integration

File:

• applications/editors/josm/nsis/josm.nsi (modified) (5 diffs)

applications/editors/josm/nsis/josm.nsi

@@ -315 +315 @@
 SectionEnd
 
-Section $(JOSM_SEC_REMOTECONTROL_PLUGIN) SecRemoteControlPlugin
-;-------------------------------------------
-SectionIn 1 2
-SetShellVarContext current
-SetOutPath $APPDATA\JOSM\plugins
-File "..\dist\remotecontrol.jar"
-SectionEnd
-
 Section $(JOSM_SEC_TURNRESTRICTIONS_PLUGIN) SecTurnrestrictionsPlugin
 ;-------------------------------------------
@@ -331 +323 @@
 SectionEnd
 
-Section $(JOSM_SEC_WMS_PLUGIN) SecWMSPlugin
-;-------------------------------------------
-SectionIn 1 2
-SetShellVarContext current
-SetOutPath $APPDATA\JOSM\plugins
-File "..\dist\wmsplugin.jar"
+Section $(JOSM_SEC_WMS) SecWMS
+;-------------------------------------------
+SectionIn 1 2
+SetShellVarContext current
 SetOutPath $INSTDIR\imageformats
 File "webkit-image\imageformats\qjpeg4.dll"
@@ -399 +389 @@
 !include LogicLib.nsh
 ${WriteINIStrNS} $R0 "$APPDATA\JOSM\preferences" "plugins" "openstreetbugs
-remotecontrol
-turnrestrictions
-wmsplugin"
+turnrestrictions"
 SectionEnd
 
@@ -467 +455 @@
 Delete "$APPDATA\JOSM\plugins\remotecontrol\*.*"
 RMDir "$APPDATA\JOSM\plugins\remotecontrol"
+Delete "$APPDATA\JOSM\plugins\validator\*.*"
+RMDir "$APPDATA\JOSM\plugins\validator"
 Delete "$APPDATA\JOSM\plugins\wmsplugin\*.*"
 RMDir "$APPDATA\JOSM\plugins\wmsplugin"
@@ -496 +486 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPluginsGroup} $(JOSM_SECDESC_PLUGINS_GROUP)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenStreetBugsPlugin} $(JOSM_SECDESC_OPENSTREETBUGS_PLUGIN)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecRemoteControlPlugin} $(JOSM_SECDESC_REMOTECONTROL_PLUGIN)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecTurnrestrictionsPlugin} $(JOSM_SECDESC_TURNRESTRICTIONS_PLUGIN)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecWMSPlugin} $(JOSM_SECDESC_WMS_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)