projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
After thorough considerations and long discussions, we finally decided to included...
[quassel.git]
/
scripts
/
build
/
macosx_DeployApp.py
diff --git
a/scripts/build/macosx_DeployApp.py
b/scripts/build/macosx_DeployApp.py
index
b0ad760
..
83ca5a0
100755
(executable)
--- a/
scripts/build/macosx_DeployApp.py
+++ b/
scripts/build/macosx_DeployApp.py
@@
-33,6
+33,8
@@
class InstallQt(object):
self.needFrameworks = []
self.needFrameworks = []
+ self.findFrameworkPath()
+
executables = [self.executableDir + "/" + executable for executable in os.listdir(self.executableDir)]
for executable in executables:
executables = [self.executableDir + "/" + executable for executable in os.listdir(self.executableDir)]
for executable in executables:
@@
-42,12
+44,22
@@
class InstallQt(object):
self.installFramework(framework)
self.changeDylPath(executable)
self.installFramework(framework)
self.changeDylPath(executable)
+ def findFrameworkPath(self):
+ 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):
try:
os.mkdir(self.frameworkDir)
except:
pass
def installFramework(self, framework):
try:
os.mkdir(self.frameworkDir)
except:
pass
+ if not framework.startswith('/'):
+ framework = "%s/%s" % (self.sourceFrameworkPath, framework)
+
# Copy Framework
os.system('cp -R "%s" "%s"' % (framework, self.frameworkDir))
# Copy Framework
os.system('cp -R "%s" "%s"' % (framework, self.frameworkDir))
@@
-82,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()
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)
frameworks = [lib[:lib.find(".framework")+len(".framework")] for lib in libs]
return zip(frameworks, libs)