platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-31 02:27:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix SConsNotInstalled error for Linux Debian-based distributives

Browse Source
This commit is contained in:
Ivan Kravets
2015-09-09 00:45:51 +03:00
parent b15408e693
commit 82a8bd01fc
5 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY.rst
View File

@ -4,6 +4,11 @@ Release History
PlatformIO 2.0 PlatformIO 2.0
-------------- --------------
2.3.2 (2015-09-??)
~~~~~~~~~~~~~~~~~~
* Fixed `SConsNotInstalled` error for Linux Debian-based distributives
2.3.1 (2015-09-06) 2.3.1 (2015-09-06)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~

2
docs/installation.rst
View File

@ -47,7 +47,7 @@ The latest stable version of PlatformIO may be done via
.. code-block:: bash .. code-block:: bash
# update dependent packages to the latest versions # update dependent packages to the latest versions
pip install -U pip setuptools pip install -U pip setuptools virtualenv
# install the latest version of PlatformIO # install the latest version of PlatformIO
pip install -U platformio pip install -U platformio

2
platformio/__init__.py
View File

@ -1,7 +1,7 @@
# Copyright (C) Ivan Kravets <me@ikravets.com> # Copyright (C) Ivan Kravets <me@ikravets.com>
# See LICENSE for details. # See LICENSE for details.
VERSION = (2, 3, "2.dev0") VERSION = (2, 3, "2.dev1")
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

17
platformio/builder/main.py
View File

@ -6,13 +6,16 @@ try:
except ImportError: except ImportError:
import sys import sys
for p in sys.path: for p in sys.path:
_new_path = None _new_paths = []
if not p.endswith("site-packages") and "site-packages" in p: for item in ("dist-packages", "site-packages"):
_new_path = p[:p.rfind("site-packages") + 13] if not p.endswith(item) and item in p:
elif "platformio" in p: _new_paths.append(p[:p.rfind(item) + len(item)])
_new_path = p[:p.rfind("platformio") - 1] if "platformio" in p:
if _new_path and _new_path not in sys.path: _new_paths.append(p[:p.rfind("platformio") - 1])
sys.path.insert(0, _new_path)
for _p in _new_paths:
if _p not in sys.path:
sys.path.insert(0, _p)
try: try:
from platformio import util from platformio import util
break break

17
platformio/platforms/base.py
View File

@ -4,6 +4,7 @@
import os import os
import re import re
import sys import sys
from glob import glob
from imp import load_source from imp import load_source
from os.path import isdir, isfile, join from os.path import isdir, isfile, join
@ -400,6 +401,22 @@ class BasePlatform(object):
def test_scons(): def test_scons():
try: try:
r = util.exec_command(["scons", "--version"]) r = util.exec_command(["scons", "--version"])
if "ImportError: No module named SCons.Script" in r['err']:
_PYTHONPATH = []
for p in sys.path:
if not p.endswith("-packages"):
continue
for item in glob(join(p, "scons*")):
if isdir(join(item, "SCons")) and item not in sys.path:
_PYTHONPATH.append(item)
sys.path.insert(0, item)
if _PYTHONPATH:
_PYTHONPATH = str(os.pathsep).join(_PYTHONPATH)
if os.getenv("PYTHONPATH"):
os.environ['PYTHONPATH'] += os.pathsep + _PYTHONPATH
else:
os.environ['PYTHONPATH'] = _PYTHONPATH
r = util.exec_command(["scons", "--version"])
assert r['returncode'] == 0 assert r['returncode'] == 0
return True return True
except (OSError, AssertionError): except (OSError, AssertionError):