feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Check that SCons is installed properly

Browse Source
This commit is contained in:
Ivan Kravets
2015-09-01 16:42:41 +03:00
parent c50332daa2
commit 2f7a6ef0a1
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
platformio/platforms/base.py
View File

@ -373,18 +373,7 @@ class BasePlatform(object):
self._found_error = False
try:
# test that SCons is installed correctly
try:
r = util.exec_command(["scons", "--version"])
assert r['returncode'] == 0
except (OSError, AssertionError):
for p in sys.path:
try:
r = util.exec_command([join(p, "scons"), "--version"])
assert r['returncode'] == 0
os.environ['PATH'] += os.pathsep + p
break
except (OSError, AssertionError):
pass
assert self.test_scons()
result = util.exec_command(
[
@ -395,7 +384,7 @@ class BasePlatform(object):
stdout=util.AsyncPipe(self.on_run_out),
stderr=util.AsyncPipe(self.on_run_err)
)
except OSError:
except (OSError, AssertionError):
raise exception.SConsNotInstalled()
assert "returncode" in result
@ -407,6 +396,23 @@ class BasePlatform(object):
return result
@staticmethod
def test_scons():
try:
r = util.exec_command(["scons", "--version"])
assert r['returncode'] == 0
return True
except (OSError, AssertionError):
for p in sys.path:
try:
r = util.exec_command([join(p, "scons"), "--version"])
assert r['returncode'] == 0
os.environ['PATH'] += os.pathsep + p
return True
except (OSError, AssertionError):
pass
return False
def on_run_out(self, line):
self._echo_line(line, level=3)