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

trying to fix nightly build - windows should not use /release

This commit is contained in:
Nick Bolton 2011-01-19 03:50:36 +00:00
parent 555c5b7a1a
commit a3bf48752f
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/commands.py
View File

@ -526,7 +526,12 @@ class InternalCommands:
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)
ftp.run('bin/release/' + src, dest)
srcDir = 'bin/'
if not generator.startswith('Visual Studio'):
srcDir += '/release'
ftp.run(srcDir + src, dest)
print 'Done' print 'Done'
def dist_name(self, type): def dist_name(self, type):
@ -569,7 +574,11 @@ class InternalCommands:
pattern = re.escape('synergy-') + '\d\.\d\.\d' + re.escape('-' + platform + '.' + ext) pattern = re.escape('synergy-') + '\d\.\d\.\d' + re.escape('-' + platform + '.' + ext)
for filename in os.listdir(self.getBinDir('release')): target = ''
if not generator.startswith('Visual Studio'):
target = 'release'
for filename in os.listdir(self.getBinDir(target)):
if re.search(pattern, filename): if re.search(pattern, filename):
return filename return filename