Merge branch 'release/v2.10.3'

HISTORY.rst

@@ -4,6 +4,11 @@ Release Notes
 PlatformIO 2.0
 --------------
 
+2.10.3 (2016-06-15)
+~~~~~~~~~~~~~~~~~~~
+
+* Fixed issue with ``platformio init --ide`` command
+
 2.10.2 (2016-06-15)
 ~~~~~~~~~~~~~~~~~~~
 

platformio/__init__.py

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

platformio/builder/tools/platformio.py

@@ -36,7 +36,9 @@ SRC_DEFAULT_FILTER = " ".join([
 def BuildProgram(env):
 
     def _append_pio_macros():
-        env.AppendUnique(
+        if any(["PLATFORMIO=" in str(d) for d in env.get("CPPDEFINES", [])]):
+            return
+        env.Append(
             CPPDEFINES=["PLATFORMIO={0:02d}{1:02d}{2:02d}".format(
                 *pioversion_to_intstr())],
         )

tests/commands/test_init.py

@@ -42,6 +42,14 @@ def test_init_ext_folder(platformio_setup, clirunner, validate_cliresult):
         validate_pioproject(join(getcwd(), ext_folder_name))
 
 
+def test_init_ide_eclipse(platformio_setup, clirunner, validate_cliresult):
+    with clirunner.isolated_filesystem():
+        result = clirunner.invoke(cli, ["-b", "uno", "--ide", "eclipse"])
+        validate_cliresult(result)
+        validate_pioproject(getcwd())
+        assert all([isfile(f) for f in (".cproject", ".project")])
+
+
 def test_init_special_board(platformio_setup, clirunner, validate_cliresult):
     with clirunner.isolated_filesystem():
         result = clirunner.invoke(cli, ["-b", "uno"])