aboutsummaryrefslogtreecommitdiffstats
path: root/packaging/wix
AgeCommit message (Collapse)AuthorFilesLines
2016-11-30Fix the build when a different version of Qt is in PATHРоман Донченко1-1/+1
When we add our Qt to PATH, prepend it so that it will be found first. Change-Id: I405496d6a08d676b5a2e0d9bd792de7ba9abe7f9 Reviewed-on: https://code.wireshark.org/review/18988 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-10-22Add SBC decoding support to WindowsPascal Quantin1-2/+2
Change-Id: Ibef872dff26c22e2834e958c496c33a5695bb131 Reviewed-on: https://code.wireshark.org/review/18394 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-18CQL: add LZ4/Snappy decompression support on WindowsPascal Quantin1-2/+4
Change-Id: I34374cf29357e2ed5062da1a5245b9adbabf732d Reviewed-on: https://code.wireshark.org/review/18249 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-10-13Remove nghttp2 code and use system' nghttp2Balint Reczey1-4/+4
Update debian, macos (setup / homebrew) download script Update testsuite (don't try HPACK when build without nghttp2) Change-Id: I365e5e17bc4fab4acd81b4c39ea7189a5d1ee112 Reviewed-on: https://code.wireshark.org/review/17347 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> 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-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-24WiX: Disable desktop icon and shortcut checkboxes.Gerald Combs2-8/+31
Enable and disable the Wireshark and Wireshark-gtk desktop icon and shortcut checkboxes depending on our feature selections to match the NSIS installer behavior (and make sense). Set the level of "Fe.WiresharkGTK" to 2 so that it's disabled by default. This roughly matches the behavior of the NSIS installer. Note that we can't enable or disable radio buttons. Change-Id: I1c73f901344e21bd62e67890ce544f644c0cdda6 Reviewed-on: https://code.wireshark.org/review/17898 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-09-22WiX: Fix condition logic.Gerald Combs1-24/+16
The condition expressions in g630b646 were incorrect. Fix them. This also lets us make the error messages more verbose, so do so. Add a hint about debugging. Change-Id: I74d4b9cfb1bc9afb23be4d61ac190f90e7048745 Reviewed-on: https://code.wireshark.org/review/17849 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-09-19WiX: add SSHdump, Ciscodump and UDPdump to installerPascal Quantin2-7/+50
Change-Id: Iae2a222db8e9359fd8440b59f43ec90c3b7f8243 Reviewed-on: https://code.wireshark.org/review/17747 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-19WiX: Add NSIS installer checks.Gerald Combs2-2/+73
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 Combs4-3/+12
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-09-07Autotools: Distribute packaging/wix.Gerald Combs1-0/+22
…otherwise you can't compile from the tarball on Windows. Change-Id: I99c73b09d9468f0da753c05451fa54348680963f Reviewed-on: https://code.wireshark.org/review/17543 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-08-03Update USBPcap installer packaged in our Windows installerPascal Quantin1-1/+1
This new version contains kernel drivers with an EV certificate that is cross-signed by Microsoft as it will become mandatory. See https://blogs.msdn.microsoft.com/windows_hardware_certification/2016/07/26/driver-signing-changes-in-windows-10-version-1607/ for details. Change-Id: I76bb1005ea540f39dca8874abb88d71a3ad53625 Reviewed-on: https://code.wireshark.org/review/16862 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-29WiX: Set the "Programs and Features" icon.Gerald Combs3-6/+10
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-07-29Give the WiX installer a full name.Gerald Combs1-1/+2
Append the platform and version to the WiX installer name similar to our other installers. Change-Id: Idb3e7917dda3a8e831062538d3e7d1b1c8b78d42 Reviewed-on: https://code.wireshark.org/review/16757 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-05extcap: Remove g_spawn_helper supportRoland Knall1-8/+0
Move g_spawn to separate file and implement functions to use Windows based method of spawning, instead of the glib based version Change-Id: Ibae03d834ec86531eba37dc8768fbf17ddadf57f Reviewed-on: https://code.wireshark.org/review/16049 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-06-22Windows: rename wiretap-${PROJECT_VERSION}.dll to libwiretap.dllPascal Quantin2-4/+1
This aligns the name with what is done for other Wireshark shared libraries. Moreover it allows to compile a wiretap plugin once per major release, without the need to recompile it each time ${PROJECT_VERSION} changes (each nightly build / official release). Change-Id: I53c82277223a4f323079cf695168ac85c2fba523 Reviewed-on: https://code.wireshark.org/review/16058 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-15Remove Nmake build systemPascal Quantin1-2/+1
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-06-14Don't register Wireshark for .pfx (IPFIX) files.Jeff Morriss1-18/+0
(As pointed out by Gerald) .pfx files are (more commonly) PKCS#12 files. People may be upset if we start grabbing them. Change-Id: Iecf857d082b7f2a0ad4fdd1a932332fc3c9d9498 Reviewed-on: https://code.wireshark.org/review/15886 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-06-01Create unique GUIDs for recently added file associations.Michael Mann1-3/+3
Change-Id: Ia07cb14995c3f06d8a32330209bb17fde344350a Reviewed-on: https://code.wireshark.org/review/15688 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-06-01Register a few more file extensions as belonging to Wireshark.Jeff Morriss1-0/+54
Register Wireshark for PacketLogger, ERF, IPFIX, and VWR files on freedesktop.org, OS X, and Windows (we were already registered for ERF and VWR files on Windows). Change-Id: I8105997cb15ea06e1c078489fd88763d4ce9e40c Reviewed-on: https://code.wireshark.org/review/15635 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-05-12WiX banner and dialog images.Gerald Combs8-6/+161
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-12Add ${LIBSSH_DLL} for generating Wix component group listMichael Mann1-1/+1
copy/paste error missed ${LIBSSH_DLL} when looping second time. Change-Id: Iccb32c0d32b328828e4da13f745fb0bc9bdc16ae Reviewed-on: https://code.wireshark.org/review/15395 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-05-11Create a Wix InstallerMichael Mann15-101/+2707
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>
2016-01-01CPack: WiX updates.Gerald Combs1-0/+101
WiX prefers rich text license files. Add an RTF version of the GPLv2. It was created by converting the "standalone HTML" version of the license at http://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html to RTF using Pandoc 1.11. Start splitting CPackConfig.txt into Win32 and non-Win32 sections. Add a WiX section. Change-Id: Ifcb233053c8a2158f087b69c69de7df869af65aa Reviewed-on: https://code.wireshark.org/review/12980 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-23 13:41:09 +0000