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

Upgrad build system to SCons 3.0 // Issue #895

Browse Source
This commit is contained in:
Ivan Kravets
2018-01-26 20:04:43 +02:00
parent 7a40992cc1
commit 59337c71c1
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY.rst
View File

@ -7,6 +7,8 @@ PlatformIO 3.0
3.5.2 (2018-??-??) 3.5.2 (2018-??-??)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~
* Upgraded build system to `SCons <http://scons.org>`__ 3.0
(`issue #895 <https://github.com/platformio/platformio-core/issues/895>`_)
* Added aliases (off, light, strict) for * Added aliases (off, light, strict) for
`LDF Compatibility Modes <http://docs.platformio.org/page/librarymanager/ldf.html>`__ `LDF Compatibility Modes <http://docs.platformio.org/page/librarymanager/ldf.html>`__
* Show device system information (MCU, Frequency, RAM, Flash, Debugging tools) * Show device system information (MCU, Frequency, RAM, Flash, Debugging tools)

12
platformio/builder/tools/piolib.py
View File

@ -90,7 +90,7 @@ class LibBuilderBase(object):
COMPAT_MODE_DEFAULT = "light" COMPAT_MODE_DEFAULT = "light"
CLASSIC_SCANNER = SCons.Scanner.C.CScanner() CLASSIC_SCANNER = SCons.Scanner.C.CScanner()
ADVANCED_SCANNER = SCons.Scanner.C.CScanner(advanced=True) CCONDITIONAL_SCANNER = SCons.Scanner.C.CConditionalScanner()
PARSE_SRC_BY_H_NAME = True PARSE_SRC_BY_H_NAME = True
_INCLUDE_DIRS_CACHE = None _INCLUDE_DIRS_CACHE = None
@ -343,17 +343,15 @@ class LibBuilderBase(object):
for path in self._validate_search_files(search_files): for path in self._validate_search_files(search_files):
try: try:
assert "+" in self.lib_ldf_mode assert "+" in self.lib_ldf_mode
incs = self.env.File(path).get_found_includes( incs = LibBuilderBase.CCONDITIONAL_SCANNER(
self.env, LibBuilderBase.ADVANCED_SCANNER, self.env.File(path), self.env, tuple(include_dirs))
tuple(include_dirs))
except Exception as e: # pylint: disable=broad-except except Exception as e: # pylint: disable=broad-except
if self.verbose and "+" in self.lib_ldf_mode: if self.verbose and "+" in self.lib_ldf_mode:
sys.stderr.write( sys.stderr.write(
"Warning! Classic Pre Processor is used for `%s`, " "Warning! Classic Pre Processor is used for `%s`, "
"advanced has failed with `%s`\n" % (path, e)) "advanced has failed with `%s`\n" % (path, e))
_incs = self.env.File(path).get_found_includes( _incs = LibBuilderBase.CLASSIC_SCANNER(
self.env, LibBuilderBase.CLASSIC_SCANNER, self.env.File(path), self.env, tuple(include_dirs))
tuple(include_dirs))
incs = [] incs = []
for inc in _incs: for inc in _incs:
incs.append(inc) incs.append(inc)

2
platformio/managers/core.py
View File

@ -25,7 +25,7 @@ CORE_PACKAGES = {
"contrib-pysite": ">=0.1.2,<2", "contrib-pysite": ">=0.1.2,<2",
"tool-pioplus": ">=0.13.3,<2", "tool-pioplus": ">=0.13.3,<2",
"tool-unity": "~1.20302.1", "tool-unity": "~1.20302.1",
"tool-scons": "~3.20501.2" "tool-scons": ">=3.30000.0,<4"
} }
PIOPLUS_AUTO_UPDATES_MAX = 100 PIOPLUS_AUTO_UPDATES_MAX = 100