From 8e7ba92eb9e0371385e3de9a76cc11355be8a974 Mon Sep 17 00:00:00 2001 From: "Mark Palange (Mani)" Date: Tue, 15 Sep 2009 16:33:00 -0700 Subject: More specific exepction handling to support correct crt_checking failures. --- indra/newview/viewer_manifest.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index d8f0e9f5d9..7084fca865 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -195,6 +195,7 @@ class WindowsManifest(ViewerManifest): self.path(src='%s/secondlife-bin.exe' % self.args['configuration'], dst=self.final_exe()) self.enable_crt_check() + # Plugin host application self.path(os.path.join(os.pardir, 'llplugin', 'slplugin', self.args['configuration'], "slplugin.exe"), @@ -207,14 +208,14 @@ class WindowsManifest(ViewerManifest): self.path('libapr-1.dll') self.path('libaprutil-1.dll') self.path('libapriconv-1.dll') - except: + except RuntimeError: print "Skipping llcommon.dll (assuming llcommon was linked statically)" self.end_prefix() # need to get the kdu dll from the build directory as well try: self.path('%s/llkdu.dll' % self.args['configuration'], dst='llkdu.dll') - except: + except RuntimeError: print "Skipping llkdu.dll" self.disable_crt_check() -- cgit v1.2.3