Wireshark-commits: [Wireshark-commits] master aedf6fe: macOS: Fix our plugin path.
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: Wed, 13 Feb 2019 23:55:16 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=aedf6fe1c5f735aa036bec9173f7fb656ce2c95b
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master
Repository: wireshark

Commits:

aedf6fe by Gerald Combs (gerald@xxxxxxxxxxxxx):

    macOS: Fix our plugin path.
    
    In CMake we only used PROJECT_RELEASE_VERSION to construct our plugin
    path, so rename it to PLUGIN_PATH_ID. Use a dash to separate version
    numbers on macOS in order to allow code signing and a period elsewhere.
    
    In the C code we only used VERSION_RELEASE to construct our plugin path,
    so rename it to PLUGIN_PATH_ID.
    
    Change-Id: I02abc591d7857269e8d47b414b61df4b28a25f2d
    Reviewed-on: https://code.wireshark.org/review/32013
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  b3c5fcb   Make some code common between pcap and no-pcap TShark.
     add  aedf6fe   macOS: Fix our plugin path.


Summary of changes:
 CMakeLists.txt                 | 40 +++++++++++++++++++++-------------------
 cmakeconfig.h.in               |  2 +-
 packaging/macosx/osx-app.sh.in |  2 +-
 wsutil/filesystem.c            |  4 ++--
 4 files changed, 25 insertions(+), 23 deletions(-)