Wireshark-commits: [Wireshark-commits] master-3.0 ca3cb8d: Fix directory containing compiled plugin
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 03:05:31 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=ca3cb8d10fad21340962ac5b2299502d6a314600
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-3.0
Repository: wireshark

Commits:

ca3cb8d by Guy Harris (guy@xxxxxxxxxxxx):

    Fix directory containing compiled plugins in macOS.
    
    They weren't getting put in the version-number subdirectory, so the
    plugin loader wasn't finding them.
    
    If that causes problems with codesign, then we need to either
    
    	1) figure out how to make it work with codesign
    
    or
    
    	2) for macOS, not put plugins in a version-number subdirectory
    	   ***AND*** change the plugin loading process not to look for
    	   compiled in a version-number subdirectory.
    
    Change-Id: I58d344b728d05369d35edef4e4e530f10034e930
    Reviewed-on: https://code.wireshark.org/review/32000
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit cacde2ed5d09708949edef51237bfeb6151b3988)
    Reviewed-on: https://code.wireshark.org/review/32001
    

Actions performed:

    from  46ad3d5   MacOS: Fix a path.
     add  ca3cb8d   Fix directory containing compiled plugins in macOS.


Summary of changes:
 CMakeLists.txt                 | 17 +++++++++++------
 packaging/macosx/osx-app.sh.in |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)