Commit Graph

5 Commits

Author SHA1 Message Date
Graham Bloice 59b0d22ec0 Windows: Update target version info
Set the API target level to Win7, along with installer changes
to match.

Change-Id: Icd93964eadf93018c56218e3efdfed10b9f8959a
Reviewed-on: https://code.wireshark.org/review/26218
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2018-03-02 10:53:29 +00:00
Gerald Combs b7f7bee8cf CMake: Set the Windows build target to Vista.
Set NTDDI_VERSION and _WIN32_WINNT to their Vista values so that
ws2tcpip.h will define inet_pton and inet_ntop. Remove the associated
compiler version checks so that everyone is on the same page.

Add breadcrumbs to the various parts of the code where we set a minimum
Windows version.

Change-Id: I83bba5fa1024bfbc02e07b120412807ad259e291
Reviewed-on: https://code.wireshark.org/review/24080
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-26 17:57:28 +00:00
Gerald Combs f87d1ab699 WiX: Fix condition logic.
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-22 00:50:16 +00:00
Gerald Combs 630b646135 WiX: Add NSIS installer checks.
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-19 02:49:53 +00:00
Michael Mann c34996f970 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@netscape.net>
2016-05-11 13:09:17 +00:00