From 768ac77ea2429329b08808cc5815b391f486b1f9 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 13 Jun 2016 19:46:54 +0300 Subject: [PATCH 1/2] Pass PlatformIO macros with version to libs --- platformio/builder/tools/platformio.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py index 93d6e885..863e0ef1 100644 --- a/platformio/builder/tools/platformio.py +++ b/platformio/builder/tools/platformio.py @@ -35,6 +35,11 @@ SRC_DEFAULT_FILTER = " ".join([ def BuildProgram(env): + env.Append( + CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format( + *pioversion_to_intstr())], + ) + # fix ASM handling under non-casitive OS if not case_sensitive_suffixes(".s", ".S"): env.Replace( @@ -78,8 +83,6 @@ def BuildProgram(env): env.ProcessFlags([env.get("SRC_BUILD_FLAGS", None)]) env.Append( - CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format( - *pioversion_to_intstr())], CPPPATH=["$PROJECTSRC_DIR"], LIBS=deplibs, LIBPATH=["$BUILD_DIR"] From 14f582faeb9799b325f895e689760c2bf2858a03 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 13 Jun 2016 19:49:37 +0300 Subject: [PATCH 2/2] Version bump to 2.10.0 (issues #683, #687, #688, #689, #691) --- HISTORY.rst | 4 ++-- platformio/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 27403d49..3543d3df 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -4,8 +4,8 @@ Release Notes PlatformIO 2.0 -------------- -2.9.5 (2016-06-??) -~~~~~~~~~~~~~~~~~~ +2.10.0 (2016-06-13) +~~~~~~~~~~~~~~~~~~~ * Added support for `emonPi `__, the OpenEnergyMonitor system diff --git a/platformio/__init__.py b/platformio/__init__.py index e2520348..5e508f39 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -14,7 +14,7 @@ import sys -VERSION = (2, 9, "5.dev3") +VERSION = (2, 10, 0) __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio"