LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge branch 'macdeployqt_fix' of git://github.com/themighty1/bitcoin

Browse source
This commit is contained in:
Gavin Andresen 2013-01-14 14:58:08 -05:00
commit 1eca3a0f0d
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
contrib/macdeploy/macdeployqtplus
View file

@ -172,7 +172,9 @@ class DeploymentInfo(object):
elif os.path.exists(os.path.join(os.path.dirname(parentDir), "share", "qt4", "translations")): elif os.path.exists(os.path.join(os.path.dirname(parentDir), "share", "qt4", "translations")):
# Newer Macports layout # Newer Macports layout
self.qtPath = os.path.join(os.path.dirname(parentDir), "share", "qt4") self.qtPath = os.path.join(os.path.dirname(parentDir), "share", "qt4")
else:
self.qtPath = os.getenv("QTDIR", None)
if self.qtPath is not None: if self.qtPath is not None:
pluginPath = os.path.join(self.qtPath, "plugins") pluginPath = os.path.join(self.qtPath, "plugins")
if os.path.exists(pluginPath): if os.path.exists(pluginPath):
@ -242,7 +244,11 @@ def runStrip(binaryPath, verbose):
subprocess.check_call(["strip", "-x", binaryPath]) subprocess.check_call(["strip", "-x", binaryPath])
def copyFramework(framework, path, verbose): def copyFramework(framework, path, verbose):
fromPath = framework.sourceFilePath if framework.sourceFilePath.startswith("Qt"):
#standard place for Nokia Qt installer's frameworks
fromPath = "/Library/Frameworks/" + framework.sourceFilePath
else:
fromPath = framework.sourceFilePath
toDir = os.path.join(path, framework.destinationDirectory) toDir = os.path.join(path, framework.destinationDirectory)
toPath = os.path.join(toDir, framework.binaryName) toPath = os.path.join(toDir, framework.binaryName)
@ -345,7 +351,7 @@ def deployPlugins(appBundleInfo, deploymentInfo, strip, verbose):
if pluginDirectory == "designer": if pluginDirectory == "designer":
# Skip designer plugins # Skip designer plugins
continue continue
elif pluginDirectory == "phonon": elif pluginDirectory == "phonon" or pluginDirectory == "phonon_backend":
# Deploy the phonon plugins only if phonon is in use # Deploy the phonon plugins only if phonon is in use
if not deploymentInfo.usesFramework("phonon"): if not deploymentInfo.usesFramework("phonon"):
continue continue