diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-01-12 17:18:28 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-01-12 17:18:28 -0500 |
commit | 9cca28f526693a47f6007ddca44f0a58c90f7edb (patch) | |
tree | 6403257868ba86e7c0b4a2a49398baed1a52c426 | |
parent | bbb712d200cd44a63c3008f68c002e62fba8fd01 (diff) |
On Mac, if we can't symlink .dylibs, print error message and continue.
To this point, we've been failing the build with a Python OSError traceback,
which is less than ideal.
-rwxr-xr-x | indra/newview/viewer_manifest.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 7ee1a37175..01590db648 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -747,8 +747,12 @@ class Darwin_i386_Manifest(ViewerManifest): # create a symlink to the real copy of the dylib. resource_path = self.dst_path_of(os.path.join(app, "Contents", "Resources")) for libfile in dylibs: - symlinkf(os.path.join(os.pardir, os.pardir, os.pardir, libfile), - os.path.join(resource_path, libfile)) + src = os.path.join(os.pardir, os.pardir, os.pardir, libfile) + dst = os.path.join(resource_path, libfile) + try: + symlinkf(src, dst) + except OSError as err: + print "Can't symlink %s -> %s: %s" % (src, dst, err) # SLPlugin.app/Contents/Resources gets those Qt4 libraries it needs. if self.prefix(src="", dst="SLPlugin.app/Contents/Resources"): for libfile in ('libQtCore.4.dylib', |