diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-06-17 11:15:18 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2017-06-27 17:34:42 +0000 |
| commit | cd635206f039680aca8311c1514f1d44232ee3a1 (patch) | |
| tree | e50db02b6bce46805f15478925fe67870edda6a6 /packaging/wix/README | |
| parent | 89431bce5373fec79aea03bef9fa25908d92f7f4 (diff) | |
| download | wireshark-cd635206f039680aca8311c1514f1d44232ee3a1.tar.gz | |
WiX: Fixup merge module configuration.
Set the merge module path based on our platform and version of Visual
Studio.
Change-Id: Ic866447f36d5264d61fc988f3f9d8b4d2e5c0827
Reviewed-on: https://code.wireshark.org/review/22192
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>
(cherry picked from commit c89f4c628c315e8f472653856a0776469c65f34e)
Reviewed-on: https://code.wireshark.org/review/22424
Diffstat (limited to 'packaging/wix/README')
| -rw-r--r-- | packaging/wix/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packaging/wix/README b/packaging/wix/README index e851082aeb..e800ed62fa 100644 --- a/packaging/wix/README +++ b/packaging/wix/README @@ -23,7 +23,7 @@ currently come as NSIS installers and it seems it would make more sense to "bund with WiX rather than include them as part of the Wireshark.msi. 2. Needs more flexible handling of VC CRT Merge module (need build script to provide appropriate macros). Something like (or modifying existing) FindMSVC_REDIST.cmake. -Currently only VS2013 CRT120 is supported. +Currently only VS2013 / CRT120 and VS 2015 / CRT140 are supported. 3. Uninstalling previous versions. NSIS installer did things more "manually" than Wix does by default. Need to merge as best as possible to handle backwards compatibility. The .msi architecture uses an "UpgradeCode" help facilitate install/uninstall/upgrade and NSIS |