osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
86,541 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

6 Commits

Author SHA1 Message Date
Gerald Combs dea3d5e5fc CMake: Update our WiX search paths. 2021-12-22 13:07:51 -08:00
Guy Harris 5cf3fd03f1 HTTPS In More Places, update some URLs. 
Change-Id: Ice2e1e2e4d94f6c9da7c651866cfa1a8ac4a31d8
Reviewed-on: https://code.wireshark.org/review/34096
Reviewed-by: Guy Harris <guy@alum.mit.edu>
 2019-07-27 07:55:36 +00:00
Gerald Combs a6652a2778 CMake: Fix the WiX search path. 
Look for WiX executables in $WIX/bin instead of $WIX.

Change-Id: Id55eb8e73403d2beed55d64e9bdc6812308c359f
Reviewed-on: https://code.wireshark.org/review/22423
Reviewed-by: Gerald Combs <gerald@wireshark.org>
 2017-06-27 17:34:22 +00:00
Gerald Combs 7b5e77406d CMake: Update FindWiX. 
The WiX Toolset installer sets the WIX environment variable. Search for
our WiX executables there first.

Change-Id: I5acc9cb369dc2bdbb071d35b5a39498c6db117a3
Reviewed-on: https://code.wireshark.org/review/19096
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-12-05 20:21:23 +00:00
Pascal Quantin 8e1cc70fd5 Fix detection of NSIS/WiX install path when running a win64 CMake 
On x86 system:
System32\cmd.exe
ProgramFiles=C:\Program Files

On x64 system:
System32\cmd.exe
ProgramFiles=C:\Program Files
ProgramFiles(x86)=C:\Program Files (x86)
ProgramW6432=C:\Program Files
Syswow64\cmd.exe
ProgramFiles=C:\Program Files (x86)
ProgramFiles(x86)=C:\Program Files (x86)
ProgramW6432=C:\Program Files

Change-Id: I32d52219366b299f1e8099dc6d7737970dc398dd
Reviewed-on: https://code.wireshark.org/review/16346
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-09 07:22:09 +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