diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-10-11 20:45:35 +0000 |
---|---|---|
committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-10-11 20:45:35 +0000 |
commit | ea4f5189975b3a8423f75e85bb7be79bae851f96 (patch) | |
tree | 9bcd4cbdb29cd9083862cb081c2a0ec6df3f2efc | |
parent | b34abdc9435e8127c42ca842cd2d5429c45ccc46 (diff) |
Add Qtshark to Windows Installer (NSIS)
Detect if ./wireshark-qt/qtshark.exe is present and add a option to install Qtshark (Experimental), also add a shortcut.
The option to install qtshark is disable by default (for the moment...)
Now qtshark is (normally) available in automated build !
svn path=/trunk/; revision=45485
-rw-r--r-- | packaging/nsis/Makefile.nmake | 5 | ||||
-rwxr-xr-x | packaging/nsis/uninstall.nsi | 7 | ||||
-rw-r--r-- | packaging/nsis/wireshark.nsi | 20 |
3 files changed, 31 insertions, 1 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 7446b9f126..6fedf591f9 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -196,7 +196,10 @@ NSIS_FLAGS=\ /DGEOIP_DIR=$(GEOIP_DIR) \ !ENDIF !IFDEF HHC_DIR - /DHHC_DIR="$(HHC_DIR)" + /DHHC_DIR="$(HHC_DIR)" \ +!ENDIF +!IF EXIST("..\..\wireshark-qt\qtshark.exe") + /DQT_DIR="..\..\wireshark-qt" \ !ENDIF $(STAGING_DIR)\uninstall.exe : $(NSI) diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index 6c59bc9f73..2f603d85b3 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -104,6 +104,12 @@ IfErrors 0 NoTSharkErrorMsg Abort "Please note: tshark.exe could not be removed, it's probably in use! Abort uninstall process!" NoTSharkErrorMsg: +Delete "$INSTDIR\Qtshark.exe" +IfErrors 0 NoQtSharkErrorMsg + MessageBox MB_OK "Please note: qtshark.exe could not be removed, it's probably in use!" IDOK 0 ;skipped if qtshark.exe removed + Abort "Please note: qtshark.exe could not be removed, it's probably in use! Abort uninstall process!" +NoQtSharkErrorMsg: + Delete "$INSTDIR\wireshark.exe" IfErrors 0 NoWiresharkErrorMsg MessageBox MB_OK "Please note: wireshark.exe could not be removed, it's probably in use!" IDOK 0 ;skipped if wireshark.exe removed @@ -167,6 +173,7 @@ Delete "$INSTDIR\radius\*.*" Delete "$INSTDIR\dtds\*.*" Delete "$SMPROGRAMS\Wireshark\*.*" Delete "$SMPROGRAMS\Wireshark.lnk" +Delete "$SMPROGRAMS\Qtshark.lnk" Delete "$DESKTOP\Wireshark.lnk" Delete "$QUICKLAUNCH\Wireshark.lnk" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index b35cf725fc..7822cd0461 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -816,6 +816,23 @@ File "${STAGING_DIR}\tshark.exe" File "..\..\doc\tshark.html" SectionEnd +!ifdef QT_DIR +Section /o "QtShark (Experimental)" SecQtshark +;------------------------------------------- +; by default, QtShark is not installed +SetOutPath $INSTDIR +File "${QT_DIR}\qtshark.exe" +File "${QT_DIR}\QtCore4.dll" +File "${QT_DIR}\QtGui4.dll" +; Disable Qtshark shortcut if Qtshark isn't selected +Push $0 +SectionGetFlags ${SecQtshark} $0 +IntOp $0 $0 & 1 +CreateShortCut "$SMPROGRAMS\Qtshark.lnk" "$INSTDIR\qtshark.exe" "" "$INSTDIR\qtshark.exe" 0 "" "" "The new QtShark Network Protocol Analyzer" +Pop $0 +SectionEnd +!endif + SectionGroup "Plugins / Extensions" SecPluginsGroup Section "Dissector Plugins" SecPlugins @@ -937,6 +954,9 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecWireshark} "${PROGRAM_NAME} is a GUI network protocol analyzer." !endif !insertmacro MUI_DESCRIPTION_TEXT ${SecTShark} "TShark is a text based network protocol analyzer." +!ifdef QT_DIR + !insertmacro MUI_DESCRIPTION_TEXT ${SecQtshark} "Qtshark is a new GUI network protocol analyzer. (Experimental)" +!endif !insertmacro MUI_DESCRIPTION_TEXT ${SecPluginsGroup} "Some plugins and extensions for both Wireshark and TShark." !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "Plugins with some extended dissections." !insertmacro MUI_DESCRIPTION_TEXT ${SecStatsTree} "Plugin for some extended statistics." |