osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Pascal Quantin 2015-03-24 22:44:13 +01:00 committed by Anders Broman
parent 786a7ea42c
commit c94cfad4ae
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packaging/nsis/Makefile.nmake
View File

@ -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

2
packaging/nsis/config.nsh.in
View File

@ -30,6 +30,8 @@
!define USER_GUIDE_DIR "@USER_GUIDE_DIR@"
!define SMI_DIR "@SMI_DIR@"
# Qt
!define QT_DIR "@QT_DIR@"

5
packaging/nsis/uninstall.nsi
View File

@ -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"

2
packaging/nsis/wireshark.nsi
View File

@ -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\*"