aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorJacek Antonelli2010-11-13 21:54:46 -0600
committerJacek Antonelli2010-11-14 02:08:25 -0600
commit385be943dc214692d9590fc6a1df328197d3f98e (patch)
treea07ff6f919593c9b0aa95c729ff3bc050d6b2b61 /linden/indra
parentRoll back llqtwebkit package to 20100617 on Mac. (diff)
downloadmeta-impy-385be943dc214692d9590fc6a1df328197d3f98e.zip
meta-impy-385be943dc214692d9590fc6a1df328197d3f98e.tar.gz
meta-impy-385be943dc214692d9590fc6a1df328197d3f98e.tar.bz2
meta-impy-385be943dc214692d9590fc6a1df328197d3f98e.tar.xz
Disable packaging of mac-updater.app.
Diffstat (limited to 'linden/indra')
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index f9c34d6..7527244 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -768,20 +768,20 @@ class DarwinManifest(ViewerManifest):
768 768
769 # our apps 769 # our apps
770# self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app") 770# self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app")
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 # mac_crash_logger_res_path = self.dst_path_of("mac-crash-logger.app/Contents/Resources")
775 mac_updater_res_path = self.dst_path_of("mac-updater.app/Contents/Resources") 775 # mac_updater_res_path = self.dst_path_of("mac-updater.app/Contents/Resources")
776 for libfile in ("libllcommon.dylib", 776 # for libfile in ("libllcommon.dylib",
777 "libapr-1.0.3.7.dylib", 777 # "libapr-1.0.3.7.dylib",
778 "libaprutil-1.0.3.8.dylib", 778 # "libaprutil-1.0.3.8.dylib",
779 "libexpat.0.5.0.dylib"): 779 # "libexpat.0.5.0.dylib"):
780 target_lib = os.path.join('../../..', libfile) 780 # target_lib = os.path.join('../../..', libfile)
781 self.run_command("ln -sf %(target)r %(link)r" % 781 # self.run_command("ln -sf %(target)r %(link)r" %
782 {'target': target_lib, 782 # {'target': target_lib,
783 'link' : os.path.join(mac_crash_logger_res_path, libfile)} 783 # 'link' : os.path.join(mac_crash_logger_res_path, libfile)}
784 ) 784 # )
785 785
786 # plugin launcher 786 # plugin launcher
787 self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin", "SLPlugin") 787 self.path("../llplugin/slplugin/" + self.args['configuration'] + "/SLPlugin", "SLPlugin")