Wireshark · Wireshark-commits: [Wireshark-commits] master 0571d84: Handle both @rpath/ and absolute paths in Qt framework install n

[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=0571d849dfdf54bc7253daf5d36bab9527892b8a
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

0571d84 by Guy Harris (guy@xxxxxxxxxxxx):

    Handle both @rpath/ and absolute paths in Qt framework install names.
    
    When looking for Qt framework dependencies, look for dependencies that
    begin either with @rpath or with the Qt framework directory.
    
    Then, first transform @rpath/ to a path relative to the Qt framework
    directory, and then strip off everything past the framework directory,
    to get the absolute path of the framework directory (not of the
    framework binary - we want to copy the whole framework).
    
    In the loop looking for dependencies on things *other* than Qt
    frameworks, exclude Qt framework references with absolute paths from the
    dependencies we find; they get processed later.  (We already excluded
    those with @rpath paths.)
    
    Change-Id: I1e345a5fb82c758d5c1541693b46cb36d2677fab
    Reviewed-on: https://code.wireshark.org/review/9614
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  c6aa2b5   Don't add rpaths with CMake, either; osx-app.sh will do so.
    adds  0571d84   Handle both @rpath/ and absolute paths in Qt framework install names.


Summary of changes:
 packaging/macosx/osx-app.sh |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)