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

Refactor CPPDEFINES to tuple style

Browse Source
This commit is contained in:
Ivan Kravets
2016-11-30 15:53:36 +02:00
parent 50df0bfc1c
commit 7ab393cea7
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -287,6 +287,7 @@ class LibBuilderBase(object):
except: # pylint: disable=bare-except except: # pylint: disable=bare-except
incs = self.env.File(path).get_found_includes( incs = self.env.File(path).get_found_includes(
self.env, LibBuilderBase.CLASSIC_SCANNER, tuple(inc_dirs)) self.env, LibBuilderBase.CLASSIC_SCANNER, tuple(inc_dirs))
# print path, map(lambda n: n.get_abspath(), incs)
for inc in incs: for inc in incs:
if inc not in result: if inc not in result:
result.append(inc) result.append(inc)

6
platformio/builder/tools/platformio.py
View File

@@ -35,9 +35,9 @@ SRC_FILTER_DEFAULT = ["+<*>", "-<.git%s>" % sep, "-<svn%s>" % sep]
def BuildProgram(env): def BuildProgram(env):
def _append_pio_macros(): def _append_pio_macros():
env.AppendUnique(CPPDEFINES=[ env.AppendUnique(CPPDEFINES=[(
"PLATFORMIO={0:02d}{1:02d}{2:02d}".format(*pioversion_to_intstr()) "PLATFORMIO",
]) int("{0:02d}{1:02d}{2:02d}".format(*pioversion_to_intstr())))])
_append_pio_macros() _append_pio_macros()

2
platformio/managers/platform.py
View File

@@ -477,7 +477,7 @@ class PlatformBase(PlatformPackagesMixin, PlatformRunMixin):
} }
if "tool-scons" not in self.packages: if "tool-scons" not in self.packages:
self.packages['tool-scons'] = { self.packages['tool-scons'] = {
"version": "~3.20401.2", "version": "~3.20401.3",
"optional": False "optional": False
} }