Skip to content
Snippets Groups Projects
Commit 9cca28f5 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

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.
parent bbb712d2
No related branches found
No related tags found
No related merge requests found
......@@ -747,8 +747,12 @@ def path_optional(src, dst):
# 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',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment