Merge #7920: Switch Travis to Trusty
a33b7c9travis: temporarily disable qt to avoid timeouts (Cory Fields)174023ctravis: Don't disable writing ccache for pull-requests (Cory Fields)cf77fcdtravis: drop MAKEJOBS=2 for windows compilers (Cory Fields)9267a47depends: enable pre-compiled headers for qt (Cory Fields)06fdffdtravis: switch to Trusty (Cory Fields)a6666b2depends: mac deploy Py3 compatibility (Wladimir J. van der Laan)
This commit is contained in:
@@ -210,8 +210,8 @@ def getFrameworks(binaryPath, verbose):
|
||||
sys.stderr.write(o_stderr)
|
||||
sys.stderr.flush()
|
||||
raise RuntimeError("otool failed with return code %d" % otool.returncode)
|
||||
|
||||
otoolLines = o_stdout.split("\n")
|
||||
|
||||
otoolLines = o_stdout.decode().split("\n")
|
||||
otoolLines.pop(0) # First line is the inspected binary
|
||||
if ".framework" in binaryPath or binaryPath.endswith(".dylib"):
|
||||
otoolLines.pop(0) # Frameworks and dylibs list themselves as a dependency.
|
||||
@@ -676,7 +676,7 @@ if verbose >= 2:
|
||||
print("+ Installing qt.conf +")
|
||||
|
||||
f = open(os.path.join(applicationBundle.resourcesPath, "qt.conf"), "wb")
|
||||
f.write(qt_conf)
|
||||
f.write(qt_conf.encode())
|
||||
f.close()
|
||||
|
||||
# ------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user