diff options
| author | palange <palange@lindenlab.com> | 2009-10-21 18:06:25 -0700 |
|---|---|---|
| committer | palange <palange@lindenlab.com> | 2009-10-21 18:06:25 -0700 |
| commit | e25395e10f5abbed1ed7bc3e4a7fc892070ddc50 (patch) | |
| tree | ffb4b6eeff7120d61695580f78f15fc6b1e4c0a3 | |
| parent | c1583be773e0ceb526428a6abc823dd8cef9ff34 (diff) | |
| parent | 0f121ca6b8d2a8ad14d5f7f613e65aa4ce42a782 (diff) | |
merge
| -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") |