From 521ba06c1f1f8058b6f72897a37d437bf6e7548c Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Sat, 13 Nov 2010 23:20:23 -0600 Subject: Mac SLPlugin.app needs symlinks to some libs. --- linden/indra/newview/viewer_manifest.py | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'linden/indra') 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): # self.path("../mac_updater/" + self.args['configuration'] + "/mac-updater.app", "mac-updater.app") # our apps dependencies on shared libs - # 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 -sf %(target)r %(link)r" % - # {'target': target_lib, - # 'link' : os.path.join(mac_crash_logger_res_path, libfile)} - # ) + 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") + slplugin_res_path = self.dst_path_of("SLPlugin.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 -sf %(target)r %(link)r" % + # {'target': target_lib, + # 'link' : os.path.join(mac_crash_logger_res_path, libfile)} + # ) + # self.run_command("ln -sf %(target)r %(link)r" % + # {'target': target_lib, + # 'link' : os.path.join(mac_updater_res_path, libfile)} + # ) + self.run_command("ln -sf %(target)r %(link)r" % + {'target': target_lib, + 'link' : os.path.join(slplugin_res_path, libfile)} + ) # plugin launcher self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin.app", "SLPlugin.app") -- cgit v1.1