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

fixed: code sign fails on mavericks

This commit is contained in:
Nick Bolton 2014-01-24 11:51:35 +00:00
parent a610012fb4
commit 50e97e23f0
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/build/toolchain.py
View File

@ -361,7 +361,7 @@ class InternalCommands:
def signmac(self, identity): def signmac(self, identity):
self.try_chdir("bin") self.try_chdir("bin")
err = os.system( err = os.system(
'codesign -fs "' + identity + '" Synergy.app') 'codesign --deep -fs "' + identity + '" Synergy.app')
self.restore_chdir() self.restore_chdir()
def signwin(self, pfx, pwdFile, dist): def signwin(self, pfx, pwdFile, dist):
@ -495,6 +495,14 @@ class InternalCommands:
self.try_chdir(dir) self.try_chdir(dir)
err = os.system(bin) err = os.system(bin)
self.restore_chdir() self.restore_chdir()
# copy the missing Info.plist files for the frameworks.
shutil.copy("/Library/Frameworks/QtCore.framework/Contents/Info.plist",
dir + "/Synergy.app/Contents/Frameworks/QtCore.framework/Resources/")
shutil.copy("/Library/Frameworks/QtGui.framework/Contents/Info.plist",
dir + "/Synergy.app/Contents/Frameworks/QtGui.framework/Resources/")
shutil.copy("/Library/Frameworks/QtNetwork.framework/Contents/Info.plist",
dir + "/Synergy.app/Contents/Frameworks/QtNetwork.framework/Resources/")
if err != 0: if err != 0:
raise Exception(bin + " failed with error: " + str(err)) raise Exception(bin + " failed with error: " + str(err))
@ -1325,11 +1333,4 @@ class CommandHandler:
if o == '--identity': if o == '--identity':
identity = a identity = a
# HACK: codesign fails intermittently. we need some sort of retry mechanism
# but i don't have time right now so just hammer the crap out of it and hope
# one attempt works.
self.ic.signmac(identity)
self.ic.signmac(identity)
self.ic.signmac(identity)
self.ic.signmac(identity)
self.ic.signmac(identity) self.ic.signmac(identity)