Wireshark-commits: [Wireshark-commits] master-3.0 f6037a1: Don't allow NSIS or WiX installers if we
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 16 Feb 2019 02:53:56 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=f6037a1d26238de551837f099c4126d7e60c703c
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

f6037a1 by Guy Harris (guy@xxxxxxxxxxxx):

    Don't allow NSIS or WiX installers if we aren't building Wireshark.
    
    In both cases, a file used in the process of building the installer is
    generated from the Wireshark binary, so, unless we also arrange not to
    put that file in the installer if Wireshark isn't being built, we can't
    build the installer.
    
    Have ADD_NSIS_PACKAGE_TARGET and ADD_WIX_PACKAGE_TARGET check whether
    we're building Wireshark and fail if we aren't.  That way, *if* we're
    including the NSIS or WiX packages in the build files, we fail if we
    aren't building Wireshark.
    
    Change-Id: Icfe4d2491bd721cdd5fef424e9a7565c4990defa
    Reviewed-on: https://code.wireshark.org/review/32053
    Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 7770ad93e27519fd3fb56d88cc51a8dfc729799a)
    Reviewed-on: https://code.wireshark.org/review/32054
    

Actions performed:

    from  373b36b   html2text: Fix our footnotes.
     add  f6037a1   Don't allow NSIS or WiX installers if we aren't building Wireshark.


Summary of changes:
 packaging/nsis/CMakeLists.txt | 11 +++++++++++
 packaging/wix/CMakeLists.txt  | 11 +++++++++++
 2 files changed, 22 insertions(+)