Changeset 14196 in osm for applications/editors/josm

Timestamp:

2009-03-21T16:40:49+01:00 (16 years ago)

Author:

ulf

Message:

put plugins only into personal folders, otherwise we get in conflict with the JOSM internal plugin update mechanism

cleanup of uninstall stuff

Location:

applications/editors/josm/nsis

Files:

• josm.nsi (modified) (7 diffs)
• langmacros.nsh (modified) (1 diff)
• locale/english.nsh (modified) (1 diff)
• locale/german.nsh (modified) (1 diff)

applications/editors/josm/nsis/josm.nsi

@@ -260 +260 @@
 ;
 SectionIn 1 2 RO
-SetShellVarContext all
+SetShellVarContext current
 
 SetOutPath $INSTDIR
@@ -319 +319 @@
 ;-------------------------------------------
 SectionIn 1 2
-SetShellVarContext all
+SetShellVarContext current
 SetOutPath $APPDATA\JOSM\plugins
 File "..\dist\wmsplugin.jar"
@@ -336 +336 @@
 ;-------------------------------------------
 SectionIn 1 2
-SetShellVarContext all
+SetShellVarContext current
 SetOutPath $APPDATA\JOSM\plugins
 File "..\dist\validator.jar"
@@ -402 +402 @@
 ;
 SectionIn 1 2
-SetShellVarContext all
+SetShellVarContext current
 
 Delete "$INSTDIR\josm.exe"
@@ -418 +418 @@
 Delete "$INSTDIR\webkit-image.exe"
 Delete "$INSTDIR\uninstall.exe"
-Delete "$APPDATA\JOSM\plugins\wmsplugin.jar"
-Delete "$APPDATA\JOSM\plugins\namefinder.jar"
-Delete "$APPDATA\JOSM\plugins\validator.jar"
-RMDir "$APPDATA\JOSM\plugins"
-RMDir "$APPDATA\JOSM"
 
 DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM"
@@ -455 +450 @@
 SectionIn 2
 SetShellVarContext current
+Delete "$APPDATA\JOSM\plugins\wmsplugin\*.*"
+RMDir "$APPDATA\JOSM\plugins\wmsplugin"
+Delete "$APPDATA\JOSM\plugins\validator\*.*"
+RMDir "$APPDATA\JOSM\plugins\validator"
+Delete "$APPDATA\JOSM\plugins\*.*"
+RMDir "$APPDATA\JOSM\plugins"
+
+Delete "$APPDATA\JOSM\motd.html"
 Delete "$APPDATA\JOSM\preferences"
 Delete "$APPDATA\JOSM\bookmarks"
-RMDir "$APPDATA\JOSM"
-SectionEnd
-
-Section /o "un.$(un.JOSM_SEC_PLUGINS)"un.SecPlugins
-;-------------------------------------------
-SectionIn 2
-SetShellVarContext current
-Delete "$APPDATA\JOSM\plugins\wmsplugin.jar"
-Delete "$APPDATA\JOSM\plugins\namefinder.jar"
-Delete "$APPDATA\JOSM\plugins\validator\*.*"
-Delete "$APPDATA\JOSM\plugins\validator.jar"
-RMDir "$APPDATA\JOSM\plugins\validator"
-RMDir "$APPDATA\JOSM\plugins"
 RMDir "$APPDATA\JOSM"
 SectionEnd
@@ -503 +493 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${un.SecUinstall} $(un.JOSM_SECDESC_UNINSTALL)
   !insertmacro MUI_DESCRIPTION_TEXT ${un.SecPersonalSettings} $(un.JOSM_SECDESC_PERSONAL_SETTINGS)
-  !insertmacro MUI_DESCRIPTION_TEXT ${un.SecPlugins} $(un.JOSM_SECDESC_PLUGINS)
 !insertmacro MUI_UNFUNCTION_DESCRIPTION_END
 

applications/editors/josm/nsis/langmacros.nsh

@@ -75 +75 @@
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_SECDESC_UNINSTALL                   ${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_SECDESC_PERSONAL_SETTINGS   ${CUR_LANG}
-  !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_SECDESC_PLUGINS                             ${CUR_LANG}
   
 

applications/editors/josm/nsis/locale/english.nsh

@@ -54 +54 @@
 
 !insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_UNINSTALL "Uninstall JOSM."
-!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_PERSONAL_SETTINGS  "Uninstall personal settings like your preferences and bookmarks from your profile: $PROFILE."
-!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_PLUGINS  "Uninstall all plugins."
+!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_PERSONAL_SETTINGS  "Uninstall personal settings from your profile: $PROFILE."
 

applications/editors/josm/nsis/locale/german.nsh

@@ -49 +49 @@
 
 !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 wie die Preferences und Bookmarks von Ihrem Profil: $PROFILE."
-!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_PLUGINS  "Deinstalliere alle Plugins."
-
+!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_PERSONAL_SETTINGS  "Deinstalliere persönliche Einstellungen von Ihrem Profil: $PROFILE."