- 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"
self.findPluginsPath()
self.installPlugins(requestedPlugins)
self.findPluginsPath()
self.installPlugins(requestedPlugins)
+ if not skipInstallQtConf:
+ self.installQtConf()
def qtProperty(self, qtProperty):
"""
def qtProperty(self, qtProperty):
"""
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)
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)
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)