diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-03-24 22:44:13 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-03-25 05:10:37 +0000 |
| commit | c94cfad4ae30e5fd6e7ea77803f5855cbddf5925 (patch) | |
| tree | f2b310f19909c7a12e4dd86e4a4e13da6d7a39af /packaging/nsis | |
| parent | 786a7ea42c6bcfd44f80c258bc44940e6021133f (diff) | |
| download | wireshark-c94cfad4ae30e5fd6e7ea77803f5855cbddf5925.tar.gz | |
Small fixes to Windows installer
- re-add option to install SNMP MIBs
- remove Qt specific folders during uninstall
Change-Id: Idb5889cf164e90f4403435d24ae10e3dfe37fe44
Reviewed-on: https://code.wireshark.org/review/7808
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 1 | ||||
| -rw-r--r-- | packaging/nsis/config.nsh.in | 2 | ||||
| -rwxr-xr-x | packaging/nsis/uninstall.nsi | 5 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 2 |
4 files changed, 9 insertions, 1 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 9e3880e511..26443ed74f 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -110,6 +110,7 @@ config.nsh: config.nsh.in ..\..\config.nmake -e 's/@VCREDIST_EXE@/$(VCREDIST_EXE:\=\\\\)/' \ !ENDIF -e s/@ENABLE_LIBWIRESHARK@/$(ENABLE_LIBWIRESHARK)/ \ + -e 's/@SMI_DIR@/$(SMI_DIR:\=\\\\)/' \ !IFDEF GTK_DIR -e 's/@GTK_DIR@/$(GTK_DIR:\=\\\\)/' \ !ENDIF diff --git a/packaging/nsis/config.nsh.in b/packaging/nsis/config.nsh.in index 0dcc393165..d42667270c 100644 --- a/packaging/nsis/config.nsh.in +++ b/packaging/nsis/config.nsh.in @@ -30,6 +30,8 @@ !define USER_GUIDE_DIR "@USER_GUIDE_DIR@" +!define SMI_DIR "@SMI_DIR@" + # Qt !define QT_DIR "@QT_DIR@" diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index d5d1e242eb..7bb78f42f1 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -198,9 +198,12 @@ Delete "$QUICKLAUNCH\${PROGRAM_NAME}.lnk" Delete "$QUICKLAUNCH\${PROGRAM_NAME_GTK}.lnk" Delete "$QUICKLAUNCH\${PROGRAM_NAME_QT}.lnk" +RMDir "$INSTDIR\accessible" RMDir "$INSTDIR\etc\gtk-2.0" RMDir "$INSTDIR\etc\pango" RMDir "$INSTDIR\etc" +RMDir "$INSTDIR\iconengines" +RMDir "$INSTDIR\imageformats" RMDir "$INSTDIR\lib\gtk-2.0\2.2.0\engines" RMDir "$INSTDIR\lib\gtk-2.0\2.2.0\loaders" RMDir "$INSTDIR\lib\gtk-2.0\2.2.0\immodules" @@ -223,6 +226,8 @@ RMDir "$INSTDIR\lib\pango\1.5.0\modules" RMDir "$INSTDIR\lib\pango\1.5.0" RMDir "$INSTDIR\lib\pango" RMDir "$INSTDIR\lib" +RMDir "$INSTDIR\platforms" +RMDir "$INSTDIR\printsupport" RMDir "$INSTDIR\share\themes\Default\gtk-2.0" RMDir "$INSTDIR\share\themes\Default" RMDir "$INSTDIR\share\themes" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index c7bc3ed501..e24bb2e7e3 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -927,7 +927,7 @@ SectionEnd !ifdef SMI_DIR Section "SNMP MIBs" SecMIBs ;------------------------------------------- -SetOutPath $INSTDIR\snmp\mibs +SetOutPath '$INSTDIR\snmp\mibs' File "${SMI_DIR}\share\mibs\iana\*" File "${SMI_DIR}\share\mibs\ietf\*" File "${SMI_DIR}\share\mibs\irtf\*" |