"""
-
-
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"
for executable in executables:
self.resolveDependancies(executable)
-
self.findPluginsPath()
self.installPlugins(requestedPlugins)
- self.installQtConf()
+ if not skipInstallQtConf:
+ self.installQtConf()
def qtProperty(self, qtProperty):
"""
raise OSError
return result
-
def installPlugins(self, requestedPlugins):
try:
os.mkdir(self.pluginDir)
def resolveDependancies(self, obj):
# obj must be either an application binary or a framework library
- #print "resolving deps for:", obj
+ # print "resolving deps for:", obj
for framework, lib in self.determineDependancies(obj):
self.installFramework(framework)
self.changeDylPath(obj, framework, lib)
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)
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
+ # 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)
except:
libname = ''
otoolProcess.stdout.close()
- if otoolProcess.wait() == 1: # we found some Resource dir or similar -> skip
+ if otoolProcess.wait() == 1: # we found some Resource dir or similar -> skip
continue
frameworkpath, libpath = libname.split(frameworkname)
if self.bundle:
newlibname = "@executable_path/../%s%s" % (frameworkname, libpath)
else:
newlibname = "@executable_path/%s%s" % (frameworkname, libpath)
- #print 'install_name_tool -id "%s" "%s"' % (newlibname, lib)
+ # print 'install_name_tool -id "%s" "%s"' % (newlibname, lib)
+ os.system('chmod +w "%s"' % (lib))
os.system('install_name_tool -id "%s" "%s"' % (newlibname, lib))
self.resolveDependancies(lib)
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
- or "phonon" in line)
- and not "@executable_path" in line]
- frameworks = [lib[:lib.find(".framework")+len(".framework")] for lib in libs]
- frameworks = [framework[framework.rfind('/')+1:] for framework in frameworks]
+ libs = [line.split()[0] for line in otoolOutput[1:] if ("Qt" in line or "phonon" in line) and "@executable_path" not in line]
+ frameworks = [lib[:lib.find(".framework") + len(".framework")] for lib in libs]
+ frameworks = [framework[framework.rfind('/') + 1:] for framework in frameworks]
return zip(frameworks, libs)
-
def changeDylPath(self, obj, framework, lib):
newlibname = framework + lib.split(framework)[1]
if self.bundle:
else:
newlibname = "@executable_path/Frameworks/%s" % newlibname
- #print 'install_name_tool -change "%s" "%s" "%s"' % (lib, newlibname, obj)
+ # print 'install_name_tool -change "%s" "%s" "%s"' % (lib, newlibname, obj)
+ os.system('chmod +w "%s"' % (lib))
+ os.system('chmod +w "%s"' % (obj))
os.system('install_name_tool -change "%s" "%s" "%s"' % (lib, newlibname, obj))
if __name__ == "__main__":
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)