From 1bc7357aa2ae1150459b6a9ce8faf079838bf3c5 Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Sat, 3 Oct 2015 12:04:56 +0200 Subject: [PATCH] Windows: add missing folders to uninstaller Change-Id: I1f3ff0aff3233b4eec708208cb533b8a027a4db7 Reviewed-on: https://code.wireshark.org/review/10763 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin --- packaging/nsis/uninstall.nsi | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index 9da64fc2e6..f4b4c4b078 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -142,6 +142,8 @@ Delete "$INSTDIR\*.qm" Delete "$INSTDIR\accessible\*.*" Delete "$INSTDIR\AUTHORS-SHORT" Delete "$INSTDIR\COPYING*" +Delete "$INSTDIR\audio\*.*" +Delete "$INSTDIR\bearer\*.*" Delete "$INSTDIR\diameter\*.*" Delete "$INSTDIR\etc\gtk-2.0\*.*" Delete "$INSTDIR\etc\gtk-3.0\*.*" @@ -163,7 +165,9 @@ Delete "$INSTDIR\lib\gtk-2.0\modules\*.*" Delete "$INSTDIR\lib\pango\1.2.0\modules\*.*" Delete "$INSTDIR\lib\pango\1.4.0\modules\*.*" Delete "$INSTDIR\lib\pango\1.5.0\modules\*.*" +Delete "$INSTDIR\mediaservice\*.*" Delete "$INSTDIR\platforms\*.*" +Delete "$INSTDIR\playlistformats\*.*" Delete "$INSTDIR\printsupport\*.*" Delete "$INSTDIR\share\glib-2.0\schemas\*.*" Delete "$INSTDIR\share\themes\Default\gtk-2.0\*.*" @@ -202,6 +206,8 @@ Delete "$QUICKLAUNCH\${PROGRAM_NAME_GTK}.lnk" Delete "$QUICKLAUNCH\${PROGRAM_NAME_QT}.lnk" RMDir "$INSTDIR\accessible" +RMDir "$INSTDIR\audio" +RMDir "$INSTDIR\bearer" RMDir "$INSTDIR\etc\gtk-2.0" RMDir "$INSTDIR\etc\pango" RMDir "$INSTDIR\etc" @@ -230,7 +236,9 @@ RMDir "$INSTDIR\lib\pango\1.5.0\modules" RMDir "$INSTDIR\lib\pango\1.5.0" RMDir "$INSTDIR\lib\pango" RMDir "$INSTDIR\lib" +RMDir "$INSTDIR\mediaservice" RMDir "$INSTDIR\platforms" +RMDir "$INSTDIR\playlistformats" RMDir "$INSTDIR\printsupport" RMDir "$INSTDIR\share\themes\Default\gtk-2.0" RMDir "$INSTDIR\share\themes\Default"