Wireshark-commits: [Wireshark-commits] master c34996f: Create a Wix Installer
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 11 May 2016 13:09:34 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c34996f970ab003bb8566825b38834de00f5159e Submitter: Michael Mann (mmann78@xxxxxxxxxxxx) Changed: branch: master Repository: wireshark Commits: c34996f by Michael Mann (mmann78@xxxxxxxxxxxx): Create a Wix Installer This is intended to replace the NSIS installer for Windows. It does not include installing WinPcap or USBPcap. From the research I've done, it seems to make more sense to "bundle" them with Wix ("wrapper" installer that would include Wireshark, WinPcap and USBPcap installers together) TODO: 1. Customize installer with Wireshark graphics 2. Better handling flexibility of installing VC CRT Merge module (need build script to provide appropriate macros). Something like (or modifying existing) FindMSVC_REDIST.cmake. 3. Use Wireshark UpgradeProductCode for install/uninstall. Previous NSIS installer did not have an upgrade code, so there are some backwards compatibility concerns. 4. Uninstall considerations (removing whole directories - plugins, configuration profiles?). NSIS needed to do more things "manually" than Wix does by default. Need to merge as best as possible to handle backwards compatibility. Many thanks to Brian Pratt for all the Wix help. Change-Id: Ib50780214fc7707ba2a46fd96ba8797a1763fa0c Reviewed-on: https://code.wireshark.org/review/14858 Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx> Actions performed: from 980f58b Create IEC401 source TCP port preference. adds c34996f Create a Wix Installer Summary of changes: CMakeLists.txt | 16 + cmake/modules/FindWiX.cmake | 24 + packaging/wix/CMakeLists.txt | 413 +++++++++++++ COPYING => packaging/wix/COPYING.rtf | 1043 +++++++++++++++++---------------- packaging/wix/ComponentGroups.wxi | 1008 +++++++++++++++++++++++++++++++ packaging/wix/DirectoryStructure.wxi | 58 ++ packaging/wix/Features.wxi | 102 ++++ packaging/wix/InputPaths.wxi | 27 + packaging/wix/Plugins.wxi | 88 +++ packaging/wix/Prerequisites.wxi | 30 + packaging/wix/README | 36 ++ packaging/wix/UserInterface.wxi | 16 + packaging/wix/Wireshark.wxs | 40 ++ packaging/wix/WiresharkOptionsDlg.wxs | 39 ++ packaging/wix/WiresharkWixUI.wxs | 86 +++ packaging/wix/gpl-2.0.rtf | 101 ---- packaging/wix/windeployqt-to-wix.ps1 | 240 ++++++++ 17 files changed, 2747 insertions(+), 620 deletions(-) create mode 100644 cmake/modules/FindWiX.cmake create mode 100644 packaging/wix/CMakeLists.txt copy COPYING => packaging/wix/COPYING.rtf (67%) create mode 100644 packaging/wix/ComponentGroups.wxi create mode 100644 packaging/wix/DirectoryStructure.wxi create mode 100644 packaging/wix/Features.wxi create mode 100644 packaging/wix/InputPaths.wxi create mode 100644 packaging/wix/Plugins.wxi create mode 100644 packaging/wix/Prerequisites.wxi create mode 100644 packaging/wix/README create mode 100644 packaging/wix/UserInterface.wxi create mode 100644 packaging/wix/Wireshark.wxs create mode 100644 packaging/wix/WiresharkOptionsDlg.wxs create mode 100644 packaging/wix/WiresharkWixUI.wxs delete mode 100644 packaging/wix/gpl-2.0.rtf create mode 100644 packaging/wix/windeployqt-to-wix.ps1
- Prev by Date: [Wireshark-commits] master 980f58b: Create IEC401 source TCP port preference.
- Next by Date: [Wireshark-commits] master 62ccbc9: Fixed value for experimental result code 5142
- Previous by thread: [Wireshark-commits] master 980f58b: Create IEC401 source TCP port preference.
- Next by thread: [Wireshark-commits] master 62ccbc9: Fixed value for experimental result code 5142
- Index(es):