diff options
author | Gerald Combs <gerald@wireshark.org> | 2013-05-01 22:06:49 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2013-05-01 22:06:49 +0000 |
commit | 4b4542045cbf8b4a5104c8deca0f9e9e566c98a8 (patch) | |
tree | 8c27328ad8af5938d1b7833fa6e6cf62e951160a /packaging | |
parent | 6cbb955d00008336a200e39328d55cd6a586e643 (diff) |
Install and uninstall our global profiles.
svn path=/trunk/; revision=49123
Diffstat (limited to 'packaging')
-rwxr-xr-x | packaging/nsis/uninstall.nsi | 7 | ||||
-rw-r--r-- | packaging/nsis/wireshark.nsi | 20 |
2 files changed, 24 insertions, 3 deletions
diff --git a/packaging/nsis/uninstall.nsi b/packaging/nsis/uninstall.nsi index 4b3001a550..349a6e29d1 100755 --- a/packaging/nsis/uninstall.nsi +++ b/packaging/nsis/uninstall.nsi @@ -240,6 +240,12 @@ SectionIn 1 2 RMDir /r "$INSTDIR\plugins" SectionEnd +Section "Un.Profiles" un.SecProfiles +;------------------------------------------- +SectionIn 1 2 +RMDir /r "$INSTDIR\profiles" +SectionEnd + Section "Un.Global Settings" un.SecGlobalSettings ;------------------------------------------- SectionIn 1 2 @@ -288,6 +294,7 @@ SectionEnd !insertmacro MUI_UNFUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_DESCRIPTION_TEXT ${un.SecUinstall} "Uninstall all ${PROGRAM_NAME} components." !insertmacro MUI_DESCRIPTION_TEXT ${un.SecPlugins} "Uninstall all Plugins (even from previous ${PROGRAM_NAME} versions)." + !insertmacro MUI_DESCRIPTION_TEXT ${un.SecProfiles} "Uninstall all global configuration profiles." !insertmacro MUI_DESCRIPTION_TEXT ${un.SecGlobalSettings} "Uninstall global settings like: $INSTDIR\cfilters" !insertmacro MUI_DESCRIPTION_TEXT ${un.SecPersonalSettings} "Uninstall personal settings like your preferences file from your profile: $PROFILE." !insertmacro MUI_DESCRIPTION_TEXT ${un.SecWinPcap} "Call WinPcap's uninstall program." diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 90a27bd716..1c537c54df 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -887,6 +887,14 @@ SetOutPath '$INSTDIR\plugins\${VERSION}' File "${STAGING_DIR}\plugins\${VERSION}\mate.dll" SectionEnd +Section "Configuration Profiles" SecProfiles +;------------------------------------------- +; This should be a function or macro +SetOutPath '$INSTDIR\profiles\Bluetooth' +File "${STAGING_DIR}\profiles\Bluetooth\colorfilters" +SetOutPath '$INSTDIR\profiles\Classic' +File "${STAGING_DIR}\profiles\Classic\colorfilters" +SectionEnd !ifdef SMI_DIR Section "SNMP MIBs" SecMIBs @@ -979,13 +987,18 @@ SectionEnd !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 ${PROGRAM_NAME} and TShark." - !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "Plugins with some extended dissections." - !insertmacro MUI_DESCRIPTION_TEXT ${SecStatsTree} "Plugin for some extended statistics." + + !insertmacro MUI_DESCRIPTION_TEXT ${SecPluginsGroup} "Plugins and extensions for both ${PROGRAM_NAME} and TShark." + !insertmacro MUI_DESCRIPTION_TEXT ${SecPlugins} "Additional protocol dissectors." + !insertmacro MUI_DESCRIPTION_TEXT ${SecStatsTree} "Extended statistics." !insertmacro MUI_DESCRIPTION_TEXT ${SecMate} "Plugin - Meta Analysis and Tracing Engine (Experimental)." + + !insertmacro MUI_DESCRIPTION_TEXT ${SecProfiles} "Configuration profiles" + !ifdef SMI_DIR !insertmacro MUI_DESCRIPTION_TEXT ${SecMIBs} "SNMP MIBs for better SNMP dissection." !endif + !insertmacro MUI_DESCRIPTION_TEXT ${SecToolsGroup} "Additional command line based tools." !insertmacro MUI_DESCRIPTION_TEXT ${SecEditCap} "Editcap is a program that reads a capture file and writes some or all of the packets into another capture file." !insertmacro MUI_DESCRIPTION_TEXT ${SecText2Pcap} "Text2pcap is a program that reads in an ASCII hex dump and writes the data into a libpcap-style capture file." @@ -993,6 +1006,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecReordercap} "Reordercap is a program that copies frames from an input capture to an output capture after sorting by time." !insertmacro MUI_DESCRIPTION_TEXT ${SecCapinfos} "Capinfos is a program that provides information on capture files." !insertmacro MUI_DESCRIPTION_TEXT ${SecRawshark} "Rawshark is a raw packet filter." + !ifdef HHC_DIR !insertmacro MUI_DESCRIPTION_TEXT ${SecUsersGuide} "Install the user's guide, so an internet connection is not required to read the help pages." !endif |