diff options
author | Gerald Combs <gerald@wireshark.org> | 2014-07-30 09:33:43 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2014-07-30 18:07:29 +0000 |
commit | 304388a44f6fcb468f98f2c7179bb39cb4ecd294 (patch) | |
tree | 90c1ceed286a6fe6352a3b9f0bdf9cb06ef26518 /packaging/nsis/uninstall.nsi | |
parent | 8d05e85c17353a548327b8dda682e8dbf5518850 (diff) |
Install our Qt DLL directories recursively.
Qwindows.dll at least needs to be in the "platforms" subdirectory. Use a
PowerShell script to convert the output of windeployqt to its equivalent
NSIS instructions. Give the Qt DLL manifest a .nsh extension. Make sure
we uninstall known Qt DLL directories. DLLs now load correctly according
to Dependency Walker.
Install and uninstall our .qm files while we're here.
Change-Id: I06ed279809e6fce0e008c5f278a56b1ae34c8f21
Reviewed-on: https://code.wireshark.org/review/3267
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'packaging/nsis/uninstall.nsi')
-rwxr-xr-x | packaging/nsis/uninstall.nsi | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index 3b9086f25e..751367570a 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -134,37 +134,43 @@ DeleteRegKey HKCR ${WIRESHARK_ASSOC} DeleteRegKey HKCR "${WIRESHARK_ASSOC}\Shell\open\command" DeleteRegKey HKCR "${WIRESHARK_ASSOC}\DefaultIcon" +Delete "$INSTDIR\*.dll" +Delete "$INSTDIR\*.exe" +Delete "$INSTDIR\*.html" +Delete "$INSTDIR\*.qm" +Delete "$INSTDIR\accessible\*.*" +Delete "$INSTDIR\AUTHORS-SHORT" +Delete "$INSTDIR\COPYING*" +Delete "$INSTDIR\diameter\*.*" Delete "$INSTDIR\etc\gtk-2.0\*.*" Delete "$INSTDIR\etc\gtk-3.0\*.*" Delete "$INSTDIR\etc\pango\*.*" +Delete "$INSTDIR\help\*.*" +Delete "$INSTDIR\iconengines\*.*" +Delete "$INSTDIR\imageformats\*.*" +Delete "$INSTDIR\lib\gtk-2.0\2.10.0\engines\*.*" +Delete "$INSTDIR\lib\gtk-2.0\2.10.0\immodules\*.*" +Delete "$INSTDIR\lib\gtk-2.0\2.10.0\loaders\*.*" Delete "$INSTDIR\lib\gtk-2.0\2.2.0\engines\*.*" -Delete "$INSTDIR\lib\gtk-2.0\2.2.0\loaders\*.*" Delete "$INSTDIR\lib\gtk-2.0\2.2.0\immodules\*.*" +Delete "$INSTDIR\lib\gtk-2.0\2.2.0\loaders\*.*" Delete "$INSTDIR\lib\gtk-2.0\2.4.0\engines\*.*" -Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\*.*" Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\*.*" -Delete "$INSTDIR\lib\gtk-2.0\2.10.0\engines\*.*" -Delete "$INSTDIR\lib\gtk-2.0\2.10.0\loaders\*.*" -Delete "$INSTDIR\lib\gtk-2.0\2.10.0\immodules\*.*" +Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\*.*" 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\share\themes\Default\gtk-2.0\*.*" +Delete "$INSTDIR\platforms\*.*" +Delete "$INSTDIR\printsupport\*.*" Delete "$INSTDIR\share\glib-2.0\schemas\*.*" -Delete "$INSTDIR\help\*.*" -Delete "$INSTDIR\diameter\*.*" -Delete "$INSTDIR\snmp\mibs\*.*" +Delete "$INSTDIR\share\themes\Default\gtk-2.0\*.*" Delete "$INSTDIR\snmp\*.*" +Delete "$INSTDIR\snmp\mibs\*.*" Delete "$INSTDIR\tpncp\*.*" Delete "$INSTDIR\ui\*.*" Delete "$INSTDIR\wimaxasncp\*.*" -Delete "$INSTDIR\*.exe" -Delete "$INSTDIR\*.dll" -Delete "$INSTDIR\*.html" Delete "$INSTDIR\ws.css" -Delete "$INSTDIR\COPYING*" -Delete "$INSTDIR\AUTHORS-SHORT" ; previous versions installed these files Delete "$INSTDIR\*.manifest" ; previous versions installed this file |