Wireshark-commits: [Wireshark-commits] master-3.0 7f4fdb1: NSIS: Fix our extra installer location.

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, 18 Mar 2019 23:47:54 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7f4fdb16629e31b6412806d2b548b47f80a0f799
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

7f4fdb1 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    NSIS: Fix our extra installer location.
    
    We know the native Windows library path early on in the configure
    process. Use it to set the location of the Npcap and USBPcap installers
    instead of trying to derive it from the GLib DLL path.
    
    Change-Id: I02d48e115b374fb6080a7fe8017cba789254d5f1
    Reviewed-on: https://code.wireshark.org/review/32475
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit 3c6ff8cf882a7927cefcffb4ecd6dc8bfc3e814f)
    Reviewed-on: https://code.wireshark.org/review/32476
    

Actions performed:

    from  aa3968d   Windows: Switch to Npcap 0.991.
     add  7f4fdb1   NSIS: Fix our extra installer location.


Summary of changes:
 CMakeLists.txt                | 2 ++
 packaging/nsis/CMakeLists.txt | 7 +------
 packaging/nsis/config.nsh.in  | 2 +-
 packaging/nsis/wireshark.nsi  | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)