diff options
Diffstat (limited to '')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 47 | ||||
| -rw-r--r-- | packaging/nsis/InstallMinGW.cmake | 6 | ||||
| -rw-r--r-- | packaging/nsis/NpcapPage.ini | 13 | ||||
| -rw-r--r-- | packaging/nsis/logray-additional-tasks.nsddef | 2 | ||||
| -rw-r--r-- | packaging/nsis/logray-common.nsh | 2 | ||||
| -rw-r--r-- | packaging/nsis/logray-config.nsh.in | 6 | ||||
| -rw-r--r-- | packaging/nsis/logray.nsi | 496 | ||||
| -rw-r--r-- | packaging/nsis/mingw64-qt-mapping.txt | 2 | ||||
| -rw-r--r-- | packaging/nsis/uninstall-logray.nsi | 274 | ||||
| -rw-r--r-- | packaging/nsis/windeployqt-to-nsis.py | 8 | ||||
| -rw-r--r-- | packaging/nsis/wireshark-additional-tasks.nsddef | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark-common.nsh | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark-config.nsh.in | 2 | ||||
| -rw-r--r-- | packaging/nsis/wireshark.nsi | 90 |
14 files changed, 471 insertions, 481 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 5f9043db..e2451a43 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -38,7 +38,6 @@ set(LOGRAY_NSIS_GENERATED_FILES ${LOGRAY_NSIS_GENERATED_FILES} PARENT_SCOPE) set(LOGRAY_NSIS_FILES logray.nsi - uninstall-logray.nsi logray-common.nsh servicelib.nsh NpcapPage.ini @@ -53,7 +52,7 @@ set(LOG_PROGRAM_NAME ${LOG_PROJECT_NAME}) file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}" TOP_SRC_DIR) # STAGING_DIR depends on the build configuration so we pass it # on the command line below. -file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/docbook" DOCBOOK_DIR) +file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/doc" DOC_DIR) set (MMDBRESOLVE_EXE ${MAXMINDDB_FOUND}) # To do: @@ -153,11 +152,11 @@ if (BUILD_wireshark) set(_all_manifest_contents "${_all_manifest_contents}File \"\${STAGING_DIR}\\${_dll}\"\n") endforeach() set(_all_manifest_contents "${_all_manifest_contents}!endif\n") - foreach(_dll ${CARES_DLL} ${PCRE2_RELEASE_DLL} ${GCRYPT_DLLS} + foreach(_dll ${AMRNB_DLL} ${CARES_DLL} ${PCRE2_RELEASE_DLL} ${GCRYPT_DLLS} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLLS} ${LUA_DLL} - ${LZ4_DLL} ${MINIZIP_DLL} ${NGHTTP2_DLL} ${NGHTTP3_DLL} ${SBC_DLL} ${SMI_DLL} + ${LZ4_DLL} ${MINIZIP_DLL} ${MINIZIPNG_DLLS} ${NGHTTP2_DLL} ${NGHTTP3_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLLS} ${WINSPARKLE_DLL} - ${ZLIB_DLL} ${BROTLI_DLLS} ${ZSTD_DLL} ${ILBC_DLL} ${OPUS_DLL} + ${ZLIB_DLL} ${ZLIBNG_DLL} ${BROTLI_DLLS} ${ZSTD_DLL} ${ILBC_DLL} ${OPUS_DLL} ${SPEEXDSP_DLL} # Needed for mmdbresolve ${MAXMINDDB_DLL} @@ -202,11 +201,11 @@ if (BUILD_logray) set(_all_manifest_contents "${_all_manifest_contents}File \"\${STAGING_DIR}\\${_dll}\"\n") endforeach() set(_all_manifest_contents "${_all_manifest_contents}!endif\n") - foreach(_dll ${CARES_DLL} ${PCRE2_RELEASE_DLL} ${GCRYPT_DLLS} + foreach(_dll ${AMRNB_DLL} ${CARES_DLL} ${PCRE2_RELEASE_DLL} ${GCRYPT_DLLS} ${GNUTLS_DLLS} ${KERBEROS_DLLS} ${LIBSSH_DLLS} ${LUA_DLL} - ${LZ4_DLL} ${NGHTTP2_DLL} ${NGHTTP3_DLL} ${SBC_DLL} ${SMI_DLL} ${SNAPPY_DLL} - ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLLS} ${WINSPARKLE_DLL} - ${ZLIB_DLL} ${BROTLI_DLLS} ${ZSTD_DLL} ${ILBC_DLL} ${OPUS_DLL} + ${LZ4_DLL} ${MINIZIP_DLL} ${MINIZIPNG_DLLS} ${NGHTTP2_DLL} ${NGHTTP3_DLL} ${SBC_DLL} ${SMI_DLL} + ${SNAPPY_DLL} ${SPANDSP_DLL} ${BCG729_DLL} ${LIBXML2_DLLS} ${WINSPARKLE_DLL} + ${ZLIB_DLL} ${ZLIBNG_DLL} ${BROTLI_DLLS} ${ZSTD_DLL} ${ILBC_DLL} ${OPUS_DLL} ${SPEEXDSP_DLL} # Needed for mmdbresolve ${MAXMINDDB_DLL} @@ -229,31 +228,6 @@ set(NSIS_OPTIONS PARENT_SCOPE ) -# We want to sign all of the executables that we ship in the official -# installers. This means that uninstall-wireshark.exe must be built -# separately AND that building the installer itself won't overwrite -# uninstall-wireshark.exe -macro( ADD_NSIS_UNINSTALLER_TARGETS ) - set (_nsis_source_dir ${CMAKE_SOURCE_DIR}/packaging/nsis ) - set (_nsis_binary_dir ${CMAKE_BINARY_DIR}/packaging/nsis ) - - # - # XXX - if we're not building Wireshark, we can't build - # anything, so there's nothing to uninstall. - # - if(BUILD_logray) - add_custom_command(OUTPUT ${DATAFILE_DIR}/uninstall-logray.exe - DEPENDS ${_nsis_source_dir}/uninstall-logray.nsi - ${_nsis_source_dir}/logray-common.nsh - COMMAND ${MAKENSIS_EXECUTABLE} ${NSIS_OPTIONS} - uninstall-logray.nsi - COMMAND ${POWERSHELL_COMMAND} "${_nsis_source_dir}/makeUninstall.ps1" ${DATAFILE_DIR}/uninstall_logray_installer.exe - COMMAND ${CMAKE_COMMAND} -E remove ${DATAFILE_DIR}/uninstall_logray_installer.exe - WORKING_DIRECTORY ${_nsis_source_dir} - ) - endif() -endmacro( ADD_NSIS_UNINSTALLER_TARGETS ) - macro( ADD_NSIS_PACKAGE_TARGETS ) set (_nsis_source_dir ${CMAKE_SOURCE_DIR}/packaging/nsis ) set (_nsis_binary_dir ${CMAKE_BINARY_DIR}/packaging/nsis ) @@ -312,8 +286,9 @@ macro( ADD_NSIS_PACKAGE_TARGETS ) DEPENDS ${WIRESHARK_NSIS_FILES} copy_data_files - user_guide_html faq_html + user_guide_html + release_notes_html ) set_target_properties(wireshark_nsis_prep PROPERTIES FOLDER "Packaging" @@ -383,8 +358,6 @@ macro( ADD_NSIS_PACKAGE_TARGETS ) endmacro( ADD_NSIS_PACKAGE_TARGETS ) set(CLEAN_FILES - #NEWS.txt - #user-guide.chm ${DATAFILE_DIR}/uninstall-wireshark.exe wireshark-${VERSION}-${WIRESHARK_TARGET_PLATFORM}.exe wireshark-config.nsh diff --git a/packaging/nsis/InstallMinGW.cmake b/packaging/nsis/InstallMinGW.cmake index effec0bd..820a8527 100644 --- a/packaging/nsis/InstallMinGW.cmake +++ b/packaging/nsis/InstallMinGW.cmake @@ -5,9 +5,9 @@ if(MINGW) # mingw-w64 dlls file(GLOB MINGW_DLLS ${MINGW_BINDIR}/iconv.dll - ${MINGW_BINDIR}/icudata72.dll - ${MINGW_BINDIR}/icui18n72.dll - ${MINGW_BINDIR}/icuuc72.dll + ${MINGW_BINDIR}/icudata[1-9][0-9].dll + ${MINGW_BINDIR}/icui18n[1-9][0-9].dll + ${MINGW_BINDIR}/icuuc[1-9][0-9].dll ${MINGW_BINDIR}/libbrotlicommon.dll ${MINGW_BINDIR}/libbrotlidec.dll ${MINGW_BINDIR}/libbrotlienc.dll diff --git a/packaging/nsis/NpcapPage.ini b/packaging/nsis/NpcapPage.ini index 1b523c7e..6e95ad34 100644 --- a/packaging/nsis/NpcapPage.ini +++ b/packaging/nsis/NpcapPage.ini @@ -70,16 +70,7 @@ Text='net stop npcap' as Administrator before upgrading Npcap, so that it doesn' Type=Link Left=0 Right=290 -Top=112 -Bottom=120 -Text=Get WinPcap -State=https://www.winpcap.org/ - -[Field 10] -Type=Link -Left=0 -Right=290 Top=127 Bottom=135 -Text=Learn more about Npcap and WinPcap -State=https://gitlab.com/wireshark/wireshark/-/wikis/WinPcap +Text=Learn more about Npcap +State=https://wiki.wireshark.org/WinPcap diff --git a/packaging/nsis/logray-additional-tasks.nsddef b/packaging/nsis/logray-additional-tasks.nsddef index 853e9587..1d29f956 100644 --- a/packaging/nsis/logray-additional-tasks.nsddef +++ b/packaging/nsis/logray-additional-tasks.nsddef @@ -7,7 +7,7 @@ Do not edit manually! <Dialog Name="AdditionalTasksPage" Title="Additional Tasks" Subtitle="Create shortcuts and associate file extensions."> <CreateFunctionCustomScript>; Defined in logray.nsi Call InitAdditionalTasksPage</CreateFunctionCustomScript> - <Label Name="ExtensionsLabel" Location="22, 151" Size="372, 52" Text="Extensions include 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, ipfix, lcap, mplog, ntar, out, pcap, pcapng, pklg, pkt, rf5, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, and wpz." TabIndex="0" /> + <Label Name="ExtensionsLabel" Location="22, 151" Size="372, 52" Text="Extensions include 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, ipfix, lcap, mplog, ntar, out, pcap, pcapng, pklg, pkt, rf5, scap, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, and wpz." TabIndex="0" /> <CheckBox Name="AssociateExtensionsCheckBox" Location="22, 126" Size="406, 14" Text="Associate trace file extensions with Logray" TabIndex="1" /> <CheckBox Name="QuickLaunchCheckBox" Location="22, 74" Size="406, 14" Text="Logray Quick Launch Icon" TabIndex="2" /> <CheckBox Name="DesktopIconCheckBox" Location="22, 54" Size="406, 14" Text="Logray Desktop Icon" TabIndex="3" /> diff --git a/packaging/nsis/logray-common.nsh b/packaging/nsis/logray-common.nsh index 4eaacd5c..0f5a02fe 100644 --- a/packaging/nsis/logray-common.nsh +++ b/packaging/nsis/logray-common.nsh @@ -23,7 +23,7 @@ ManifestDPIAware true !define DISPLAY_NAME "${PROGRAM_NAME} ${VERSION} ${WIRESHARK_TARGET_PLATFORM}" Name "${DISPLAY_NAME}" -!define PROGRAM_FULL_NAME "The ${PROGRAM_NAME} Log Analyzer" +!define PROGRAM_FULL_NAME "The ${PROGRAM_NAME} System Call and Log Analyzer" !define PROGRAM_NAME_PATH "${PROGRAM_NAME}.exe" !define UNINSTALLER_NAME "uninstall-logray.exe" diff --git a/packaging/nsis/logray-config.nsh.in b/packaging/nsis/logray-config.nsh.in index b0832722..bb532875 100644 --- a/packaging/nsis/logray-config.nsh.in +++ b/packaging/nsis/logray-config.nsh.in @@ -22,9 +22,11 @@ #cmakedefine MMDBRESOLVE_EXE @MMDBRESOLVE_EXE@ -# Skip the User's Guide until we have one of our own. -#cmakeundefine DOCBOOK_DIR +# Skip the User's Guide and FAQ until we have one of our own. +#cmakeundefine DOC_DIR #cmakedefine SMI_DIR "@SMI_DIR@" #cmakedefine QT_DIR "@QT_DIR@" + +#cmakedefine ENABLE_SIGNED_NSIS diff --git a/packaging/nsis/logray.nsi b/packaging/nsis/logray.nsi index 5aed3b28..8cf9717e 100644 --- a/packaging/nsis/logray.nsi +++ b/packaging/nsis/logray.nsi @@ -54,6 +54,7 @@ Icon "${TOP_SRC_DIR}\resources\icons\lograyinst.ico" ;!addplugindir ".\Plugins" !define MUI_ICON "${TOP_SRC_DIR}\resources\icons\lograyinst.ico" +!define MUI_UNICON "${TOP_SRC_DIR}\resources\icons\lograyinst.ico" BrandingText "Logray${U+00ae} Installer" !define MUI_COMPONENTSPAGE_SMALLDESC @@ -66,9 +67,9 @@ BrandingText "Logray${U+00ae} Installer" ; is usually not associated with an appropriate text editor. We should use extension "txt" ; for a text file or "html" for an html README file. !define MUI_FINISHPAGE_TITLE_3LINES -!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt" -!define MUI_FINISHPAGE_SHOWREADME_TEXT "Show News" -!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED +; !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt" +; !define MUI_FINISHPAGE_SHOWREADME_TEXT "Show News" +; !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED ; NSIS runs as Administrator and will run Logray as Administrator ; if these are enabled. ;!define MUI_FINISHPAGE_RUN "$INSTDIR\${PROGRAM_NAME_PATH}" @@ -109,6 +110,7 @@ Page custom DisplayAdditionalTasksPage LeaveAdditionalTasksPage ; Old Modern 1 UI: https://nsis.sourceforge.io/Docs/Modern%20UI/Readme.html ; To do: Upgrade to the Modern 2 UI: ;ReserveFile "AdditionalTasksPage.ini" + ;ReserveFile "DonatePage.ini" ReserveFile /plugin InstallOptions.dll ; Modern UI 2 / nsDialog pages. @@ -136,8 +138,8 @@ Page custom DisplayAdditionalTasksPage LeaveAdditionalTasksPage SetOutPath $INSTDIR File "${STAGING_DIR}\${EXTCAP_NAME}.html" - SetOutPath $INSTDIR\extcap - File "${STAGING_DIR}\extcap\${EXTCAP_NAME}.exe" + SetOutPath $INSTDIR\extcap\logray + File "${STAGING_DIR}\extcap\logray\${EXTCAP_NAME}.exe" !macroend @@ -242,7 +244,7 @@ Var OLD_INSTDIR Var OLD_DISPLAYNAME Var TMP_UNINSTALLER -; WiX +; WiX - XXX - Remove? Var REGISTRY_BITS Var TMP_PRODUCT_GUID Var WIX_DISPLAYNAME @@ -266,6 +268,13 @@ Function .onInit ${EndIf} !endif + !if ${WIRESHARK_TARGET_PLATFORM} == "arm64" + ${IfNot} ${IsNativeARM64} + MessageBox MB_OK "You're trying to install the Arm64 version of Logray on an x64 system.$\nTry the native x64 installer instead." /SD IDOK + Abort + ${EndIf} + !endif + ; This should match the following: ; - The NTDDI_VERSION and _WIN32_WINNT parts of cmakeconfig.h.in ; - The <compatibility><application> section in image\wireshark.exe.manifest.in @@ -274,7 +283,6 @@ Function .onInit ; Uncomment to test. ; MessageBox MB_OK "You're running Windows $R0." - ${If} ${AtMostWin8.1} ${OrIf} ${AtMostWin2012R2} MessageBox MB_OK \ @@ -282,7 +290,6 @@ ${OrIf} ${AtMostWin2012R2} Quit ${EndIf} -lbl_winversion_supported: !insertmacro IsLograyRunning ; Default control values. @@ -414,6 +421,11 @@ Function DisplayAdditionalTasksPage FunctionEnd !endif +; Function DisplayDonatePage +; !insertmacro MUI_HEADER_TEXT "Your donations keep these releases coming" "Donate today" +; !insertmacro INSTALLOPTIONS_DISPLAY "DonatePage.ini" +; FunctionEnd + ; ============================================================================ ; Installation execution commands ; ============================================================================ @@ -427,7 +439,7 @@ Section "-Required" SetShellVarContext all SetOutPath $INSTDIR -File "${STAGING_DIR}\${UNINSTALLER_NAME}" +WriteUninstaller "$INSTDIR\${UNINSTALLER_NAME}" File "${STAGING_DIR}\libwiretap.dll" File "${STAGING_DIR}\libwireshark.dll" File "${STAGING_DIR}\libwsutil.dll" @@ -435,9 +447,8 @@ File "${STAGING_DIR}\libwsutil.dll" !include logray-manifest.nsh File "${STAGING_DIR}\COPYING.txt" -File "${STAGING_DIR}\NEWS.txt" +; File "${STAGING_DIR}\NEWS.txt" File "${STAGING_DIR}\README.txt" -File "${STAGING_DIR}\README.windows.txt" File "${STAGING_DIR}\wka" File "${STAGING_DIR}\pdml2html.xsl" File "${STAGING_DIR}\ws.css" @@ -482,19 +493,11 @@ ${EndSwitch} Delete "$INSTDIR\${VCREDIST_EXE}" -; global config files - don't overwrite if already existing -;IfFileExists cfilters dont_overwrite_cfilters -File "${STAGING_DIR}\cfilters" -;dont_overwrite_cfilters: -;IfFileExists colorfilters dont_overwrite_colorfilters -File "${STAGING_DIR}\colorfilters" -;dont_overwrite_colorfilters: -;IfFileExists dfilters dont_overwrite_dfilters -File "${STAGING_DIR}\dfilters" -;dont_overwrite_dfilters: -;IfFileExists smi_modules dont_overwrite_smi_modules +; Global config files +File "${TOP_SRC_DIR}\resources\share\logray\colorfilters" +File "${TOP_SRC_DIR}\resources\share\logray\dfilter_buttons" +;File "${TOP_SRC_DIR}\resources\share\logray\dfilters" File "${STAGING_DIR}\smi_modules" -;dont_overwrite_smi_modules: ; @@ -531,6 +534,7 @@ File "${STAGING_DIR}\diameter\sunping.xml" File "${STAGING_DIR}\diameter\Telefonica.xml" File "${STAGING_DIR}\diameter\TGPP.xml" File "${STAGING_DIR}\diameter\TGPP2.xml" +File "${STAGING_DIR}\diameter\Travelping.xml" File "${STAGING_DIR}\diameter\Vodafone.xml" File "${STAGING_DIR}\diameter\VerizonWireless.xml" !include "custom_diameter_xmls.txt" @@ -551,12 +555,15 @@ File "${STAGING_DIR}\radius\dictionary.5x9" File "${STAGING_DIR}\radius\dictionary.acc" File "${STAGING_DIR}\radius\dictionary.acme" File "${STAGING_DIR}\radius\dictionary.actelis" +File "${STAGING_DIR}\radius\dictionary.adtran" +File "${STAGING_DIR}\radius\dictionary.adva" File "${STAGING_DIR}\radius\dictionary.aerohive" File "${STAGING_DIR}\radius\dictionary.airespace" File "${STAGING_DIR}\radius\dictionary.alcatel" File "${STAGING_DIR}\radius\dictionary.alcatel-lucent.aaa" File "${STAGING_DIR}\radius\dictionary.alcatel.esam" File "${STAGING_DIR}\radius\dictionary.alcatel.sr" +File "${STAGING_DIR}\radius\dictionary.alphion" File "${STAGING_DIR}\radius\dictionary.alteon" File "${STAGING_DIR}\radius\dictionary.altiga" File "${STAGING_DIR}\radius\dictionary.alvarion" @@ -565,15 +572,20 @@ File "${STAGING_DIR}\radius\dictionary.apc" File "${STAGING_DIR}\radius\dictionary.aptilo" File "${STAGING_DIR}\radius\dictionary.aptis" File "${STAGING_DIR}\radius\dictionary.arbor" +File "${STAGING_DIR}\radius\dictionary.arista" File "${STAGING_DIR}\radius\dictionary.aruba" File "${STAGING_DIR}\radius\dictionary.ascend" +File "${STAGING_DIR}\radius\dictionary.ascend.illegal" File "${STAGING_DIR}\radius\dictionary.asn" File "${STAGING_DIR}\radius\dictionary.audiocodes" File "${STAGING_DIR}\radius\dictionary.avaya" File "${STAGING_DIR}\radius\dictionary.azaire" File "${STAGING_DIR}\radius\dictionary.bay" File "${STAGING_DIR}\radius\dictionary.bintec" +File "${STAGING_DIR}\radius\dictionary.bigswitch" +File "${STAGING_DIR}\radius\dictionary.bintec" File "${STAGING_DIR}\radius\dictionary.bluecoat" +File "${STAGING_DIR}\radius\dictionary.boingo" File "${STAGING_DIR}\radius\dictionary.bristol" File "${STAGING_DIR}\radius\dictionary.broadsoft" File "${STAGING_DIR}\radius\dictionary.brocade" @@ -581,14 +593,20 @@ File "${STAGING_DIR}\radius\dictionary.bskyb" File "${STAGING_DIR}\radius\dictionary.bt" File "${STAGING_DIR}\radius\dictionary.cablelabs" File "${STAGING_DIR}\radius\dictionary.cabletron" +File "${STAGING_DIR}\radius\dictionary.calix" +File "${STAGING_DIR}\radius\dictionary.cambium" File "${STAGING_DIR}\radius\dictionary.camiant" +File "${STAGING_DIR}\radius\dictionary.centec" +File "${STAGING_DIR}\radius\dictionary.checkpoint" File "${STAGING_DIR}\radius\dictionary.chillispot" +File "${STAGING_DIR}\radius\dictionary.ciena" File "${STAGING_DIR}\radius\dictionary.cisco" File "${STAGING_DIR}\radius\dictionary.cisco.asa" File "${STAGING_DIR}\radius\dictionary.cisco.bbsm" File "${STAGING_DIR}\radius\dictionary.cisco.vpn3000" File "${STAGING_DIR}\radius\dictionary.cisco.vpn5000" File "${STAGING_DIR}\radius\dictionary.citrix" +File "${STAGING_DIR}\radius\dictionary.ckey" File "${STAGING_DIR}\radius\dictionary.clavister" File "${STAGING_DIR}\radius\dictionary.cnergee" File "${STAGING_DIR}\radius\dictionary.colubris" @@ -596,13 +614,14 @@ File "${STAGING_DIR}\radius\dictionary.columbia_university" File "${STAGING_DIR}\radius\dictionary.compat" File "${STAGING_DIR}\radius\dictionary.compatible" File "${STAGING_DIR}\radius\dictionary.cosine" +File "${STAGING_DIR}\radius\dictionary.covaro" File "${STAGING_DIR}\radius\dictionary.dante" File "${STAGING_DIR}\radius\dictionary.dellemc" -File "${STAGING_DIR}\radius\dictionary.dhcp" File "${STAGING_DIR}\radius\dictionary.digium" File "${STAGING_DIR}\radius\dictionary.dlink" File "${STAGING_DIR}\radius\dictionary.dragonwave" File "${STAGING_DIR}\radius\dictionary.efficientip" +File "${STAGING_DIR}\radius\dictionary.eleven" File "${STAGING_DIR}\radius\dictionary.eltex" File "${STAGING_DIR}\radius\dictionary.enterasys" File "${STAGING_DIR}\radius\dictionary.epygi" @@ -610,24 +629,29 @@ File "${STAGING_DIR}\radius\dictionary.equallogic" File "${STAGING_DIR}\radius\dictionary.ericsson" File "${STAGING_DIR}\radius\dictionary.ericsson.ab" File "${STAGING_DIR}\radius\dictionary.ericsson.packet.core.networks" +File "${STAGING_DIR}\radius\dictionary.erx" File "${STAGING_DIR}\radius\dictionary.extreme" File "${STAGING_DIR}\radius\dictionary.f5" File "${STAGING_DIR}\radius\dictionary.fdxtended" +File "${STAGING_DIR}\radius\dictionary.force10" File "${STAGING_DIR}\radius\dictionary.fortinet" File "${STAGING_DIR}\radius\dictionary.foundry" File "${STAGING_DIR}\radius\dictionary.freedhcp" File "${STAGING_DIR}\radius\dictionary.freeradius" +File "${STAGING_DIR}\radius\dictionary.freeradius.evs5" File "${STAGING_DIR}\radius\dictionary.freeradius.internal" File "${STAGING_DIR}\radius\dictionary.freeswitch" File "${STAGING_DIR}\radius\dictionary.gandalf" File "${STAGING_DIR}\radius\dictionary.garderos" File "${STAGING_DIR}\radius\dictionary.gemtek" File "${STAGING_DIR}\radius\dictionary.h3c" +File "${STAGING_DIR}\radius\dictionary.hillstone" File "${STAGING_DIR}\radius\dictionary.hp" File "${STAGING_DIR}\radius\dictionary.huawei" File "${STAGING_DIR}\radius\dictionary.iana" File "${STAGING_DIR}\radius\dictionary.identity_engines" File "${STAGING_DIR}\radius\dictionary.iea" +File "${STAGING_DIR}\radius\dictionary.infinera" File "${STAGING_DIR}\radius\dictionary.infoblox" File "${STAGING_DIR}\radius\dictionary.infonet" File "${STAGING_DIR}\radius\dictionary.ipunplugged" @@ -638,39 +662,50 @@ File "${STAGING_DIR}\radius\dictionary.juniper" File "${STAGING_DIR}\radius\dictionary.karlnet" File "${STAGING_DIR}\radius\dictionary.kineto" File "${STAGING_DIR}\radius\dictionary.lancom" +File "${STAGING_DIR}\radius\dictionary.lantronix" File "${STAGING_DIR}\radius\dictionary.livingston" File "${STAGING_DIR}\radius\dictionary.localweb" File "${STAGING_DIR}\radius\dictionary.lucent" File "${STAGING_DIR}\radius\dictionary.manzara" File "${STAGING_DIR}\radius\dictionary.meinberg" +File "${STAGING_DIR}\radius\dictionary.mellanox" File "${STAGING_DIR}\radius\dictionary.meraki" File "${STAGING_DIR}\radius\dictionary.merit" File "${STAGING_DIR}\radius\dictionary.meru" File "${STAGING_DIR}\radius\dictionary.microsemi" File "${STAGING_DIR}\radius\dictionary.microsoft" File "${STAGING_DIR}\radius\dictionary.mikrotik" +File "${STAGING_DIR}\radius\dictionary.mimosa" File "${STAGING_DIR}\radius\dictionary.motorola" +File "${STAGING_DIR}\radius\dictionary.motorola.illegal" File "${STAGING_DIR}\radius\dictionary.motorola.wimax" File "${STAGING_DIR}\radius\dictionary.navini" +File "${STAGING_DIR}\radius\dictionary.net" +File "${STAGING_DIR}\radius\dictionary.netelastic" File "${STAGING_DIR}\radius\dictionary.netscreen" File "${STAGING_DIR}\radius\dictionary.networkphysics" File "${STAGING_DIR}\radius\dictionary.nexans" +File "${STAGING_DIR}\radius\dictionary.nile" File "${STAGING_DIR}\radius\dictionary.nokia" File "${STAGING_DIR}\radius\dictionary.nokia.conflict" File "${STAGING_DIR}\radius\dictionary.nomadix" File "${STAGING_DIR}\radius\dictionary.nortel" File "${STAGING_DIR}\radius\dictionary.ntua" File "${STAGING_DIR}\radius\dictionary.openser" +File "${STAGING_DIR}\radius\dictionary.openwifi" File "${STAGING_DIR}\radius\dictionary.packeteer" File "${STAGING_DIR}\radius\dictionary.paloalto" File "${STAGING_DIR}\radius\dictionary.patton" File "${STAGING_DIR}\radius\dictionary.perle" +File "${STAGING_DIR}\radius\dictionary.pfsense" +File "${STAGING_DIR}\radius\dictionary.pica8" File "${STAGING_DIR}\radius\dictionary.propel" File "${STAGING_DIR}\radius\dictionary.prosoft" File "${STAGING_DIR}\radius\dictionary.proxim" File "${STAGING_DIR}\radius\dictionary.purewave" File "${STAGING_DIR}\radius\dictionary.quiconnect" File "${STAGING_DIR}\radius\dictionary.quintum" +File "${STAGING_DIR}\radius\dictionary.rcntec" File "${STAGING_DIR}\radius\dictionary.redcreek" File "${STAGING_DIR}\radius\dictionary.rfc2865" File "${STAGING_DIR}\radius\dictionary.rfc2866" @@ -704,6 +739,8 @@ File "${STAGING_DIR}\radius\dictionary.rfc7155" File "${STAGING_DIR}\radius\dictionary.rfc7268" File "${STAGING_DIR}\radius\dictionary.rfc7499" File "${STAGING_DIR}\radius\dictionary.rfc7930" +File "${STAGING_DIR}\radius\dictionary.rfc8045" +File "${STAGING_DIR}\radius\dictionary.rfc8559" File "${STAGING_DIR}\radius\dictionary.riverbed" File "${STAGING_DIR}\radius\dictionary.riverstone" File "${STAGING_DIR}\radius\dictionary.roaringpenguin" @@ -715,7 +752,9 @@ File "${STAGING_DIR}\radius\dictionary.shasta" File "${STAGING_DIR}\radius\dictionary.shiva" File "${STAGING_DIR}\radius\dictionary.siemens" File "${STAGING_DIR}\radius\dictionary.slipstream" +File "${STAGING_DIR}\radius\dictionary.smartsharesystems" File "${STAGING_DIR}\radius\dictionary.sofaware" +File "${STAGING_DIR}\radius\dictionary.softbank" File "${STAGING_DIR}\radius\dictionary.sonicwall" File "${STAGING_DIR}\radius\dictionary.springtide" File "${STAGING_DIR}\radius\dictionary.starent" @@ -725,22 +764,27 @@ File "${STAGING_DIR}\radius\dictionary.symbol" File "${STAGING_DIR}\radius\dictionary.t_systems_nova" File "${STAGING_DIR}\radius\dictionary.telebit" File "${STAGING_DIR}\radius\dictionary.telkom" +File "${STAGING_DIR}\radius\dictionary.telrad" File "${STAGING_DIR}\radius\dictionary.terena" +File "${STAGING_DIR}\radius\dictionary.tplink" File "${STAGING_DIR}\radius\dictionary.trapeze" File "${STAGING_DIR}\radius\dictionary.travelping" +File "${STAGING_DIR}\radius\dictionary.tripplite" File "${STAGING_DIR}\radius\dictionary.tropos" File "${STAGING_DIR}\radius\dictionary.ukerna" File "${STAGING_DIR}\radius\dictionary.unisphere" File "${STAGING_DIR}\radius\dictionary.unix" File "${STAGING_DIR}\radius\dictionary.usr" +File "${STAGING_DIR}\radius\dictionary.usr.illegal" File "${STAGING_DIR}\radius\dictionary.utstarcom" File "${STAGING_DIR}\radius\dictionary.valemount" -File "${STAGING_DIR}\radius\dictionary.versanet" +File "${STAGING_DIR}\radius\dictionary.vasexperts" File "${STAGING_DIR}\radius\dictionary.verizon" -File "${STAGING_DIR}\radius\dictionary.vqp" +File "${STAGING_DIR}\radius\dictionary.versanet" File "${STAGING_DIR}\radius\dictionary.walabi" File "${STAGING_DIR}\radius\dictionary.waverider" File "${STAGING_DIR}\radius\dictionary.wichorus" +File "${STAGING_DIR}\radius\dictionary.wifialliance" File "${STAGING_DIR}\radius\dictionary.wimax" File "${STAGING_DIR}\radius\dictionary.wimax.alvarion" File "${STAGING_DIR}\radius\dictionary.wimax.wichorus" @@ -773,7 +817,7 @@ File "${STAGING_DIR}\dtds\watcherinfo.dtd" SetOutPath $INSTDIR ; Create the extcap directory -CreateDirectory $INSTDIR\extcap +CreateDirectory $INSTDIR\extcap\logray ; ; install the protobuf .proto definitions in the protobuf subdirectory @@ -873,43 +917,35 @@ File "${STAGING_DIR}\tshark.exe" File "${STAGING_DIR}\tshark.html" SectionEnd -SectionGroup "Plugins & Extensions" SecPluginsGroup +Section "-Plugins & Extensions" -Section "Dissector Plugins" SecPlugins ;------------------------------------------- SetOutPath '$INSTDIR\plugins\${MAJOR_VERSION}.${MINOR_VERSION}\epan' File "${STAGING_DIR}\plugins\${MAJOR_VERSION}.${MINOR_VERSION}\epan\falco-bridge.dll" -SetOutPath '$INSTDIR\plugins\${MAJOR_VERSION}.${MINOR_VERSION}\falco' -File "${STAGING_DIR}\plugins\${MAJOR_VERSION}.${MINOR_VERSION}\falco\cloudtrail.dll" +SetOutPath '$INSTDIR\plugins\falco' +File "${STAGING_DIR}\plugins\falco\cloudtrail.dll" !include "custom_plugins.txt" -SectionEnd -Section "Tree Statistics Plugin" SecStatsTree ;------------------------------------------- SetOutPath '$INSTDIR\plugins\${MAJOR_VERSION}.${MINOR_VERSION}\epan' File "${STAGING_DIR}\plugins\${MAJOR_VERSION}.${MINOR_VERSION}\epan\stats_tree.dll" -SectionEnd -Section "Mate - Meta Analysis and Tracing Engine" SecMate ;------------------------------------------- SetOutPath '$INSTDIR\plugins\${MAJOR_VERSION}.${MINOR_VERSION}\epan' File "${STAGING_DIR}\plugins\${MAJOR_VERSION}.${MINOR_VERSION}\epan\mate.dll" -SectionEnd -Section "Configuration Profiles" SecProfiles ;------------------------------------------- ; This should be a function or macro -SetOutPath '$INSTDIR\profiles\Bluetooth' -File "${STAGING_DIR}\profiles\Bluetooth\colorfilters" -File "${STAGING_DIR}\profiles\Bluetooth\preferences" -SetOutPath '$INSTDIR\profiles\Classic' -File "${STAGING_DIR}\profiles\Classic\colorfilters" -SetOutPath '$INSTDIR\profiles\No Reassembly' -File "${STAGING_DIR}\profiles\No Reassembly\preferences" -SectionEnd +SetOutPath '$INSTDIR\profiles\CloudTrail' +File "${TOP_SRC_DIR}\resources\share\logray\profiles\CloudTrail\colorfilters" +; File "${TOP_SRC_DIR}\resources\share\logray\profiles\CloudTrail\preferences" +; SetOutPath '$INSTDIR\profiles\Classic' +; File "${TOP_SRC_DIR}\resources\share\logray\profiles\Classic\colorfilters" +; SetOutPath '$INSTDIR\profiles\No Reassembly' +; File "${TOP_SRC_DIR}\resources\share\logray\profiles\No Reassembly\preferences" + !ifdef SMI_DIR -Section "SNMP MIBs" SecMIBs ;------------------------------------------- SetOutPath '$INSTDIR\snmp\mibs' File "${SMI_DIR}\share\mibs\iana\*" @@ -919,89 +955,75 @@ File "${SMI_DIR}\share\mibs\tubs\*" File "${SMI_DIR}\share\pibs\*" File "${SMI_DIR}\share\yang\*.yang" !include "custom_mibs.txt" -SectionEnd !endif -SectionGroupEnd ; "Plugins / Extensions" - +SetOutPath '$INSTDIR\plugins\${MAJOR_VERSION}.${MINOR_VERSION}\epan' +File "${STAGING_DIR}\plugins\${MAJOR_VERSION}.${MINOR_VERSION}\epan\transum.dll" -SectionGroup "Tools" SecToolsGroup +SetOutPath '$INSTDIR\plugins\${MAJOR_VERSION}.${MINOR_VERSION}\epan' +File "${STAGING_DIR}\plugins\${MAJOR_VERSION}.${MINOR_VERSION}\epan\stats_tree.dll" -Section "Editcap" SecEditcap -;------------------------------------------- -SetOutPath $INSTDIR -File "${STAGING_DIR}\editcap.exe" -File "${STAGING_DIR}\editcap.html" -SectionEnd +SectionEnd ; "Plugins / Extensions" -Section "Text2Pcap" SecText2Pcap -;------------------------------------------- -SetOutPath $INSTDIR -File "${STAGING_DIR}\text2pcap.exe" -File "${STAGING_DIR}\text2pcap.html" -SectionEnd +Section "-Additional command line tools" -Section "Mergecap" SecMergecap -;------------------------------------------- -SetOutPath $INSTDIR -File "${STAGING_DIR}\mergecap.exe" -File "${STAGING_DIR}\mergecap.html" -SectionEnd - -Section "Reordercap" SecReordercap -;------------------------------------------- -SetOutPath $INSTDIR -File "${STAGING_DIR}\reordercap.exe" -File "${STAGING_DIR}\reordercap.html" -SectionEnd - -Section "Capinfos" SecCapinfos -;------------------------------------------- SetOutPath $INSTDIR File "${STAGING_DIR}\capinfos.exe" File "${STAGING_DIR}\capinfos.html" -SectionEnd -Section "Captype" SecCaptype -;------------------------------------------- -SetOutPath $INSTDIR File "${STAGING_DIR}\captype.exe" File "${STAGING_DIR}\captype.html" -SectionEnd -Section /o "Randpkt" SecRandpkt -;------------------------------------------- -SetOutPath $INSTDIR -File "${STAGING_DIR}\randpkt.exe" -File "${STAGING_DIR}\randpkt.html" -SectionEnd +File "${STAGING_DIR}\editcap.exe" +File "${STAGING_DIR}\editcap.html" + +File "${STAGING_DIR}\mergecap.exe" +File "${STAGING_DIR}\mergecap.html" !ifdef MMDBRESOLVE_EXE -Section "MMDBResolve" SecMMDBResolve -;------------------------------------------- -SetOutPath $INSTDIR File "${STAGING_DIR}\mmdbresolve.html" -SetOutPath $INSTDIR File "${STAGING_DIR}\mmdbresolve.exe" -SectionEnd !endif -Section /o "Etwdump" SecEtwdump +File "${STAGING_DIR}\randpkt.exe" +File "${STAGING_DIR}\randpkt.html" + +File "${STAGING_DIR}\rawshark.exe" +File "${STAGING_DIR}\rawshark.html" + +File "${STAGING_DIR}\reordercap.exe" +File "${STAGING_DIR}\reordercap.html" + +File "${STAGING_DIR}\sharkd.exe" +;File "${STAGING_DIR}\sharkd.html" + +File "${STAGING_DIR}\text2pcap.exe" +File "${STAGING_DIR}\text2pcap.html" + +SectionEnd ; "Tools" + +SectionGroup /e "External capture tools (extcap)" SecExtcapGroup + +Section "Falcodump" SecFalcodump ;------------------------------------------- - !insertmacro InstallExtcap "Etwdump" + !insertmacro InstallExtcap "falcodump" SectionEnd -!insertmacro CheckExtrasFlag "Etwdump" +!insertmacro CheckExtrasFlag "falcodump" -SectionGroupEnd ; "Tools" +SectionGroupEnd ; "External Capture (extcap)" -!ifdef DOCBOOK_DIR +Section "-Clear Partial Selected" +!insertmacro ClearSectionFlag ${SecExtcapGroup} ${SF_PSELECTED} +SectionEnd + +!ifdef DOC_DIR Section "Documentation" SecDocumentation ;------------------------------------------- SetOutPath "$INSTDIR\Wireshark User's Guide" -File /r "${DOCBOOK_DIR}\wsug_html_chunked\*.*" +File /r "${DOC_DIR}\wsug_html_chunked\*.*" SetOutPath $INSTDIR -File "${DOCBOOK_DIR}\faq.html" +File "${DOC_DIR}\faq.html" SectionEnd !endif @@ -1017,40 +1039,264 @@ WriteRegDWORD HKEY_LOCAL_MACHINE "${UNINSTALL_PATH}" "EstimatedSize" "$0" SectionEnd ; ============================================================================ +; Section macros +; ============================================================================ +!include "Sections.nsh" + +; ============================================================================ +; Uninstall page configuration +; ============================================================================ +ShowUninstDetails show + +; ============================================================================ +; Functions and macros +; ============================================================================ + +Function un.Disassociate + Push $R0 +!insertmacro PushFileExtensions + + Pop $EXTENSION + ${DoUntil} $EXTENSION == ${FILE_EXTENSION_MARKER} + ReadRegStr $R0 HKCR $EXTENSION "" + StrCmp $R0 ${LOGRAY_ASSOC} un.Disassociate.doDeregister + Goto un.Disassociate.end +un.Disassociate.doDeregister: + ; The extension is associated with Logray so, we must destroy this! + DeleteRegKey HKCR $EXTENSION + DetailPrint "Deregistered file type: $EXTENSION" +un.Disassociate.end: + Pop $EXTENSION + ${Loop} + + Pop $R0 +FunctionEnd + +Section "-Required" +SectionEnd + +!define EXECUTABLE_MARKER "EXECUTABLE_MARKER" +Var EXECUTABLE + +Section "Uninstall" un.SecUinstall +;------------------------------------------- +; +; UnInstall for every user +; +SectionIn 1 2 +SetShellVarContext all + +!insertmacro IsLograyRunning + +Push "${EXECUTABLE_MARKER}" +Push "${PROGRAM_NAME}" +Push "capinfos" +Push "captype" +Push "dftest" +Push "dumpcap" +Push "editcap" +Push "mergecap" +Push "randpkt" +Push "rawshark" +Push "reordercap" +Push "sharkd" +Push "text2pcap" +Push "tshark" + +!ifdef MMDBRESOLVE_EXE +Push "mmdbresolve" +!endif + +Pop $EXECUTABLE +${DoUntil} $EXECUTABLE == ${EXECUTABLE_MARKER} + + ; IsLograyRunning should make sure everything is closed down so we *shouldn't* run + ; into any problems here. + Delete "$INSTDIR\$EXECUTABLE.exe" + IfErrors 0 deletionSuccess + MessageBox MB_OK "$EXECUTABLE.exe could not be removed. Is it in use?" /SD IDOK IDOK 0 + Abort "$EXECUTABLE.exe could not be removed. Aborting the uninstall process." + +deletionSuccess: + Pop $EXECUTABLE + +${Loop} + + +DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PROGRAM_NAME}" +DeleteRegKey HKEY_LOCAL_MACHINE "Software\${PROGRAM_NAME}" +DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${PROGRAM_NAME}.exe" + +Call un.Disassociate + +DeleteRegKey HKCR ${LOGRAY_ASSOC} +DeleteRegKey HKCR "${LOGRAY_ASSOC}\Shell\open\command" +DeleteRegKey HKCR "${LOGRAY_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\audio\*.*" +Delete "$INSTDIR\bearer\*.*" +Delete "$INSTDIR\diameter\*.*" +Delete "$INSTDIR\extcap\logray\falcodump.*" +Delete "$INSTDIR\gpl-2.0-standalone.html" +Delete "$INSTDIR\Acknowledgements.md" +Delete "$INSTDIR\generic\*.*" +Delete "$INSTDIR\help\*.*" +Delete "$INSTDIR\iconengines\*.*" +Delete "$INSTDIR\imageformats\*.*" +Delete "$INSTDIR\mediaservice\*.*" +Delete "$INSTDIR\multimedia\*.*" +Delete "$INSTDIR\networkinformation\*.*" +Delete "$INSTDIR\platforms\*.*" +Delete "$INSTDIR\playlistformats\*.*" +Delete "$INSTDIR\printsupport\*.*" +Delete "$INSTDIR\share\glib-2.0\schemas\*.*" +Delete "$INSTDIR\snmp\*.*" +Delete "$INSTDIR\snmp\mibs\*.*" +Delete "$INSTDIR\styles\translations\*.*" +Delete "$INSTDIR\styles\*.*" +Delete "$INSTDIR\protobuf\*.*" +Delete "$INSTDIR\tls\*.*" +Delete "$INSTDIR\tpncp\*.*" +Delete "$INSTDIR\translations\*.*" +Delete "$INSTDIR\ui\*.*" +Delete "$INSTDIR\wimaxasncp\*.*" +Delete "$INSTDIR\ws.css" +; previous versions installed these files +Delete "$INSTDIR\*.manifest" +; previous versions installed this file +Delete "$INSTDIR\AUTHORS-SHORT-FORMAT" +Delete "$INSTDIR\README*" +Delete "$INSTDIR\manuf" +Delete "$INSTDIR\wka" +Delete "$INSTDIR\services" +Delete "$INSTDIR\pdml2html.xsl" +Delete "$INSTDIR\pcrepattern.3.txt" +Delete "$INSTDIR\example_snmp_users_file" +Delete "$INSTDIR\ipmap.html" +Delete "$INSTDIR\radius\*.*" +Delete "$INSTDIR\dtds\*.*" +Delete "$INSTDIR\browser_sslkeylog.lua" +Delete "$INSTDIR\console.lua" +Delete "$INSTDIR\dtd_gen.lua" +Delete "$INSTDIR\init.lua" +Delete "$INSTDIR\release-notes.html" + +RMDir "$INSTDIR\accessible" +RMDir "$INSTDIR\audio" +RMDir "$INSTDIR\bearer" +RMDir "$INSTDIR\extcap" +RMDir "$INSTDIR\extcap\logray" +RMDir "$INSTDIR\iconengines" +RMDir "$INSTDIR\imageformats" +RMDir "$INSTDIR\mediaservice" +RMDir "$INSTDIR\multimedia" +RMDir "$INSTDIR\networkinformation" +RMDir "$INSTDIR\platforms" +RMDir "$INSTDIR\playlistformats" +RMDir "$INSTDIR\printsupport" +RMDir "$INSTDIR\styles\translations" +RMDir "$INSTDIR\styles" +RMDir "$SMPROGRAMS\${PROGRAM_NAME}" +RMDir "$INSTDIR\help" +RMDir "$INSTDIR\generic" +RMDir /r "$INSTDIR\Wireshark User's Guide" +RMDir "$INSTDIR\diameter" +RMDir "$INSTDIR\snmp\mibs" +RMDir "$INSTDIR\snmp" +RMDir "$INSTDIR\radius" +RMDir "$INSTDIR\dtds" +RMDir "$INSTDIR\protobuf" +RMDir "$INSTDIR\tls" +RMDir "$INSTDIR\tpncp" +RMDir "$INSTDIR\translations" +RMDir "$INSTDIR\ui" +RMDir "$INSTDIR\wimaxasncp" +RMDir "$INSTDIR" + +SectionEnd ; "Uinstall" + +Section "Un.Plugins" un.SecPlugins +;------------------------------------------- +SectionIn 1 2 +;Delete "$INSTDIR\plugins\${VERSION}\*.*" +;Delete "$INSTDIR\plugins\*.*" +;RMDir "$INSTDIR\plugins\${VERSION}" +;RMDir "$INSTDIR\plugins" +RMDir /r "$INSTDIR\plugins" +SectionEnd + +Section "Un.Global Profiles" un.SecProfiles +;------------------------------------------- +SectionIn 1 2 +RMDir /r "$INSTDIR\profiles" +SectionEnd + +Section "Un.Global Settings" un.SecGlobalSettings +;------------------------------------------- +SectionIn 1 2 +Delete "$INSTDIR\colorfilters" +Delete "$INSTDIR\dfilter_buttons" +Delete "$INSTDIR\dfilters" +Delete "$INSTDIR\smi_modules" +RMDir "$INSTDIR" +SectionEnd + +Section /o "Un.Personal Settings" un.SecPersonalSettings +;------------------------------------------- +SectionIn 2 +SetShellVarContext current +Delete "$APPDATA\${PROGRAM_NAME}\*.*" +RMDir "$APPDATA\${PROGRAM_NAME}" +DeleteRegKey HKCU "Software\${PROGRAM_NAME}" +SectionEnd + +Section "-Un.Finally" +;------------------------------------------- +SectionIn 1 2 + +!insertmacro UpdateIcons + +; this test must be done after all other things uninstalled (e.g. Global Settings) +IfFileExists "$INSTDIR" 0 NoFinalErrorMsg + MessageBox MB_OK "Unable to remove $INSTDIR." /SD IDOK IDOK 0 ; skipped if dir doesn't exist +NoFinalErrorMsg: +SectionEnd + +; Sign our installer and uninstaller during compilation. +!ifdef ENABLE_SIGNED_NSIS +!finalize 'sign-logray.bat "%1"' = 0 ; %1 is replaced by the installer exe to be signed. +!uninstfinalize 'sign-logray.bat "%1"' = 0 ; %1 is replaced by the uninstaller exe to be signed. +!endif + +; ============================================================================ ; PLEASE MAKE SURE, THAT THE DESCRIPTIVE TEXT FITS INTO THE DESCRIPTION FIELD! ; ============================================================================ !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !ifdef QT_DIR - !insertmacro MUI_DESCRIPTION_TEXT ${SecLograyQt} "The main network protocol analyzer application." + !insertmacro MUI_DESCRIPTION_TEXT ${SecLograyQt} "The main syscall and log analyzer application." !endif !insertmacro MUI_DESCRIPTION_TEXT ${SecTShark} "Text based network protocol analyzer." - !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 ${SecExtcapGroup} "External Capture Interfaces" + !insertmacro MUI_DESCRIPTION_TEXT ${SecFalcodump} "Provide capture interfaces from Falco plugins." - !insertmacro MUI_DESCRIPTION_TEXT ${SecToolsGroup} "Additional command line based tools." - !insertmacro MUI_DESCRIPTION_TEXT ${SecEtwdump} "Provide ETW reader" - !insertmacro MUI_DESCRIPTION_TEXT ${SecEditCap} "Copy packets to a new file, optionally trimming packets, omitting them, or saving to a different format." - !insertmacro MUI_DESCRIPTION_TEXT ${SecText2Pcap} "Read an ASCII hex dump and write the data into a libpcap-style capture file." - !insertmacro MUI_DESCRIPTION_TEXT ${SecMergecap} "Combine multiple saved capture files into a single output file" - !insertmacro MUI_DESCRIPTION_TEXT ${SecReordercap} "Copy packets to a new file, sorted by time." - !insertmacro MUI_DESCRIPTION_TEXT ${SecCapinfos} "Print information about capture files." - !insertmacro MUI_DESCRIPTION_TEXT ${SecCaptype} "Print the types capture files." - !insertmacro MUI_DESCRIPTION_TEXT ${SecRandpkt} "Random packet generator." - !insertmacro MUI_DESCRIPTION_TEXT ${SecMMDBResolve} "MaxMind Database resolution tool" - -!ifdef DOCBOOK_DIR - !insertmacro MUI_DESCRIPTION_TEXT ${SecDocumentation} "Install an offline copy of the User's Guide and FAQ." -!endif !insertmacro MUI_FUNCTION_DESCRIPTION_END +!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\colorfilters" + !insertmacro MUI_DESCRIPTION_TEXT ${un.SecPersonalSettings} "Uninstall personal settings like your preferences file from your profile: $PROFILE." +!insertmacro MUI_UNFUNCTION_DESCRIPTION_END + ; ============================================================================ ; Callback functions ; ============================================================================ diff --git a/packaging/nsis/mingw64-qt-mapping.txt b/packaging/nsis/mingw64-qt-mapping.txt index 40ca2ef6..71e1288c 100644 --- a/packaging/nsis/mingw64-qt-mapping.txt +++ b/packaging/nsis/mingw64-qt-mapping.txt @@ -24,7 +24,9 @@ "lib/qt6/plugins/multimedia/windowsmediaplugin.dll" "multimedia/windowsmediaplugin.dll" "lib/qt6/plugins/networkinformation/qnetworklistmanager.dll" "networkinformation/qnetworklistmanager.dll" "lib/qt6/plugins/platforms/qwindows.dll" "platforms/qwindows.dll" +# 6.7 renamed QWindowsVistaStylePlugin to QModernWindowsStylePlugin "lib/qt6/plugins/styles/qwindowsvistastyle.dll" "styles/qwindowsvistastyle.dll" +"lib/qt6/plugins/styles/qmodernwindowsstyle.dll" "styles/qmodernwindowsstyle.dll" "lib/qt6/plugins/tls/qcertonlybackend.dll" "tls/qcertonlybackend.dll" "lib/qt6/plugins/tls/qopensslbackend.dll" "tls/qopensslbackend.dll" "lib/qt6/plugins/tls/qschannelbackend.dll" "tls/qschannelbackend.dll" diff --git a/packaging/nsis/uninstall-logray.nsi b/packaging/nsis/uninstall-logray.nsi deleted file mode 100644 index 5a8d440b..00000000 --- a/packaging/nsis/uninstall-logray.nsi +++ /dev/null @@ -1,274 +0,0 @@ -; -; uninstall-logray.nsi -; - -; Create an installer that only writes an uninstaller. -; https://nsis.sourceforge.io/Signing_an_Uninstaller - -!include "logray-common.nsh" -!include 'LogicLib.nsh' -!include x64.nsh -!include "StrFunc.nsh" - -SetCompress off -OutFile "${STAGING_DIR}\uninstall_logray_installer.exe" - -; InstType "un.Default (keep Personal Settings and Npcap)" -InstType "un.All (remove all)" - -; Uninstaller icon -UninstallIcon "..\..\resources\icons\lograyinst.ico" - -!include "MUI.nsh" - -!define MUI_UNICON "..\..\resources\icons\lograyinst.ico" - -; Uninstall stuff (NSIS 2.08: "\r\n" don't work here) -!define MUI_UNCONFIRMPAGE_TEXT_TOP "The following ${PROGRAM_NAME} installation will be removed. Click 'Next' to continue." -; Uninstall stuff (this text isn't used with the MODERN_UI!) -;UninstallText "This will uninstall ${PROGRAM_NAME}.\r\nBefore starting the uninstallation, make sure ${PROGRAM_NAME} is not running.\r\nClick 'Next' to continue." - -!define MUI_UNFINISHPAGE_NOAUTOCLOSE -!define MUI_WELCOMEPAGE_TITLE_3LINES -!define MUI_FINISHPAGE_TITLE_3LINES - -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_COMPONENTS -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - -!insertmacro MUI_LANGUAGE "English" - -; ============================================================================ -; Section macros -; ============================================================================ -!include "Sections.nsh" - -; ============================================================================ -; Uninstall page configuration -; ============================================================================ -ShowUninstDetails show - -; ============================================================================ -; Functions and macros -; ============================================================================ - -Function .onInit - ; MUST be the absolute path to our staging directory. - WriteUninstaller "${STAGING_DIR}\${UNINSTALLER_NAME}" - SetErrorLevel 0 - Quit -FunctionEnd - -Var EXTENSION -Function un.Disassociate - Push $R0 -!insertmacro PushFileExtensions - - Pop $EXTENSION - ${DoUntil} $EXTENSION == ${FILE_EXTENSION_MARKER} - ReadRegStr $R0 HKCR $EXTENSION "" - StrCmp $R0 ${LOGRAY_ASSOC} un.Disassociate.doDeregister - Goto un.Disassociate.end -un.Disassociate.doDeregister: - ; The extension is associated with Logray so, we must destroy this! - DeleteRegKey HKCR $EXTENSION - DetailPrint "Deregistered file type: $EXTENSION" -un.Disassociate.end: - Pop $EXTENSION - ${Loop} - - Pop $R0 -FunctionEnd - -Section "-Required" -SectionEnd - -!define EXECUTABLE_MARKER "EXECUTABLE_MARKER" -Var EXECUTABLE - -Section "Uninstall" un.SecUinstall -;------------------------------------------- -; -; UnInstall for every user -; -SectionIn 1 2 -SetShellVarContext all - -!insertmacro IsLograyRunning - -Push "${EXECUTABLE_MARKER}" -Push "${PROGRAM_NAME}" -Push "capinfos" -Push "captype" -Push "dftest" -Push "dumpcap" -Push "editcap" -Push "mergecap" -Push "reordercap" -Push "text2pcap" - -!ifdef MMDBRESOLVE_EXE -Push "mmdbresolve" -!endif - -Pop $EXECUTABLE -${DoUntil} $EXECUTABLE == ${EXECUTABLE_MARKER} - - ; IsLograyRunning should make sure everything is closed down so we *shouldn't* run - ; into any problems here. - Delete "$INSTDIR\$EXECUTABLE.exe" - IfErrors 0 deletionSuccess - MessageBox MB_OK "$EXECUTABLE.exe could not be removed. Is it in use?" /SD IDOK IDOK 0 - Abort "$EXECUTABLE.exe could not be removed. Aborting the uninstall process." - -deletionSuccess: - Pop $EXECUTABLE - -${Loop} - - -DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PROGRAM_NAME}" -DeleteRegKey HKEY_LOCAL_MACHINE "Software\${PROGRAM_NAME}" -DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\${PROGRAM_NAME}.exe" - -Call un.Disassociate - -DeleteRegKey HKCR ${LOGRAY_ASSOC} -DeleteRegKey HKCR "${LOGRAY_ASSOC}\Shell\open\command" -DeleteRegKey HKCR "${LOGRAY_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\audio\*.*" -Delete "$INSTDIR\bearer\*.*" -Delete "$INSTDIR\diameter\*.*" -Delete "$INSTDIR\gpl-2.0-standalone.html" -Delete "$INSTDIR\Acknowledgements.md" -Delete "$INSTDIR\help\*.*" -Delete "$INSTDIR\iconengines\*.*" -Delete "$INSTDIR\imageformats\*.*" -Delete "$INSTDIR\mediaservice\*.*" -Delete "$INSTDIR\networkinformation\*.*" -Delete "$INSTDIR\platforms\*.*" -Delete "$INSTDIR\playlistformats\*.*" -Delete "$INSTDIR\printsupport\*.*" -Delete "$INSTDIR\share\glib-2.0\schemas\*.*" -Delete "$INSTDIR\snmp\*.*" -Delete "$INSTDIR\snmp\mibs\*.*" -Delete "$INSTDIR\styles\translations\*.*" -Delete "$INSTDIR\styles\*.*" -Delete "$INSTDIR\protobuf\*.*" -Delete "$INSTDIR\tls\*.*" -Delete "$INSTDIR\tpncp\*.*" -Delete "$INSTDIR\translations\*.*" -Delete "$INSTDIR\ui\*.*" -Delete "$INSTDIR\wimaxasncp\*.*" -Delete "$INSTDIR\ws.css" -Delete "$INSTDIR\README*" -Delete "$INSTDIR\NEWS.txt" -Delete "$INSTDIR\manuf" -Delete "$INSTDIR\wka" -Delete "$INSTDIR\services" -Delete "$INSTDIR\pdml2html.xsl" -Delete "$INSTDIR\pcrepattern.3.txt" -Delete "$INSTDIR\example_snmp_users_file" -Delete "$INSTDIR\ipmap.html" -Delete "$INSTDIR\radius\*.*" -Delete "$INSTDIR\dtds\*.*" - -RMDir "$INSTDIR\accessible" -RMDir "$INSTDIR\audio" -RMDir "$INSTDIR\bearer" -RMDir "$INSTDIR\extcap" -RMDir "$INSTDIR\iconengines" -RMDir "$INSTDIR\imageformats" -RMDir "$INSTDIR\mediaservice" -RMDir "$INSTDIR\networkinformation" -RMDir "$INSTDIR\platforms" -RMDir "$INSTDIR\playlistformats" -RMDir "$INSTDIR\printsupport" -RMDir "$INSTDIR\styles\translations" -RMDir "$INSTDIR\styles" -RMDir "$SMPROGRAMS\${PROGRAM_NAME}" -RMDir "$INSTDIR\help" -;RMDir /r "$INSTDIR\Wireshark User's Guide" -RMDir "$INSTDIR\diameter" -RMDir "$INSTDIR\snmp\mibs" -RMDir "$INSTDIR\snmp" -RMDir "$INSTDIR\radius" -RMDir "$INSTDIR\dtds" -RMDir "$INSTDIR\protobuf" -RMDir "$INSTDIR\tpncp" -RMDir "$INSTDIR\tls" -RMDir "$INSTDIR\translations" -RMDir "$INSTDIR\ui" -RMDir "$INSTDIR\wimaxasncp" -RMDir "$INSTDIR" - -SectionEnd ; "Uinstall" - -Section "Un.Plugins" un.SecPlugins -;------------------------------------------- -SectionIn 1 2 -;Delete "$INSTDIR\plugins\${VERSION}\*.*" -;Delete "$INSTDIR\plugins\*.*" -;RMDir "$INSTDIR\plugins\${VERSION}" -;RMDir "$INSTDIR\plugins" -RMDir /r "$INSTDIR\plugins" -SectionEnd - -Section "Un.Global Profiles" un.SecProfiles -;------------------------------------------- -SectionIn 1 2 -RMDir /r "$INSTDIR\profiles" -SectionEnd - -Section "Un.Global Settings" un.SecGlobalSettings -;------------------------------------------- -SectionIn 1 2 -Delete "$INSTDIR\cfilters" -Delete "$INSTDIR\colorfilters" -Delete "$INSTDIR\dfilters" -Delete "$INSTDIR\enterprises.tsv" -Delete "$INSTDIR\init.lua" -Delete "$INSTDIR\console.lua" -Delete "$INSTDIR\dtd_gen.lua" -Delete "$INSTDIR\smi_modules" -RMDir "$INSTDIR" -SectionEnd - -Section /o "Un.Personal Settings" un.SecPersonalSettings -;------------------------------------------- -SectionIn 2 -SetShellVarContext current -Delete "$APPDATA\${PROGRAM_NAME}\*.*" -RMDir "$APPDATA\${PROGRAM_NAME}" -DeleteRegKey HKCU "Software\${PROGRAM_NAME}" -SectionEnd - -Section "-Un.Finally" -;------------------------------------------- -SectionIn 1 2 - -!insertmacro UpdateIcons - -; this test must be done after all other things uninstalled (e.g. Global Settings) -IfFileExists "$INSTDIR" 0 NoFinalErrorMsg - MessageBox MB_OK "Unable to remove $INSTDIR." /SD IDOK IDOK 0 ; skipped if dir doesn't exist -NoFinalErrorMsg: -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_UNFUNCTION_DESCRIPTION_END diff --git a/packaging/nsis/windeployqt-to-nsis.py b/packaging/nsis/windeployqt-to-nsis.py index f3e3e9a5..2063282a 100644 --- a/packaging/nsis/windeployqt-to-nsis.py +++ b/packaging/nsis/windeployqt-to-nsis.py @@ -83,13 +83,19 @@ with open(args.outfile, 'w') as f: if len(rel_path) > 1: base_dir = rel_path[0].strip('"') if base_dir != current_dir: - set_out_path = 'SetOutPath "$INSTDIR\{}"'.format(base_dir) + set_out_path = r'SetOutPath "$INSTDIR\{}"'.format(base_dir) print(set_out_path, file=f) current_dir = base_dir path = path.strip('"') if args.sysroot: path = os.path.join(args.sysroot, path) + if args.mapping and not os.path.isfile(path): + # This hack is because Qt 6.7 renamed QWindowsVistaStylePlugin + # to QModernWindowsStylePlugin. (This explicit mapping because + # windeployqt6 doesn't work well with cross-compiling is + # brittle.) + continue file_path = 'File "{}"'.format(path) print(file_path, file=f) diff --git a/packaging/nsis/wireshark-additional-tasks.nsddef b/packaging/nsis/wireshark-additional-tasks.nsddef index bc128652..7f927daa 100644 --- a/packaging/nsis/wireshark-additional-tasks.nsddef +++ b/packaging/nsis/wireshark-additional-tasks.nsddef @@ -7,7 +7,7 @@ Do not edit manually! <Dialog Name="AdditionalTasksPage" Title="Additional Tasks" Subtitle="Create shortcuts and associate file extensions."> <CreateFunctionCustomScript>; Defined in wireshark.nsi Call InitAdditionalTasksPage</CreateFunctionCustomScript> - <Label Name="ExtensionsLabel" Location="22, 151" Size="372, 52" Text="Extensions include 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, ipfix, lcap, mplog, ntar, out, pcap, pcapng, pklg, pkt, rf5, rtp, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, and wpz." TabIndex="0" /> + <Label Name="ExtensionsLabel" Location="22, 151" Size="372, 52" Text="Extensions include 5vw, acp, apc, atc, bfr, cap, enc, erf, fdc, ipfix, lcap, mplog, ntar, out, pcap, pcapng, pklg, pkt, rf5, rtp, scap, snoop, syc, tpc, tr1, trace, trc, vwr, wpc, and wpz." TabIndex="0" /> <CheckBox Name="AssociateExtensionsCheckBox" Location="22, 126" Size="406, 14" Text="Associate trace file extensions with Wireshark" TabIndex="1" /> <CheckBox Name="QuickLaunchCheckBox" Location="22, 74" Size="406, 14" Text="Wireshark Quick Launch Icon" TabIndex="2" /> <CheckBox Name="DesktopIconCheckBox" Location="22, 54" Size="406, 14" Text="Wireshark Desktop Icon" TabIndex="3" /> diff --git a/packaging/nsis/wireshark-common.nsh b/packaging/nsis/wireshark-common.nsh index 00e31520..4b8b674b 100644 --- a/packaging/nsis/wireshark-common.nsh +++ b/packaging/nsis/wireshark-common.nsh @@ -104,6 +104,7 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache' Push ".tpc" Push ".syc" Push ".snoop" + Push ".scap" Push ".rf5" Push ".pkt" Push ".pklg" @@ -124,6 +125,7 @@ Exec '"$SYSDIR\ie4uinit.exe" -ClearIconCache' Push ".acp" Push ".5vw" Push ".rtp" + Push ".ems" !macroend !macro IsWiresharkRunning diff --git a/packaging/nsis/wireshark-config.nsh.in b/packaging/nsis/wireshark-config.nsh.in index 769f9e7c..075421db 100644 --- a/packaging/nsis/wireshark-config.nsh.in +++ b/packaging/nsis/wireshark-config.nsh.in @@ -30,7 +30,7 @@ #cmakedefine OPUS_FOUND #cmakedefine LIBSSH_FOUND -#cmakedefine DOCBOOK_DIR "@DOCBOOK_DIR@" +#cmakedefine DOC_DIR "@DOC_DIR@" #cmakedefine SMI_DIR "@SMI_DIR@" diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi index 0f2d55dc..45b53918 100644 --- a/packaging/nsis/wireshark.nsi +++ b/packaging/nsis/wireshark.nsi @@ -74,8 +74,8 @@ BrandingText "Wireshark${U+00ae} Installer" ; is usually not associated with an appropriate text editor. We should use extension "txt" ; for a text file or "html" for an html README file. !define MUI_FINISHPAGE_TITLE_3LINES -!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NEWS.txt" -!define MUI_FINISHPAGE_SHOWREADME_TEXT "Show News" +!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\Release Notes.html" +!define MUI_FINISHPAGE_SHOWREADME_TEXT "Open the release notes" !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED ; NSIS runs as Administrator and will run Wireshark as Administrator ; if these are enabled. @@ -168,8 +168,8 @@ Page custom DisplayUSBPcapPage SetOutPath $INSTDIR File "${STAGING_DIR}\${EXTCAP_NAME}.html" - SetOutPath $INSTDIR\extcap - File "${STAGING_DIR}\extcap\${EXTCAP_NAME}.exe" + SetOutPath $INSTDIR\extcap\wireshark + File "${STAGING_DIR}\extcap\wireshark\${EXTCAP_NAME}.exe" !macroend @@ -502,7 +502,7 @@ Function DisplayDonatePage FunctionEnd Function DisplayNpcapPage - !insertmacro MUI_HEADER_TEXT "Packet Capture" "Wireshark requires either Npcap or WinPcap to capture live network data." + !insertmacro MUI_HEADER_TEXT "Packet Capture" "Wireshark requires Npcap to capture live network data." !insertmacro INSTALLOPTIONS_DISPLAY "NpcapPage.ini" FunctionEnd @@ -537,9 +537,7 @@ File "${STAGING_DIR}\libwsutil.dll" !include wireshark-manifest.nsh File "${STAGING_DIR}\COPYING.txt" -File "${STAGING_DIR}\NEWS.txt" File "${STAGING_DIR}\README.txt" -File "${STAGING_DIR}\README.windows.txt" File "${STAGING_DIR}\wka" File "${STAGING_DIR}\pdml2html.xsl" File "${STAGING_DIR}\ws.css" @@ -549,7 +547,7 @@ File "${STAGING_DIR}\dumpcap.exe" File "${STAGING_DIR}\dumpcap.html" File "${STAGING_DIR}\extcap.html" File "${STAGING_DIR}\ipmap.html" -File "${STAGING_DIR}\release-notes.html" +File "/oname=Release Notes.html" "${DOC_DIR}\release-notes.html" !ifdef USE_VCREDIST ; C-runtime redistributable @@ -636,6 +634,7 @@ File "${STAGING_DIR}\diameter\sunping.xml" File "${STAGING_DIR}\diameter\Telefonica.xml" File "${STAGING_DIR}\diameter\TGPP.xml" File "${STAGING_DIR}\diameter\TGPP2.xml" +File "${STAGING_DIR}\diameter\Travelping.xml" File "${STAGING_DIR}\diameter\Vodafone.xml" File "${STAGING_DIR}\diameter\VerizonWireless.xml" !include "custom_diameter_xmls.txt" @@ -656,12 +655,15 @@ File "${STAGING_DIR}\radius\dictionary.5x9" File "${STAGING_DIR}\radius\dictionary.acc" File "${STAGING_DIR}\radius\dictionary.acme" File "${STAGING_DIR}\radius\dictionary.actelis" +File "${STAGING_DIR}\radius\dictionary.adtran" +File "${STAGING_DIR}\radius\dictionary.adva" File "${STAGING_DIR}\radius\dictionary.aerohive" File "${STAGING_DIR}\radius\dictionary.airespace" File "${STAGING_DIR}\radius\dictionary.alcatel" File "${STAGING_DIR}\radius\dictionary.alcatel-lucent.aaa" File "${STAGING_DIR}\radius\dictionary.alcatel.esam" File "${STAGING_DIR}\radius\dictionary.alcatel.sr" +File "${STAGING_DIR}\radius\dictionary.alphion" File "${STAGING_DIR}\radius\dictionary.alteon" File "${STAGING_DIR}\radius\dictionary.altiga" File "${STAGING_DIR}\radius\dictionary.alvarion" @@ -670,15 +672,20 @@ File "${STAGING_DIR}\radius\dictionary.apc" File "${STAGING_DIR}\radius\dictionary.aptilo" File "${STAGING_DIR}\radius\dictionary.aptis" File "${STAGING_DIR}\radius\dictionary.arbor" +File "${STAGING_DIR}\radius\dictionary.arista" File "${STAGING_DIR}\radius\dictionary.aruba" File "${STAGING_DIR}\radius\dictionary.ascend" +File "${STAGING_DIR}\radius\dictionary.ascend.illegal" File "${STAGING_DIR}\radius\dictionary.asn" File "${STAGING_DIR}\radius\dictionary.audiocodes" File "${STAGING_DIR}\radius\dictionary.avaya" File "${STAGING_DIR}\radius\dictionary.azaire" File "${STAGING_DIR}\radius\dictionary.bay" File "${STAGING_DIR}\radius\dictionary.bintec" +File "${STAGING_DIR}\radius\dictionary.bigswitch" +File "${STAGING_DIR}\radius\dictionary.bintec" File "${STAGING_DIR}\radius\dictionary.bluecoat" +File "${STAGING_DIR}\radius\dictionary.boingo" File "${STAGING_DIR}\radius\dictionary.bristol" File "${STAGING_DIR}\radius\dictionary.broadsoft" File "${STAGING_DIR}\radius\dictionary.brocade" @@ -686,14 +693,20 @@ File "${STAGING_DIR}\radius\dictionary.bskyb" File "${STAGING_DIR}\radius\dictionary.bt" File "${STAGING_DIR}\radius\dictionary.cablelabs" File "${STAGING_DIR}\radius\dictionary.cabletron" +File "${STAGING_DIR}\radius\dictionary.calix" +File "${STAGING_DIR}\radius\dictionary.cambium" File "${STAGING_DIR}\radius\dictionary.camiant" +File "${STAGING_DIR}\radius\dictionary.centec" +File "${STAGING_DIR}\radius\dictionary.checkpoint" File "${STAGING_DIR}\radius\dictionary.chillispot" +File "${STAGING_DIR}\radius\dictionary.ciena" File "${STAGING_DIR}\radius\dictionary.cisco" File "${STAGING_DIR}\radius\dictionary.cisco.asa" File "${STAGING_DIR}\radius\dictionary.cisco.bbsm" File "${STAGING_DIR}\radius\dictionary.cisco.vpn3000" File "${STAGING_DIR}\radius\dictionary.cisco.vpn5000" File "${STAGING_DIR}\radius\dictionary.citrix" +File "${STAGING_DIR}\radius\dictionary.ckey" File "${STAGING_DIR}\radius\dictionary.clavister" File "${STAGING_DIR}\radius\dictionary.cnergee" File "${STAGING_DIR}\radius\dictionary.colubris" @@ -701,13 +714,14 @@ File "${STAGING_DIR}\radius\dictionary.columbia_university" File "${STAGING_DIR}\radius\dictionary.compat" File "${STAGING_DIR}\radius\dictionary.compatible" File "${STAGING_DIR}\radius\dictionary.cosine" +File "${STAGING_DIR}\radius\dictionary.covaro" File "${STAGING_DIR}\radius\dictionary.dante" File "${STAGING_DIR}\radius\dictionary.dellemc" -File "${STAGING_DIR}\radius\dictionary.dhcp" File "${STAGING_DIR}\radius\dictionary.digium" File "${STAGING_DIR}\radius\dictionary.dlink" File "${STAGING_DIR}\radius\dictionary.dragonwave" File "${STAGING_DIR}\radius\dictionary.efficientip" +File "${STAGING_DIR}\radius\dictionary.eleven" File "${STAGING_DIR}\radius\dictionary.eltex" File "${STAGING_DIR}\radius\dictionary.enterasys" File "${STAGING_DIR}\radius\dictionary.epygi" @@ -715,24 +729,29 @@ File "${STAGING_DIR}\radius\dictionary.equallogic" File "${STAGING_DIR}\radius\dictionary.ericsson" File "${STAGING_DIR}\radius\dictionary.ericsson.ab" File "${STAGING_DIR}\radius\dictionary.ericsson.packet.core.networks" +File "${STAGING_DIR}\radius\dictionary.erx" File "${STAGING_DIR}\radius\dictionary.extreme" File "${STAGING_DIR}\radius\dictionary.f5" File "${STAGING_DIR}\radius\dictionary.fdxtended" +File "${STAGING_DIR}\radius\dictionary.force10" File "${STAGING_DIR}\radius\dictionary.fortinet" File "${STAGING_DIR}\radius\dictionary.foundry" File "${STAGING_DIR}\radius\dictionary.freedhcp" File "${STAGING_DIR}\radius\dictionary.freeradius" +File "${STAGING_DIR}\radius\dictionary.freeradius.evs5" File "${STAGING_DIR}\radius\dictionary.freeradius.internal" File "${STAGING_DIR}\radius\dictionary.freeswitch" File "${STAGING_DIR}\radius\dictionary.gandalf" File "${STAGING_DIR}\radius\dictionary.garderos" File "${STAGING_DIR}\radius\dictionary.gemtek" File "${STAGING_DIR}\radius\dictionary.h3c" +File "${STAGING_DIR}\radius\dictionary.hillstone" File "${STAGING_DIR}\radius\dictionary.hp" File "${STAGING_DIR}\radius\dictionary.huawei" File "${STAGING_DIR}\radius\dictionary.iana" File "${STAGING_DIR}\radius\dictionary.identity_engines" File "${STAGING_DIR}\radius\dictionary.iea" +File "${STAGING_DIR}\radius\dictionary.infinera" File "${STAGING_DIR}\radius\dictionary.infoblox" File "${STAGING_DIR}\radius\dictionary.infonet" File "${STAGING_DIR}\radius\dictionary.ipunplugged" @@ -743,39 +762,50 @@ File "${STAGING_DIR}\radius\dictionary.juniper" File "${STAGING_DIR}\radius\dictionary.karlnet" File "${STAGING_DIR}\radius\dictionary.kineto" File "${STAGING_DIR}\radius\dictionary.lancom" +File "${STAGING_DIR}\radius\dictionary.lantronix" File "${STAGING_DIR}\radius\dictionary.livingston" File "${STAGING_DIR}\radius\dictionary.localweb" File "${STAGING_DIR}\radius\dictionary.lucent" File "${STAGING_DIR}\radius\dictionary.manzara" File "${STAGING_DIR}\radius\dictionary.meinberg" +File "${STAGING_DIR}\radius\dictionary.mellanox" File "${STAGING_DIR}\radius\dictionary.meraki" File "${STAGING_DIR}\radius\dictionary.merit" File "${STAGING_DIR}\radius\dictionary.meru" File "${STAGING_DIR}\radius\dictionary.microsemi" File "${STAGING_DIR}\radius\dictionary.microsoft" File "${STAGING_DIR}\radius\dictionary.mikrotik" +File "${STAGING_DIR}\radius\dictionary.mimosa" File "${STAGING_DIR}\radius\dictionary.motorola" +File "${STAGING_DIR}\radius\dictionary.motorola.illegal" File "${STAGING_DIR}\radius\dictionary.motorola.wimax" File "${STAGING_DIR}\radius\dictionary.navini" +File "${STAGING_DIR}\radius\dictionary.net" +File "${STAGING_DIR}\radius\dictionary.netelastic" File "${STAGING_DIR}\radius\dictionary.netscreen" File "${STAGING_DIR}\radius\dictionary.networkphysics" File "${STAGING_DIR}\radius\dictionary.nexans" +File "${STAGING_DIR}\radius\dictionary.nile" File "${STAGING_DIR}\radius\dictionary.nokia" File "${STAGING_DIR}\radius\dictionary.nokia.conflict" File "${STAGING_DIR}\radius\dictionary.nomadix" File "${STAGING_DIR}\radius\dictionary.nortel" File "${STAGING_DIR}\radius\dictionary.ntua" File "${STAGING_DIR}\radius\dictionary.openser" +File "${STAGING_DIR}\radius\dictionary.openwifi" File "${STAGING_DIR}\radius\dictionary.packeteer" File "${STAGING_DIR}\radius\dictionary.paloalto" File "${STAGING_DIR}\radius\dictionary.patton" File "${STAGING_DIR}\radius\dictionary.perle" +File "${STAGING_DIR}\radius\dictionary.pfsense" +File "${STAGING_DIR}\radius\dictionary.pica8" File "${STAGING_DIR}\radius\dictionary.propel" File "${STAGING_DIR}\radius\dictionary.prosoft" File "${STAGING_DIR}\radius\dictionary.proxim" File "${STAGING_DIR}\radius\dictionary.purewave" File "${STAGING_DIR}\radius\dictionary.quiconnect" File "${STAGING_DIR}\radius\dictionary.quintum" +File "${STAGING_DIR}\radius\dictionary.rcntec" File "${STAGING_DIR}\radius\dictionary.redcreek" File "${STAGING_DIR}\radius\dictionary.rfc2865" File "${STAGING_DIR}\radius\dictionary.rfc2866" @@ -809,6 +839,8 @@ File "${STAGING_DIR}\radius\dictionary.rfc7155" File "${STAGING_DIR}\radius\dictionary.rfc7268" File "${STAGING_DIR}\radius\dictionary.rfc7499" File "${STAGING_DIR}\radius\dictionary.rfc7930" +File "${STAGING_DIR}\radius\dictionary.rfc8045" +File "${STAGING_DIR}\radius\dictionary.rfc8559" File "${STAGING_DIR}\radius\dictionary.riverbed" File "${STAGING_DIR}\radius\dictionary.riverstone" File "${STAGING_DIR}\radius\dictionary.roaringpenguin" @@ -820,7 +852,9 @@ File "${STAGING_DIR}\radius\dictionary.shasta" File "${STAGING_DIR}\radius\dictionary.shiva" File "${STAGING_DIR}\radius\dictionary.siemens" File "${STAGING_DIR}\radius\dictionary.slipstream" +File "${STAGING_DIR}\radius\dictionary.smartsharesystems" File "${STAGING_DIR}\radius\dictionary.sofaware" +File "${STAGING_DIR}\radius\dictionary.softbank" File "${STAGING_DIR}\radius\dictionary.sonicwall" File "${STAGING_DIR}\radius\dictionary.springtide" File "${STAGING_DIR}\radius\dictionary.starent" @@ -830,22 +864,27 @@ File "${STAGING_DIR}\radius\dictionary.symbol" File "${STAGING_DIR}\radius\dictionary.t_systems_nova" File "${STAGING_DIR}\radius\dictionary.telebit" File "${STAGING_DIR}\radius\dictionary.telkom" +File "${STAGING_DIR}\radius\dictionary.telrad" File "${STAGING_DIR}\radius\dictionary.terena" +File "${STAGING_DIR}\radius\dictionary.tplink" File "${STAGING_DIR}\radius\dictionary.trapeze" File "${STAGING_DIR}\radius\dictionary.travelping" +File "${STAGING_DIR}\radius\dictionary.tripplite" File "${STAGING_DIR}\radius\dictionary.tropos" File "${STAGING_DIR}\radius\dictionary.ukerna" File "${STAGING_DIR}\radius\dictionary.unisphere" File "${STAGING_DIR}\radius\dictionary.unix" File "${STAGING_DIR}\radius\dictionary.usr" +File "${STAGING_DIR}\radius\dictionary.usr.illegal" File "${STAGING_DIR}\radius\dictionary.utstarcom" File "${STAGING_DIR}\radius\dictionary.valemount" -File "${STAGING_DIR}\radius\dictionary.versanet" +File "${STAGING_DIR}\radius\dictionary.vasexperts" File "${STAGING_DIR}\radius\dictionary.verizon" -File "${STAGING_DIR}\radius\dictionary.vqp" +File "${STAGING_DIR}\radius\dictionary.versanet" File "${STAGING_DIR}\radius\dictionary.walabi" File "${STAGING_DIR}\radius\dictionary.waverider" File "${STAGING_DIR}\radius\dictionary.wichorus" +File "${STAGING_DIR}\radius\dictionary.wifialliance" File "${STAGING_DIR}\radius\dictionary.wimax" File "${STAGING_DIR}\radius\dictionary.wimax.alvarion" File "${STAGING_DIR}\radius\dictionary.wimax.wichorus" @@ -878,7 +917,7 @@ File "${STAGING_DIR}\dtds\watcherinfo.dtd" SetOutPath $INSTDIR ; Create the extcap directory -CreateDirectory $INSTDIR\extcap +CreateDirectory $INSTDIR\extcap\wireshark ; ; install the protobuf .proto definitions in the protobuf subdirectory @@ -977,6 +1016,7 @@ ${If} $0 == "0" ${EndIf} ${StrRep} $0 '$USBPCAP_UNINSTALL' 'Uninstall.exe' 'USBPcapCMD.exe' ${StrRep} $1 '$0' '"' '' + SetOutPath $INSTDIR\extcap\wireshark CopyFiles /SILENT $1 $INSTDIR\extcap SetRebootFlag true ${EndIf} @@ -1188,14 +1228,14 @@ Section "-Clear Partial Selected" !insertmacro ClearSectionFlag ${SecExtcapGroup} ${SF_PSELECTED} SectionEnd -!ifdef DOCBOOK_DIR +!ifdef DOC_DIR Section "-Documentation" SetOutPath "$INSTDIR\Wireshark User's Guide" -File /r "${DOCBOOK_DIR}\wsug_html_chunked\*.*" +File /r "${DOC_DIR}\wsug_html_chunked\*.*" SetOutPath $INSTDIR -File "${DOCBOOK_DIR}\faq.html" +File "${DOC_DIR}\faq.html" SectionEnd !endif @@ -1269,7 +1309,7 @@ ${If} $1 != "" DetailPrint "USBPcap uninstaller returned $0" ${If} $0 == "0" Delete "$3\Uninstall.exe" - Delete "$INSTDIR\extcap\USBPcapCMD.exe" + Delete "$INSTDIR\extcap\wireshark\USBPcapCMD.exe" ${EndIf} ${EndIf} ClearErrors @@ -1341,13 +1381,13 @@ Delete "$INSTDIR\COPYING*" Delete "$INSTDIR\audio\*.*" Delete "$INSTDIR\bearer\*.*" Delete "$INSTDIR\diameter\*.*" -Delete "$INSTDIR\extcap\androiddump.*" -Delete "$INSTDIR\extcap\ciscodump.*" -Delete "$INSTDIR\extcap\etwdump.*" -Delete "$INSTDIR\extcap\randpktdump.*" -Delete "$INSTDIR\extcap\sshdump.*" -Delete "$INSTDIR\extcap\udpdump.*" -Delete "$INSTDIR\extcap\wifidump.*" +Delete "$INSTDIR\extcap\wireshark\androiddump.*" +Delete "$INSTDIR\extcap\wireshark\ciscodump.*" +Delete "$INSTDIR\extcap\wireshark\etwdump.*" +Delete "$INSTDIR\extcap\wireshark\randpktdump.*" +Delete "$INSTDIR\extcap\wireshark\sshdump.*" +Delete "$INSTDIR\extcap\wireshark\udpdump.*" +Delete "$INSTDIR\extcap\wireshark\wifidump.*" Delete "$INSTDIR\gpl-2.0-standalone.html" Delete "$INSTDIR\Acknowledgements.md" Delete "$INSTDIR\generic\*.*" @@ -1393,10 +1433,12 @@ Delete "$INSTDIR\console.lua" Delete "$INSTDIR\dtd_gen.lua" Delete "$INSTDIR\init.lua" Delete "$INSTDIR\release-notes.html" +Delete "$INSTDIR\Release Notes.html" RMDir "$INSTDIR\accessible" RMDir "$INSTDIR\audio" RMDir "$INSTDIR\bearer" +RMDir "$INSTDIR\extcap\wireshark" RMDir "$INSTDIR\extcap" RMDir "$INSTDIR\iconengines" RMDir "$INSTDIR\imageformats" @@ -1524,7 +1566,7 @@ SectionEnd !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.SecPersonalSettings} "Delete personal configuration folder: $APPDATA\${PROGRAM_NAME}." !insertmacro MUI_DESCRIPTION_TEXT ${un.SecNpcap} "Call Npcap's uninstall program." !insertmacro MUI_DESCRIPTION_TEXT ${un.SecUSBPcap} "Call USBPcap's uninstall program." !insertmacro MUI_UNFUNCTION_DESCRIPTION_END |