Merge branch 'release/v4.0.3'

Author: ivankravets

HISTORY.rst

@@ -6,6 +6,17 @@ Release Notes
 PlatformIO 4.0
 --------------
 
+4.0.3 (2019-08-30)
+~~~~~~~~~~~~~~~~~~
+
+* Added support for multi-environment PlatformIO project for `CLion IDE <http://docs.platformio.org/page/ide/clion.html>`__ (`issue #2824 <https://github.com/platformio/platformio-core/issues/2824>`_)
+* Generate ``.ccls`` LSP file for `Vim <http://docs.platformio.org/en/page/vim.html>`__ cross references, hierarchies, completion and semantic highlighting (`issue #2952 <https://github.com/platformio/platformio-core/issues/2952>`_)
+* Added support for `PLATFORMIO_DISABLE_COLOR <http://docs.platformio.org/page/envvars.html#envvar-PLATFORMIO_DISABLE_COLOR>`__ system environment variable which disables color ANSI-codes in a terminal output (`issue #2956 <https://github.com/platformio/platformio-core/issues/2956>`_)
+* Updated SCons tool to 3.1.1
+* Remove ProjectConfig cache when "platformio.ini" was modified outside
+* Fixed an issue with PIO Unified Debugger on Windows OS when debug server is piped
+* Fixed an issue when `--upload-port <http://docs.platformio.org/page/userguide/cmd_run.html#cmdoption-platformio-run-upload-port>`__ CLI flag does not override declared  `upload_port <http://docs.platformio.org/page/projectconf/section_env_upload.html#upload-port>`__ option in `"platformio.ini" (Project Configuration File) <https://docs.platformio.org/page/projectconf.html>`__
+
 4.0.2 (2019-08-23)
 ~~~~~~~~~~~~~~~~~~
 

docs

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION = (4, 0, 2)
+VERSION = (4, 0, 3)
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"

examples

@@ -55,13 +55,15 @@ def configure():
     except (AttributeError, ImportError):
         pass
 
-    # handle PLATFORMIO_FORCE_COLOR
-    if str(os.getenv("PLATFORMIO_FORCE_COLOR", "")).lower() == "true":
-        try:
+    try:
+        if str(os.getenv("PLATFORMIO_DISABLE_COLOR", "")).lower() == "true":
+            # pylint: disable=protected-access
+            click._compat.isatty = lambda stream: False
+        elif str(os.getenv("PLATFORMIO_FORCE_COLOR", "")).lower() == "true":
             # pylint: disable=protected-access
             click._compat.isatty = lambda stream: True
-        except:  # pylint: disable=bare-except
-            pass
+    except:  # pylint: disable=bare-except
+        pass
 
     # Handle IOError issue with VSCode's Terminal (Windows)
     click_echo_origin = [click.echo, click.secho]

platformio/__init__.py

@@ -140,6 +140,8 @@ def DumpIDEData(env, projenv):
     LINTCXXCOM = "$CXXFLAGS $CCFLAGS $CPPFLAGS"
 
     data = {
+        "env_name":
+        env['PIOENV'],
         "libsource_dirs": [env.subst(l) for l in env.GetLibSourceDirs()],
         "defines":
         _dump_defines(env),

platformio/__main__.py

@@ -300,20 +300,8 @@ def get_search_files(self):
             ])
         return items
 
-    def _validate_search_files(self, search_files=None):
-        if not search_files:
-            search_files = []
-        assert isinstance(search_files, list)
-
-        _search_files = []
-        for path in search_files:
-            if path not in self._processed_files:
-                _search_files.append(path)
-                self._processed_files.append(path)
-
-        return _search_files
-
-    def _get_found_includes(self, search_files=None):
+    def _get_found_includes(  # pylint: disable=too-many-branches
+            self, search_files=None):
         # all include directories
         if not LibBuilderBase._INCLUDE_DIRS_CACHE:
             LibBuilderBase._INCLUDE_DIRS_CACHE = []
@@ -326,14 +314,23 @@ def _get_found_includes(self, search_files=None):
         include_dirs.extend(LibBuilderBase._INCLUDE_DIRS_CACHE)
 
         result = []
-        for path in self._validate_search_files(search_files):
+        for path in (search_files or []):
+            if path in self._processed_files:
+                continue
+            self._processed_files.append(path)
+
             try:
                 assert "+" in self.lib_ldf_mode
                 candidates = LibBuilderBase.CCONDITIONAL_SCANNER(
                     self.env.File(path),
                     self.env,
                     tuple(include_dirs),
                     depth=self.CCONDITIONAL_SCANNER_DEPTH)
+                # mark candidates already processed via Conditional Scanner
+                self._processed_files.extend([
+                    c.get_abspath() for c in candidates
+                    if c.get_abspath() not in self._processed_files
+                ])
             except Exception as e:  # pylint: disable=broad-except
                 if self.verbose and "+" in self.lib_ldf_mode:
                     sys.stderr.write(

platformio/builder/tools/pioide.py

@@ -32,7 +32,8 @@ def GetProjectOption(env, option, default=None):
 def LoadProjectOptions(env):
     for option, value in env.GetProjectOptions():
         option_meta = ProjectOptions.get("env." + option)
-        if not option_meta or not option_meta.buildenvvar:
+        if (not option_meta or not option_meta.buildenvvar
+                or option_meta.buildenvvar in env):
             continue
         env[option_meta.buildenvvar] = value
 

platformio/builder/tools/piolib.py

@@ -19,7 +19,7 @@
 from io import BytesIO
 from os.path import isfile
 
-from platformio import exception, util
+from platformio import exception, fs, util
 from platformio.commands.platform import \
     platform_install as cmd_platform_install
 from platformio.commands.run import cli as cmd_run
@@ -165,11 +165,11 @@ def configure_esp32_load_cmds(debug_options, configuration):
 
     mon_cmds = [
         'monitor program_esp32 "{{{path}}}" {offset} verify'.format(
-            path=item['path'], offset=item['offset'])
+            path=fs.to_unix_path(item['path']), offset=item['offset'])
         for item in configuration.get("flash_extra_images")
     ]
     mon_cmds.append('monitor program_esp32 "{%s.bin}" 0x10000 verify' %
-                    configuration['prog_path'][:-4])
+                    fs.to_unix_path(configuration['prog_path'][:-4]))
     return mon_cmds
 
 

platformio/builder/tools/pioproject.py

@@ -17,6 +17,7 @@
 import click
 from twisted.internet import protocol  # pylint: disable=import-error
 
+from platformio import fs
 from platformio.compat import string_types
 from platformio.proc import get_pythonexe_path
 from platformio.project.helpers import get_project_core_dir
@@ -38,6 +39,10 @@ def apply_patterns(self, source, patterns=None):
         _patterns = self.COMMON_PATTERNS.copy()
         _patterns.update(patterns or {})
 
+        for key, value in _patterns.items():
+            if key.endswith(("_DIR", "_PATH")):
+                _patterns[key] = fs.to_unix_path(value)
+
         def _replace(text):
             for key, value in _patterns.items():
                 pattern = "$%s" % key