aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/wix/Wireshark.wxs
AgeCommit message (Collapse)AuthorFilesLines
2016-09-26WiX: Try to fix development upgrades.Gerald Combs1-1/+11
Try enabling the MajorUpgrade:AllowSameVersionUpgrades attribute. This should keep the .msi packages from installing side by side when only the micro version differs. Change-Id: I37e8971d965ec1909c6baacb55d6a8062b13ff70 Reviewed-on: https://code.wireshark.org/review/17945 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-19WiX: Add NSIS installer checks.Gerald Combs1-2/+1
Look for an existing NSIS installation and cancel the installation if we find one. Add a note about making this process more friendly. Change-Id: Id6ea4d511bc813a38fa834931f5e677d3d6a4319 Reviewed-on: https://code.wireshark.org/review/17702 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gilbert Ramirez <gram@alumni.rice.edu>
2016-09-11WiX: Add a warning and increase compression.Gerald Combs1-3/+6
Note that you should probably uninstall the NSIS package first if it's installed. Set the compression level to "high". Change-Id: I10de8df580f8410fd13cdf414db1b1812a9fcf02 Reviewed-on: https://code.wireshark.org/review/17566 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-29WiX: Set the "Programs and Features" icon.Gerald Combs1-1/+3
Use our normal application icon in "Programs and Features". Change-Id: I480fcd16b9de1b58852ee8fb5226062da8ed7419 Reviewed-on: https://code.wireshark.org/review/16768 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-12WiX banner and dialog images.Gerald Combs1-1/+4
Add initial Wireshark-branded artwork to the WiX installer. Change-Id: I1997023784112890f5366a577ca3b8101be530da Reviewed-on: https://code.wireshark.org/review/15383 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11Create a Wix InstallerMichael Mann1-0/+40
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@netscape.net>