Wireshark-commits: [Wireshark-commits] master 630b646: WiX: Add NSIS installer checks.

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: Mon, 19 Sep 2016 02:50:15 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=630b64613567c268b2b08966707c81d3ec8661a5
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

630b646 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    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@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gilbert Ramirez <gram@xxxxxxxxxxxxxxx>
    

Actions performed:

    from  df2f01a   Add new functions.
    adds  630b646   WiX: Add NSIS installer checks.


Summary of changes:
 packaging/wix/Prerequisites.wxi |   72 +++++++++++++++++++++++++++++++++++++++
 packaging/wix/Wireshark.wxs     |    3 +-
 2 files changed, 73 insertions(+), 2 deletions(-)