neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #113 from UdjinM6/fix_macdeploy

Browse Source 
more fixes for mac deploy
This commit is contained in:
evan82 2015-01-16 13:58:43 -07:00
commit ab53ee8f63
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/macdeploy/macdeployqtplus
View File

@ -219,6 +219,7 @@ def getFrameworks(binaryPath, verbose):
libraries = [] libraries = []
for line in otoolLines: for line in otoolLines:
line = line.replace("@loader_path", os.path.dirname(binaryPath))
info = FrameworkInfo.fromOtoolLibraryLine(line.strip()) info = FrameworkInfo.fromOtoolLibraryLine(line.strip())
if info is not None: if info is not None:
if verbose >= 3: if verbose >= 3:
@ -332,7 +333,7 @@ def deployFrameworks(frameworks, bundlePath, binaryPath, strip, verbose, deploym
if deploymentInfo.qtPath is None and framework.isQtFramework(): if deploymentInfo.qtPath is None and framework.isQtFramework():
deploymentInfo.detectQtPath(framework.frameworkDirectory) deploymentInfo.detectQtPath(framework.frameworkDirectory)
if framework.installName.startswith("@executable_path"): if framework.installName.startswith("@executable_path") or framework.installName.startswith(bundlePath):
if verbose >= 2: if verbose >= 2:
print framework.frameworkName, "already deployed, skipping." print framework.frameworkName, "already deployed, skipping."
continue continue
@ -604,7 +605,7 @@ try:
except RuntimeError as e: except RuntimeError as e:
if verbose >= 1: if verbose >= 1:
sys.stderr.write("Error: %s\n" % str(e)) sys.stderr.write("Error: %s\n" % str(e))
sys.exit(ret) sys.exit(1)
# ------------------------------------------------ # ------------------------------------------------
@ -617,7 +618,7 @@ if config.plugins:
except RuntimeError as e: except RuntimeError as e:
if verbose >= 1: if verbose >= 1:
sys.stderr.write("Error: %s\n" % str(e)) sys.stderr.write("Error: %s\n" % str(e))
sys.exit(ret) sys.exit(1)
# ------------------------------------------------ # ------------------------------------------------