From 84e82dd39add1699a43b2af9b9e757b7a418ed96 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 1 Dec 2015 19:00:40 +0200
Subject: [PATCH] Restore PLATFORMIO macros with the current version

---
 HISTORY.rst                            | 5 +++++
 platformio/__init__.py                 | 2 +-
 platformio/builder/main.py             | 6 ------
 platformio/builder/tools/platformio.py | 7 +++++++
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index 652cbffd..90b5e16e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,6 +4,11 @@ Release History
 PlatformIO 2.0
 --------------
 
+2.4.1 (2015-12-??)
+~~~~~~~~~~~~~~~~~~
+
+* Restored ``PLATFORMIO`` macros with the current version
+
 2.4.0 (2015-12-01)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/platformio/__init__.py b/platformio/__init__.py
index 0ef276d8..b8b332f9 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = (2, 4, 0)
+VERSION = (2, 4, "1.dev0")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/main.py b/platformio/builder/main.py
index 5b45692e..b3c1b34a 100644
--- a/platformio/builder/main.py
+++ b/platformio/builder/main.py
@@ -114,12 +114,6 @@ DefaultEnvironment(
 
 env = DefaultEnvironment()
 
-# Append PlatformIO version
-env.Append(
-    CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format(
-        *util.pioversion_to_intstr())]
-)
-
 if "BOARD" in env:
     try:
         env.Replace(BOARD_OPTIONS=util.get_boards(env.subst("$BOARD")))
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index ec9d4049..c9e82a22 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -23,6 +23,8 @@ from SCons.Script import (COMMAND_LINE_TARGETS, DefaultEnvironment, Exit,
                           SConscript)
 from SCons.Util import case_sensitive_suffixes
 
+from platformio.util import pioversion_to_intstr
+
 SRC_BUILD_EXT = ["c", "cpp", "S", "spp", "SPP", "sx", "s", "asm", "ASM"]
 SRC_HEADER_EXT = ["h", "hpp"]
 SRC_DEFAULT_FILTER = " ".join([
@@ -71,6 +73,11 @@ def BuildProgram(env):
         getenv("PLATFORMIO_SRC_BUILD_FLAGS"),
     ])
 
+    env.Append(
+        CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format(
+            *pioversion_to_intstr())]
+    )
+
     return env.Program(
         join("$BUILD_DIR", env.subst("$PROGNAME")),
         env.LookupSources(