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

fixed: mac sign failing silently

This commit is contained in:
Nick Bolton 2014-02-17 17:10:37 +00:00
parent 2dad0a7c94
commit ce8630a5c6
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/build/toolchain.py
View File

@ -468,6 +468,9 @@ class InternalCommands:
self.try_chdir(dir) self.try_chdir(dir)
err = os.system(bin) err = os.system(bin)
self.restore_chdir() self.restore_chdir()
if err != 0:
raise Exception(bin + " failed with error: " + str(err))
(qMajor, qMinor, qRev) = self.getQmakeVersion() (qMajor, qMinor, qRev) = self.getQmakeVersion()
if qMajor <= 4: if qMajor <= 4:
@ -477,21 +480,22 @@ class InternalCommands:
frameworkRootDir = "/Developer/Qt5.2.1/5.2.1/clang_64/lib" frameworkRootDir = "/Developer/Qt5.2.1/5.2.1/clang_64/lib"
# copy the missing Info.plist files for the frameworks. # copy the missing Info.plist files for the frameworks.
shutil.copy(frameworkRootDir + "/QtCore.framework/Contents/Info.plist", target = dir + "/Synergy.app/Contents/Frameworks"
dir + "/Synergy.app/Contents/Frameworks/QtCore.framework/Resources/") for root, dirs, files in os.walk(target):
shutil.copy(frameworkRootDir + "/QtGui.framework/Contents/Info.plist", for dir in dirs:
dir + "/Synergy.app/Contents/Frameworks/QtGui.framework/Resources/") if dir.startswith("Qt"):
shutil.copy(frameworkRootDir + "/QtNetwork.framework/Contents/Info.plist", shutil.copy(
dir + "/Synergy.app/Contents/Frameworks/QtNetwork.framework/Resources/") frameworkRootDir + "/" + dir + "/Contents/Info.plist",
target + "/" + dir + "/Resources/")
if err != 0:
raise Exception(bin + " failed with error: " + str(err))
def signmac(self, identity): def signmac(self, identity):
self.try_chdir("bin") self.try_chdir("bin")
err = os.system( err = os.system(
'codesign --deep -fs "' + identity + '" Synergy.app') 'codesign --deep -fs "' + identity + '" Synergy.app')
self.restore_chdir() self.restore_chdir()
if err != 0:
raise Exception("codesign failed with error: " + str(err))
def signwin(self, pfx, pwdFile, dist): def signwin(self, pfx, pwdFile, dist):
generator = self.getGeneratorFromConfig().cmakeName generator = self.getGeneratorFromConfig().cmakeName
@ -521,6 +525,9 @@ class InternalCommands:
' /t http://timestamp.verisign.com/scripts/timstamp.dll ' + ' /t http://timestamp.verisign.com/scripts/timstamp.dll ' +
file) file)
self.restore_chdir() self.restore_chdir()
if err != 0:
raise Exception("signtool failed with error: " + str(err))
def runBuildCommand(self, cmd, target): def runBuildCommand(self, cmd, target):