diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2017-03-21 07:10:11 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2017-03-21 07:10:11 -0700 |
| commit | 0f245dea042f7443e9208ef7106da716a44539c5 (patch) | |
| tree | 75cb94a32d6c8a055e2c0bbef7da1f4d5882837f /indra/newview/viewer_manifest.py | |
| parent | 4992654682255a6cace1c5ee86b4b8bf28fde15d (diff) | |
| parent | 71ffed27c77e787cafe04ddf19df27495255cae5 (diff) | |
pull from V64 gate
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 859ca8f9d6..af97bb4728 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -468,6 +468,7 @@ class WindowsManifest(ViewerManifest): # CEF runtime files - debug if self.args['configuration'].lower() == 'debug': if self.prefix(src=os.path.join(os.pardir, 'packages', 'bin', 'debug'), dst="llplugin"): + self.path("chrome_elf.dll") self.path("d3dcompiler_43.dll") self.path("d3dcompiler_47.dll") self.path("libcef.dll") @@ -481,6 +482,7 @@ class WindowsManifest(ViewerManifest): else: # CEF runtime files - not debug (release, relwithdebinfo etc.) if self.prefix(src=os.path.join(os.pardir, 'packages', 'bin', 'release'), dst="llplugin"): + self.path("chrome_elf.dll") self.path("d3dcompiler_43.dll") self.path("d3dcompiler_47.dll") self.path("libcef.dll") @@ -919,11 +921,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 @@ -948,6 +948,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 |