diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-07-19 15:31:44 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-07-19 15:31:44 -0600 |
| commit | aa322d8eb4341c213a19cef87a887114c1ca278b (patch) | |
| tree | 5ec6c6d42eaca354f58e21b926d9108e43367484 /indra/newview/viewer_manifest.py | |
| parent | 10f84d8244d01728338f1eb20b0b25271fc7db63 (diff) | |
| parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) | |
Merge branch 'master' v 6.4.22 into DRTVWR-541
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index adac7af712..6194328759 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -683,11 +683,6 @@ class WindowsManifest(ViewerManifest): self.path("libvlccore.dll") self.path("plugins/") - # pull in the crash logger from other projects - # tag:"crash-logger" here as a cue to the exporter - self.path(src='../win_crash_logger/%s/windows-crash-logger.exe' % self.args['configuration'], - dst="win_crash_logger.exe") - if not self.is_packaging_viewer(): self.package_file = "copied_deps" @@ -1068,10 +1063,8 @@ class DarwinManifest(ViewerManifest): # our apps executable_path = {} - for app_bld_dir, app in (("mac_crash_logger", "mac-crash-logger.app"), - # plugin launcher - (os.path.join("llplugin", "slplugin"), "SLPlugin.app"), - ): + embedded_apps = [ (os.path.join("llplugin", "slplugin"), "SLPlugin.app") ] + for app_bld_dir, app in embedded_apps: self.path2basename(os.path.join(os.pardir, app_bld_dir, self.args['configuration']), app) |