From a7a82b1c0a69d25ec4bb884b4e61d548d79c7ac7 Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Tue, 1 Dec 2015 16:28:47 +0200
Subject: [PATCH] Fix PlatformIO version

---
 platformio/__init__.py                 | 2 +-
 platformio/builder/main.py             | 6 ++++++
 platformio/builder/tools/platformio.py | 7 -------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/platformio/__init__.py b/platformio/__init__.py
index f640b554..4c2ddbb9 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.b1")
+VERSION = (2, 4, "0b1")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/builder/main.py b/platformio/builder/main.py
index b3c1b34a..5b45692e 100644
--- a/platformio/builder/main.py
+++ b/platformio/builder/main.py
@@ -114,6 +114,12 @@ 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 c9e82a22..ec9d4049 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -23,8 +23,6 @@ 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([
@@ -73,11 +71,6 @@ 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(