diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2009-07-31 16:13:46 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2009-07-31 16:13:46 -0400 |
| commit | 0ac96fd8e61e402840bf2788ed4f34487f780567 (patch) | |
| tree | 9f09d47c8b201e9a93d414cf1a68e3b2705d9719 /indra/newview/viewer_manifest.py | |
| parent | 4c4daedd6421508cdb1eaefa14b9ef5af6ba1671 (diff) | |
DEV-34837: fix viewer_manifest.py to continue supporting static llcommon build
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 7b8a64e3b4..c0a5ab5526 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -473,29 +473,25 @@ class DarwinManifest(ViewerManifest): self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice")
libdir = "../../libraries/universal-darwin/lib_release"
-
- for libfile in ("libapr-1.0.3.7.dylib", "libaprutil-1.0.3.8.dylib"):
- self.path(os.path.join(libdir, libfile), libfile)
+ dylibs = {}
# need to get the kdu dll from any of the build directories as well
- lib = "llkdu"
- libfile = "lib%s.dylib" % lib
- try:
- self.path(self.find_existing_file('../%s/%s/%s' %
- (lib, self.args['configuration'], libfile),
- os.path.join(libdir, libfile)),
- dst=libfile)
- pass
- except:
- print "Skipping %s" % libfile
- pass
-
- lib = "llcommon"
- libfile = "lib%s.dylib" % lib
- self.path(self.find_existing_file('../%s/%s/%s' %
- (lib, self.args['configuration'], libfile),
- os.path.join(libdir, libfile)),
- dst=libfile)
+ for lib in "llkdu", "llcommon":
+ libfile = "lib%s.dylib" % lib
+ try:
+ self.path(self.find_existing_file('../%s/%s/%s' %
+ (lib, self.args['configuration'], libfile),
+ os.path.join(libdir, libfile)),
+ dst=libfile)
+ except RuntimeError:
+ print "Skipping %s" % libfile
+ dylibs[lib] = False
+ else:
+ dylibs[lib] = True
+
+ if dylibs["llcommon"]:
+ for libfile in ("libapr-1.0.3.7.dylib", "libaprutil-1.0.3.8.dylib"):
+ self.path(os.path.join(libdir, libfile), libfile)
#libfmodwrapper.dylib
self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
|