Wireshark-commits: [Wireshark-commits] master 97cb389: Revert "CMake: Don't install HTML manuals tw
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: Thu, 10 Oct 2019 15:58:48 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=97cb389a3531269b3c86555156a2bba62ccfd8a5
Submitter: "João Valverde <j@xxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

97cb389 by João Valverde (j@xxxxxx):

    Revert "CMake: Don't install HTML manuals twice"
    
    This reverts commit f1285fcf061669702ca1accd7b2c50ebc8198993.
    
    NSIS package is broken with this commit.
    
    Change-Id: Ief22a308edad188fa2d5fab79355f19493359fa6
    Reviewed-on: https://code.wireshark.org/review/34758
    Petri-Dish: João Valverde <j@xxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: João Valverde <j@xxxxxx>
    

Actions performed:

    from  51fbc71   NAS-5GS: In IE Service area list, present num elements(+1).
     add  97cb389   Revert "CMake: Don't install HTML manuals twice"


Summary of changes:
 CMakeLists.txt                    | 36 ++++++++++++++++++++++++++++++++++++
 cmake/modules/CopyStaging.cmake   | 37 -------------------------------------
 debian/libwsutil0.symbols         |  3 +--
 doc/CMakeLists.txt                | 26 --------------------------
 extcap/androiddump.c              |  2 +-
 extcap/ciscodump.c                |  2 +-
 extcap/randpktdump.c              |  2 +-
 extcap/sdjournal.c                |  2 +-
 extcap/sshdump.c                  |  2 +-
 extcap/udpdump.c                  |  2 +-
 packaging/nsis/wireshark.nsi      | 38 +++++++++++++++++++-------------------
 packaging/wix/ComponentGroups.wxi | 38 +++++++++++++++++++-------------------
 ui/help_url.c                     | 22 +++++++++++-----------
 wsutil/CMakeLists.txt             |  1 -
 wsutil/filesystem.c               | 33 ++-------------------------------
 wsutil/filesystem.h               | 13 ++++---------
 16 files changed, 98 insertions(+), 161 deletions(-)
 delete mode 100644 cmake/modules/CopyStaging.cmake