Merge branch 'release/v2.10.0' into develop

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 <https://github.com/openenergymonitor/emonpi>`__,
   the OpenEnergyMonitor system

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"

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"]