From bdecc9cce982ab35ce1d74444515f536e66d4356 Mon Sep 17 00:00:00 2001
From: "callum@lindenlab.com" <callum@lindenlab.com>
Date: Wed, 15 Mar 2017 16:33:51 -0700
Subject: [PATCH] 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
---
indra/newview/viewer_manifest.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 3dd44fb19e4..3a8cd0c626b 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -867,11 +867,9 @@ def path_optional(src, dst):
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 @@ def path_optional(src, dst):
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
--
GitLab