forked from platformio/platformio-core
Upgraded to SCons 4.0
This commit is contained in:
1 parent
70366d34b9
commit
aa186382a8
3 files changed
+28
-16
No files matched your search
@@ -49,7 +49,7 @@ __core_packages__ = {
|
||||
"contrib-piohome": "~3.2.3",
|
||||
"contrib-pysite": "~2.%d%d.0" % (sys.version_info.major, sys.version_info.minor),
|
||||
"tool-unity": "~1.20500.0",
|
||||
"tool-scons": "~2.20501.7" if sys.version_info.major == 2 else "~3.30102.0",
|
||||
"tool-scons": "~2.20501.7" if sys.version_info.major == 2 else "~4.40001.0",
|
||||
"tool-cppcheck": "~1.190.0",
|
||||
"tool-clangtidy": "~1.100000.0",
|
||||
"tool-pvs-studio": "~7.7.0",
|
||||
|
||||
@@ -20,7 +20,7 @@ import sys
|
||||
import click
|
||||
|
||||
from platformio import app, fs, proc, telemetry
|
||||
from platformio.compat import hashlib_encode_data, is_bytes
|
||||
from platformio.compat import PY2, hashlib_encode_data, is_bytes
|
||||
from platformio.package.manager.core import get_core_package_dir
|
||||
from platformio.platform.exception import BuildScriptNotFound
|
||||
|
||||
@@ -89,9 +89,15 @@ class PlatformRunMixin(object):
|
||||
telemetry.send_run_environment(topts, targets)
|
||||
|
||||
def _run_scons(self, variables, targets, jobs):
|
||||
scons_dir = get_core_package_dir("tool-scons")
|
||||
script_path = (
|
||||
os.path.join(scons_dir, "script", "scons")
|
||||
if PY2
|
||||
else os.path.join(scons_dir, "scons.py")
|
||||
)
|
||||
args = [
|
||||
proc.get_pythonexe_path(),
|
||||
os.path.join(get_core_package_dir("tool-scons"), "script", "scons"),
|
||||
script_path,
|
||||
"-Q",
|
||||
"--warn=no-no-parallel-support",
|
||||
"--jobs",
|
||||
|
||||
Reference in new issue
Block a user