[geany/geany-plugins] 96fe84: Windows installer: Fix plugin uninstallation

[Enrico Tröger]

Branch:      refs/heads/master
Author:      Enrico Tröger <enrico.troeger at uvena.de>
Committer:   Enrico Tröger <enrico.troeger at uvena.de>
Date:        Sat, 11 Jul 2015 14:38:16 UTC
Commit:      96fe84ad0077aa895a3a27abfbf0df25f5310481
             https://github.com/geany/geany-plugins/commit/96fe84ad0077aa895a3a27abfbf0df25f5310481

Log Message:
-----------
Windows installer: Fix plugin uninstallation

Due to the change in the plugin installation directory, we need also to tell
the installer where to uninstall the plugins.

And fix the fix of the last commit: the Geany version number need to be
specified as major.minor.patch.


Modified Paths:
--------------
    build/geany-plugins.nsi

Modified: build/geany-plugins.nsi
70 lines changed, 35 insertions(+), 35 deletions(-)
===================================================================
@@ -38,7 +38,7 @@ RequestExecutionLevel highest ; set execution level for Windows Vista
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_DIR_REGKEY "Software\Geany-Plugins"
 !define GEANY_DIR_REGKEY "Software\Geany"
-!define REQUIRED_GEANY_VERSION "1.25"
+!define REQUIRED_GEANY_VERSION "1.25.0"
 !define RESOURCEDIR "geany-plugins-${PRODUCT_VERSION}"
 
 ;;;;;;;;;;;;;;;;;;;;;
@@ -151,40 +151,40 @@ SectionEnd
 Section Uninstall
 	Delete "$INSTDIR\ReadMe.Windows.txt"
 	Delete "$INSTDIR\uninst-plugins.exe"
-	Delete "$INSTDIR\lib\addons.dll"
-	Delete "$INSTDIR\lib\autoclose.dll"
-	Delete "$INSTDIR\lib\automark.dll"
-	Delete "$INSTDIR\lib\codenav.dll"
-	Delete "$INSTDIR\lib\commander.dll"
-	Delete "$INSTDIR\lib\defineformat.dll"
-	Delete "$INSTDIR\lib\geanydoc.dll"
-	Delete "$INSTDIR\lib\geanyctags.dll"
-	Delete "$INSTDIR\lib\geanyextrasel.dll"
-	Delete "$INSTDIR\lib\geanygendoc.dll"
-	Delete "$INSTDIR\lib\geanyinsertnum.dll"
-	Delete "$INSTDIR\lib\geanylatex.dll"
-	Delete "$INSTDIR\lib\geanylipsum.dll"
-	Delete "$INSTDIR\lib\geanylua.dll"
-	Delete "$INSTDIR\lib\geanymacro.dll"
-	Delete "$INSTDIR\lib\geanyminiscript.dll"
-	Delete "$INSTDIR\lib\geanynumberedbookmarks.dll"
-	Delete "$INSTDIR\lib\geanyprj.dll"
-	Delete "$INSTDIR\lib\geanysendmail.dll"
-	Delete "$INSTDIR\lib\geanyvc.dll"
-	Delete "$INSTDIR\lib\geniuspaste.dll"
-	Delete "$INSTDIR\lib\git-changebar.dll"
-	Delete "$INSTDIR\lib\overview.dll"
-	Delete "$INSTDIR\lib\pairtaghighlighter.dll"
-	Delete "$INSTDIR\lib\pohelper.dll"
-	Delete "$INSTDIR\lib\pretty-printer.dll"
-	Delete "$INSTDIR\lib\projectorganizer.dll"
-	Delete "$INSTDIR\lib\scope.dll"
-	Delete "$INSTDIR\lib\shiftcolumn.dll"
-	Delete "$INSTDIR\lib\spellcheck.dll"
-	Delete "$INSTDIR\lib\tableconvert.dll"
-	Delete "$INSTDIR\lib\treebrowser.dll"
-	Delete "$INSTDIR\lib\updatechecker.dll"
-	Delete "$INSTDIR\lib\xmlsnippets.dll"
+	Delete "$INSTDIR\lib\geany\addons.dll"
+	Delete "$INSTDIR\lib\geany\autoclose.dll"
+	Delete "$INSTDIR\lib\geany\automark.dll"
+	Delete "$INSTDIR\lib\geany\codenav.dll"
+	Delete "$INSTDIR\lib\geany\commander.dll"
+	Delete "$INSTDIR\lib\geany\defineformat.dll"
+	Delete "$INSTDIR\lib\geany\geanydoc.dll"
+	Delete "$INSTDIR\lib\geany\geanyctags.dll"
+	Delete "$INSTDIR\lib\geany\geanyextrasel.dll"
+	Delete "$INSTDIR\lib\geany\geanygendoc.dll"
+	Delete "$INSTDIR\lib\geany\geanyinsertnum.dll"
+	Delete "$INSTDIR\lib\geany\geanylatex.dll"
+	Delete "$INSTDIR\lib\geany\geanylipsum.dll"
+	Delete "$INSTDIR\lib\geany\geanylua.dll"
+	Delete "$INSTDIR\lib\geany\geanymacro.dll"
+	Delete "$INSTDIR\lib\geany\geanyminiscript.dll"
+	Delete "$INSTDIR\lib\geany\geanynumberedbookmarks.dll"
+	Delete "$INSTDIR\lib\geany\geanyprj.dll"
+	Delete "$INSTDIR\lib\geany\geanysendmail.dll"
+	Delete "$INSTDIR\lib\geany\geanyvc.dll"
+	Delete "$INSTDIR\lib\geany\geniuspaste.dll"
+	Delete "$INSTDIR\lib\geany\git-changebar.dll"
+	Delete "$INSTDIR\lib\geany\overview.dll"
+	Delete "$INSTDIR\lib\geany\pairtaghighlighter.dll"
+	Delete "$INSTDIR\lib\geany\pohelper.dll"
+	Delete "$INSTDIR\lib\geany\pretty-printer.dll"
+	Delete "$INSTDIR\lib\geany\projectorganizer.dll"
+	Delete "$INSTDIR\lib\geany\scope.dll"
+	Delete "$INSTDIR\lib\geany\shiftcolumn.dll"
+	Delete "$INSTDIR\lib\geany\spellcheck.dll"
+	Delete "$INSTDIR\lib\geany\tableconvert.dll"
+	Delete "$INSTDIR\lib\geany\treebrowser.dll"
+	Delete "$INSTDIR\lib\geany\updatechecker.dll"
+	Delete "$INSTDIR\lib\geany\xmlsnippets.dll"
 
 	Delete "$INSTDIR\bin\ctpl-2.dll"
 	Delete "$INSTDIR\bin\libenchant.dll"



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).