diff options
| author | palange <palange@lindenlab.com> | 2009-10-21 17:59:35 -0700 |
|---|---|---|
| committer | palange <palange@lindenlab.com> | 2009-10-21 17:59:35 -0700 |
| commit | 0f121ca6b8d2a8ad14d5f7f613e65aa4ce42a782 (patch) | |
| tree | 929f9f051419f5c199560d0f02d12f423df021e8 | |
| parent | afcccc3b36d96ababe61ca04dc6c9e02f4b20d81 (diff) | |
DEV-41615 DEV-41615 Add symlinks to updater and crash logger app bundles to fix dylib refs.\nllcommon, apr and expat dylibs were missing from the crash logger and updater, instead of shipping extra copies were using relative pathed symlinks to the copies in the Second Life.app/Contents/Resources folder.
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 06eb1e1265..7f3a56425c 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -573,6 +573,24 @@ class DarwinManifest(ViewerManifest): self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app") self.path("../mac_updater/" + self.args['configuration'] + "/mac-updater.app", "mac-updater.app") + # our apps dependencies on shared libs + if dylibs["llcommon"]: + mac_crash_logger_res_path = self.dst_path_of("mac-crash-logger.app/Contents/Resources") + mac_updater_res_path = self.dst_path_of("mac-updater.app/Contents/Resources") + for libfile in ("libllcommon.dylib", + "libapr-1.0.3.7.dylib", + "libaprutil-1.0.3.8.dylib", + "libexpat.0.5.0.dylib"): + target_lib = os.path.join('../../..', libfile) + self.run_command("ln -s %(target)s '%(link)s'" % + {'target': target_lib, + 'link' : os.path.join(mac_crash_logger_res_path, libfile)} + ) + self.run_command("ln -s %(target)s '%(link)s'" % + {'target': target_lib, + 'link' : os.path.join(mac_updater_res_path, libfile)} + ) + # plugin launcher self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin", "SLPlugin") |