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

fixed: dist commands not using loadConfig

This commit is contained in:
Nick Bolton 2014-03-22 08:20:38 +00:00
parent f59569c4a0
commit d456159a2b
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/toolchain/commands1.py
View File

@ -1089,11 +1089,7 @@ class InternalCommands:
raise Exception('Package failed: ' + str(err)) raise Exception('Package failed: ' + str(err))
def distMac(self): def distMac(self):
self.loadConfig()
config = self.getConfig()
if config.has_option("cmake", "mac_sdk"):
self.macSdk = config.get("cmake", "mac_sdk")
dir = self.getGenerator().binDir dir = self.getGenerator().binDir
name = "Synergy" name = "Synergy"
dist = dir + "/" + name dist = dir + "/" + name
@ -1204,16 +1200,13 @@ class InternalCommands:
return major + '.' + minor + '.' + rev return major + '.' + minor + '.' + rev
def distftp(self, type, ftp): def distftp(self, type, ftp):
config = self.getConfig()
if config.has_option("cmake", "mac_sdk"):
self.macSdk = config.get("cmake", "mac_sdk")
if not type: if not type:
raise Exception('Type not specified.') raise Exception('Type not specified.')
if not ftp: if not ftp:
raise Exception('FTP info not defined.') raise Exception('FTP info not defined.')
self.loadConfig()
src = self.dist_name(type) src = self.dist_name(type)
dest = self.dist_name_rev(type) dest = self.dist_name_rev(type)
print 'Uploading %s to FTP server %s...' % (dest, ftp.host) print 'Uploading %s to FTP server %s...' % (dest, ftp.host)