rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed: mac post make always runs even if gui not built

This commit is contained in:
Nick Bolton 2014-02-17 17:13:36 +00:00
parent ce8630a5c6
commit 5bb7a9fc7c
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
tools/build/toolchain.py
View File

@ -445,9 +445,9 @@ class InternalCommands:
if sys.platform == 'darwin' and not "clean" in args: if sys.platform == 'darwin' and not "clean" in args:
for target in targets: for target in targets:
self.macPostMakeGui(target) self.macPostMake(target)
def macPostMakeGui(self, target): def macPostMake(self, target):
dir = self.getGenerator().binDir dir = self.getGenerator().binDir
@ -461,32 +461,33 @@ class InternalCommands:
shutil.copy(targetDir + "/synergys", bundleBinDir) shutil.copy(targetDir + "/synergys", bundleBinDir)
shutil.copy(targetDir + "/syntool", bundleBinDir) shutil.copy(targetDir + "/syntool", bundleBinDir)
# use qt to copy libs to bundle so no dependencies are needed. do not create a if self.enableMakeGui:
# dmg at this point, since we need to sign it first, and then create our own # use qt to copy libs to bundle so no dependencies are needed. do not create a
# after signing (so that qt does not affect the signed app bundle). # dmg at this point, since we need to sign it first, and then create our own
bin = "macdeployqt Synergy.app -verbose=2" # after signing (so that qt does not affect the signed app bundle).
self.try_chdir(dir) bin = "macdeployqt Synergy.app -verbose=2"
err = os.system(bin) self.try_chdir(dir)
self.restore_chdir() err = os.system(bin)
self.restore_chdir()
if err != 0:
raise Exception(bin + " failed with error: " + str(err)) if err != 0:
raise Exception(bin + " failed with error: " + str(err))
(qMajor, qMinor, qRev) = self.getQmakeVersion()
if qMajor <= 4: (qMajor, qMinor, qRev) = self.getQmakeVersion()
frameworkRootDir = "/Library/Frameworks" if qMajor <= 4:
else: frameworkRootDir = "/Library/Frameworks"
# TODO: auto-detect, qt can now be installed anywhere. else:
frameworkRootDir = "/Developer/Qt5.2.1/5.2.1/clang_64/lib" # TODO: auto-detect, qt can now be installed anywhere.
frameworkRootDir = "/Developer/Qt5.2.1/5.2.1/clang_64/lib"
# copy the missing Info.plist files for the frameworks.
target = dir + "/Synergy.app/Contents/Frameworks" # copy the missing Info.plist files for the frameworks.
for root, dirs, files in os.walk(target): target = dir + "/Synergy.app/Contents/Frameworks"
for dir in dirs: for root, dirs, files in os.walk(target):
if dir.startswith("Qt"): for dir in dirs:
shutil.copy( if dir.startswith("Qt"):
frameworkRootDir + "/" + dir + "/Contents/Info.plist", shutil.copy(
target + "/" + dir + "/Resources/") frameworkRootDir + "/" + dir + "/Contents/Info.plist",
target + "/" + dir + "/Resources/")
def signmac(self, identity): def signmac(self, identity):
self.try_chdir("bin") self.try_chdir("bin")