livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Next part of the 'SL-641 Update CEF -> cef-bin -> Dullahan -> p64_3p-Dullahan -> media_plugin_cef.cpp to current latest version' puzzle - fix @rpath/@executable paths for macOS

meow-7.2.2
callum@lindenlab.com 2017-03-15 16:33:51 -07:00
parent f0b5a263c1
commit bdecc9cce9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/viewer_manifest.py
View File

@ -867,11 +867,9 @@ class DarwinManifest(ViewerManifest):
self.end_prefix()
# the helper app needs to have it's @executable_path modified to point to the
# same location we drop the CEF framework shortcut
helperexecutablepath = self.dst_path_of('SLPlugin.app/Contents/Frameworks/DullahanHelper.app/Contents/MacOS/DullahanHelper')
self.run_command('install_name_tool -change '
'"@executable_path/Chromium Embedded Framework" '
'"@rpath/Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" '
'"@executable_path/Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" "%s"' % helperexecutablepath)
# SLPlugin plugins
@ -896,6 +894,12 @@ class DarwinManifest(ViewerManifest):
self.end_prefix("llplugin")
# do this install_name_tool *after* media plugin is copied over
dylibexecutablepath = self.dst_path_of('llplugin/media_plugin_cef.dylib')
self.run_command('install_name_tool -change '
'"@rpath/Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" '
'"@executable_path/../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" "%s"' % dylibexecutablepath)
self.end_prefix("Resources")
# CEF framework goes inside Second Life.app/Contents/Frameworks