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

Fixed cmake auto download, and copied updated build tools into 1.3.5 release branch

This commit is contained in:
Nick Bolton 2010-04-22 22:16:23 +00:00
parent cc89770875
commit 94b392cf97
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/commands.py
View File

@ -119,7 +119,7 @@ class InternalCommands:
version = '2.8.0' version = '2.8.0'
found_cmd = '' found_cmd = ''
for test_cmd in (self.cmake_cmd, r'tool\cmake\bin\%s' % self.cmake_cmd): for test_cmd in (self.cmake_cmd, r'tool\cmake\bin\%s' % self.cmake_cmd):
print 'Testing for CMake version %s at `%s`...' % (version, test_cmd) print 'Testing for CMake version %s by running `%s`...' % (version, test_cmd)
p = subprocess.Popen([test_cmd, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) p = subprocess.Popen([test_cmd, '--version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
stdout, stderr = p.communicate() stdout, stderr = p.communicate()
if p.returncode == 0 and stdout == 'cmake version %s\r\n' % version: if p.returncode == 0 and stdout == 'cmake version %s\r\n' % version:
@ -143,7 +143,7 @@ class InternalCommands:
if not os.path.exists('tool'): if not os.path.exists('tool'):
os.mkdir('tool') os.mkdir('tool')
os.system(r'svn checkout https://synergy-plus.googlecode.com/svn/tools/win/cmake tool\cmake') os.system(r'svn checkout https://synergy-plus.googlecode.com/svn/tools/win/cmake tool\cmake')
found_cmd = r'tool\cmake\bin\%s' % found_cmd found_cmd = r'..\tool\cmake\bin\%s' % self.cmake_cmd
return found_cmd return found_cmd
else: else: