From bca738922192891624bc04aa71a06da1253044b4 Mon Sep 17 00:00:00 2001 From: Marcus Eggenberger Date: Tue, 7 May 2013 21:04:53 +0200 Subject: [PATCH] After thorough considerations and long discussions, we finally decided to included phonon with the bundled Mac OS X client... --- scripts/build/macosx_DeployApp.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/build/macosx_DeployApp.py b/scripts/build/macosx_DeployApp.py index a46b5dca..83ca5a0f 100755 --- a/scripts/build/macosx_DeployApp.py +++ b/scripts/build/macosx_DeployApp.py @@ -45,10 +45,10 @@ class InstallQt(object): self.changeDylPath(executable) def findFrameworkPath(self): - otoolProcess = Popen('qmake -query QT_INSTALL_LIBS', shell=True, stdout=PIPE, stderr=PIPE) - self.sourceFrameworkPath = otoolProcess.stdout.read().strip() - otoolProcess.stdout.close() - otoolProcess.wait() + qmakeProcess = Popen('qmake -query QT_INSTALL_LIBS', shell=True, stdout=PIPE, stderr=PIPE) + self.sourceFrameworkPath = qmakeProcess.stdout.read().strip() + qmakeProcess.stdout.close() + qmakeProcess.wait() def installFramework(self, framework): @@ -94,7 +94,9 @@ class InstallQt(object): otoolPipe = Popen('otool -L "%s"' % app, shell=True, stdout=PIPE).stdout otoolOutput = [line for line in otoolPipe] otoolPipe.close() - libs = [line.split()[0] for line in otoolOutput[1:] if "Qt" in line and not "@executable_path" in line] + libs = [line.split()[0] for line in otoolOutput[1:] if ("Qt" in line + or "phonon" in line) + and not "@executable_path" in line] frameworks = [lib[:lib.find(".framework")+len(".framework")] for lib in libs] return zip(frameworks, libs) -- 2.20.1