Wireshark-commits: [Wireshark-commits] master ec5f578: NSIS: Look for an installed WiX package.

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 13 Sep 2016 21:24:26 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ec5f5780a11ca1e2019f3d5b7bf6a9a64aa0b144
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

ec5f578 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    NSIS: Look for an installed WiX package.
    
    Dig through the registry and look for a WiX / Windows Installer package.
    Offer to uninstall it if we find one.
    
    Change-Id: I513ce4184880571c484461483a3d25e6d90a85e0
    Reviewed-on: https://code.wireshark.org/review/17613
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  aa44e3b   NSIS: Disable GTK+ by default.
    adds  ec5f578   NSIS: Look for an installed WiX package.


Summary of changes:
 packaging/nsis/config.nsh.in |    1 +
 packaging/nsis/wireshark.nsi |   66 +++++++++++++++++++++++++++++++++++++++---
 2 files changed, 63 insertions(+), 4 deletions(-)