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

Merge branch 'release/v2.10.0' into develop

Browse Source
This commit is contained in:
Ivan Kravets
2016-06-13 19:49:55 +03:00
parent f75a7c91eb 14f582faeb
commit 2b6ba32b2c
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY.rst
View File

@ -4,8 +4,8 @@ Release Notes
PlatformIO 2.0 PlatformIO 2.0
-------------- --------------
2.9.5 (2016-06-??) 2.10.0 (2016-06-13)
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~
* Added support for `emonPi <https://github.com/openenergymonitor/emonpi>`__, * Added support for `emonPi <https://github.com/openenergymonitor/emonpi>`__,
the OpenEnergyMonitor system the OpenEnergyMonitor system

2
platformio/__init__.py
View File

@ -14,7 +14,7 @@
import sys import sys
VERSION = (2, 9, "5.dev3") VERSION = (2, 10, 0)
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

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

@ -35,6 +35,11 @@ SRC_DEFAULT_FILTER = " ".join([
def BuildProgram(env): def BuildProgram(env):
env.Append(
CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format(
*pioversion_to_intstr())],
)
# fix ASM handling under non-casitive OS # fix ASM handling under non-casitive OS
if not case_sensitive_suffixes(".s", ".S"): if not case_sensitive_suffixes(".s", ".S"):
env.Replace( env.Replace(
@ -78,8 +83,6 @@ def BuildProgram(env):
env.ProcessFlags([env.get("SRC_BUILD_FLAGS", None)]) env.ProcessFlags([env.get("SRC_BUILD_FLAGS", None)])
env.Append( env.Append(
CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format(
*pioversion_to_intstr())],
CPPPATH=["$PROJECTSRC_DIR"], CPPPATH=["$PROJECTSRC_DIR"],
LIBS=deplibs, LIBS=deplibs,
LIBPATH=["$BUILD_DIR"] LIBPATH=["$BUILD_DIR"]