diff options
| -rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index c9a2f7b..948e88e 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
| @@ -771,17 +771,28 @@ class DarwinManifest(ViewerManifest): | |||
| 771 | # self.path("../mac_updater/" + self.args['configuration'] + "/mac-updater.app", "mac-updater.app") | 771 | # self.path("../mac_updater/" + self.args['configuration'] + "/mac-updater.app", "mac-updater.app") |
| 772 | 772 | ||
| 773 | # our apps dependencies on shared libs | 773 | # our apps dependencies on shared libs |
| 774 | # mac_crash_logger_res_path = self.dst_path_of("mac-crash-logger.app/Contents/Resources") | 774 | if dylibs["llcommon"]: |
| 775 | # mac_updater_res_path = self.dst_path_of("mac-updater.app/Contents/Resources") | 775 | # mac_crash_logger_res_path = self.dst_path_of("mac-crash-logger.app/Contents/Resources") |
| 776 | # for libfile in ("libllcommon.dylib", | 776 | # mac_updater_res_path = self.dst_path_of("mac-updater.app/Contents/Resources") |
| 777 | # "libapr-1.0.3.7.dylib", | 777 | slplugin_res_path = self.dst_path_of("SLPlugin.app/Contents/Resources") |
| 778 | # "libaprutil-1.0.3.8.dylib", | 778 | for libfile in ("libllcommon.dylib", |
| 779 | # "libexpat.0.5.0.dylib"): | 779 | "libapr-1.0.3.7.dylib", |
| 780 | # target_lib = os.path.join('../../..', libfile) | 780 | "libaprutil-1.0.3.8.dylib", |
| 781 | # self.run_command("ln -sf %(target)r %(link)r" % | 781 | "libexpat.0.5.0.dylib", |
| 782 | # {'target': target_lib, | 782 | ): |
| 783 | # 'link' : os.path.join(mac_crash_logger_res_path, libfile)} | 783 | target_lib = os.path.join('../../..', libfile) |
| 784 | # ) | 784 | # self.run_command("ln -sf %(target)r %(link)r" % |
| 785 | # {'target': target_lib, | ||
| 786 | # 'link' : os.path.join(mac_crash_logger_res_path, libfile)} | ||
| 787 | # ) | ||
| 788 | # self.run_command("ln -sf %(target)r %(link)r" % | ||
| 789 | # {'target': target_lib, | ||
| 790 | # 'link' : os.path.join(mac_updater_res_path, libfile)} | ||
| 791 | # ) | ||
| 792 | self.run_command("ln -sf %(target)r %(link)r" % | ||
| 793 | {'target': target_lib, | ||
| 794 | 'link' : os.path.join(slplugin_res_path, libfile)} | ||
| 795 | ) | ||
| 785 | 796 | ||
| 786 | # plugin launcher | 797 | # plugin launcher |
| 787 | self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin.app", "SLPlugin.app") | 798 | self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin.app", "SLPlugin.app") |