aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-10-01 09:00:37 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-10-01 09:00:45 +0200
commit437634a79eda03dc46bd1c637733a6cdab71a6c5 (patch)
treed086ae754745c74d36d61dce57a22e008a2210dd /contrib
parent211d2939fd41c81fb67603060f94e5a2d6382f6b (diff)
parentaf0bd5ee7f8ad241830436e932af2486715327e9 (diff)
Merge pull request #5005
af0bd5e osx: fix signing to make Gatekeeper happy (again) (Cory Fields)
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/macdeploy/macdeployqtplus9
1 files changed, 2 insertions, 7 deletions
diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
index 5ab6a222dd..1b50981f0a 100755
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -283,8 +283,8 @@ def copyFramework(framework, path, verbose):
if not framework.isDylib(): # Copy resources for real frameworks
- linkfrom = os.path.join(path, "Contents/Frameworks/", framework.frameworkName, framework.binaryName)
- linkto = os.path.join(framework.binaryPath)
+ linkfrom = os.path.join(path, "Contents","Frameworks", framework.frameworkName, "Versions", "Current")
+ linkto = framework.version
if not os.path.exists(linkfrom):
os.symlink(linkto, linkfrom)
if verbose >= 2:
@@ -303,11 +303,6 @@ def copyFramework(framework, path, verbose):
toContentsDir = os.path.join(path, framework.destinationVersionContentsDirectory)
shutil.copytree(fromContentsDir, toContentsDir)
contentslinkfrom = os.path.join(path, framework.destinationContentsDirectory)
- if not os.path.exists(contentslinkfrom):
- contentslinkto = os.path.join("Versions/", framework.version, "Contents")
- os.symlink(contentslinkto, contentslinkfrom)
- if verbose >= 3:
- print "Linked:", contentslinkfrom, "->", contentslinkto
if verbose >= 3:
print "Copied Contents:", fromContentsDir
print " to:", toContentsDir