projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0b744bc
)
Modify Mac Deploy-Script for QtWebEngine
author
romibi
<romibi@bluewin.ch>
Wed, 6 Jul 2016 11:53:53 +0000
(13:53 +0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Mon, 5 Sep 2016 18:39:03 +0000
(20:39 +0200)
Closes GH-210.
scripts/build/macosx_DeployApp.py
patch
|
blob
|
history
diff --git
a/scripts/build/macosx_DeployApp.py
b/scripts/build/macosx_DeployApp.py
index
e6cfc1d
..
2f6957a
100755
(executable)
--- a/
scripts/build/macosx_DeployApp.py
+++ b/
scripts/build/macosx_DeployApp.py
@@
-33,7
+33,7
@@
QT_CONFIG_NOBUNDLE = """[Paths]
class InstallQt(object):
class InstallQt(object):
- def __init__(self, appdir, bundle=True, requestedPlugins=[]):
+ def __init__(self, appdir, bundle=True, requestedPlugins=[]
, skipInstallQtConf=False
):
self.appDir = appdir
self.bundle = bundle
self.frameworkDir = self.appDir + "/Frameworks"
self.appDir = appdir
self.bundle = bundle
self.frameworkDir = self.appDir + "/Frameworks"
@@
-52,7
+52,8
@@
class InstallQt(object):
self.findPluginsPath()
self.installPlugins(requestedPlugins)
self.findPluginsPath()
self.installPlugins(requestedPlugins)
- self.installQtConf()
+ if not skipInstallQtConf:
+ self.installQtConf()
def qtProperty(self, qtProperty):
"""
def qtProperty(self, qtProperty):
"""
@@
-153,6
+154,12
@@
class InstallQt(object):
self.installedFrameworks.add(framework)
self.installedFrameworks.add(framework)
+ # if the Framework-Folder is a Symlink we are in a Helper-Process ".app" (e.g. in QtWebEngine),
+ # in this case skip copying/installing on existing folders
+ skipExisting = False;
+ if os.path.islink(self.frameworkDir):
+ skipExisting = True;
+
# ensure that the framework directory exists
try:
os.mkdir(self.frameworkDir)
# ensure that the framework directory exists
try:
os.mkdir(self.frameworkDir)
@@
-162,12
+169,16
@@
class InstallQt(object):
if not framework.startswith('/'):
framework = "%s/%s" % (self.sourceFrameworkPath, framework)
if not framework.startswith('/'):
framework = "%s/%s" % (self.sourceFrameworkPath, framework)
- # Copy Framework
- os.system('cp -R "%s" "%s"' % (framework, self.frameworkDir))
-
frameworkname = framework.split('/')[-1]
localframework = self.frameworkDir + "/" + frameworkname
frameworkname = framework.split('/')[-1]
localframework = self.frameworkDir + "/" + frameworkname
+ # Framework already installed in previous run ... see above
+ if skipExisting and os.path.isdir(localframework):
+ return
+
+ # Copy Framework
+ os.system('cp -R "%s" "%s"' % (framework, self.frameworkDir))
+
# De-Myllify
os.system('find "%s" -name *debug* -exec rm -f {} \;' % localframework)
os.system('find "%s" -name Headers -exec rm -rf {} \; 2>/dev/null' % localframework)
# De-Myllify
os.system('find "%s" -name *debug* -exec rm -f {} \;' % localframework)
os.system('find "%s" -name Headers -exec rm -rf {} \; 2>/dev/null' % localframework)
@@
-235,3
+246,10
@@
if __name__ == "__main__":
targetDir += "/Contents"
InstallQt(targetDir, bundle, plugins)
targetDir += "/Contents"
InstallQt(targetDir, bundle, plugins)
+
+ if bundle:
+ webenginetarget = targetDir + '/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents'
+
+ if os.path.isdir(webenginetarget):
+ os.system('ln -s ../../../../../../ "%s"/Frameworks' % webenginetarget)
+ InstallQt(webenginetarget, bundle, [], True)