diff options
| author | Christian Goetze <cg@lindenlab.com> | 2008-11-18 21:58:42 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2008-11-18 21:58:42 +0000 |
| commit | 2d2d427158ca2465e2d70d84b4499cab57e2e208 (patch) | |
| tree | 8da391e9208d416cfa779a501dd691bfb2b054dd /indra/newview | |
| parent | a86aa7d8b08f326e9422e321467dfed7ffe97a4c (diff) | |
QAR-1022 svn merge -r101843:102448 svn+ssh://svn.lindenlab.com/svn/linden/branches/opensource-drops/opensource-drops-4 -> release
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 317cb6f5fc..db46dac1c6 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -164,13 +164,16 @@ class WindowsManifest(ViewerManifest): # nor do we have a fixed name for the executable self.path(self.find_existing_file('debug/secondlife-bin.exe', 'release/secondlife-bin.exe', 'relwithdebinfo/secondlife-bin.exe'), dst=self.final_exe()) # need to get the kdu dll from any of the build directories as well - self.path(self.find_existing_file( + try: + self.path(self.find_existing_file( # *FIX:Mani we need to add support for packaging specific targets. #'../llkdu/debug/llkdu.dll', '../llkdu/release/llkdu.dll', '../llkdu/relwithdebinfo/llkdu.dll', '../../libraries/i686-win32/lib/release/llkdu.dll'), dst='llkdu.dll') + except: + print "Skipping llkdu,.dll" self.path(src="licenses-win32.txt", dst="licenses.txt") self.path("featuretable.txt") |