From 440a2b9bc8ac1be945919c95105cb13016015705 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 5 May 2015 12:36:09 +0100 Subject: [PATCH] Fix parsing of includes for PlatformIO Library Dependency Finder // Resolve #189 --- HISTORY.rst | 14 ++++++++++++++ platformio/__init__.py | 2 +- platformio/builder/tools/platformio.py | 7 +------ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 9bbcf11f..d98e1a41 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,20 @@ Release History =============== +1.5.0 (2015-05-??) +------------------ + +* Created `PlatformIO gitter.im `_ + room + (`issue #174 `_) +* Added GDB as alternative uploader to `ststm32 `__ platform + (`issue #175 `_) +* Added `examples `__ + with preconfigured IDE projects + (`issue #154 `_) +* Fixed parsing of includes for PlatformIO Library Dependency Finder + (`issue #189 `_) + 1.4.0 (2015-04-11) ------------------ diff --git a/platformio/__init__.py b/platformio/__init__.py index 2aa935d0..0c27b955 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -1,7 +1,7 @@ # Copyright (C) Ivan Kravets # See LICENSE for details. -VERSION = (1, 4, 0) +VERSION = (1, 5, "0.dev0") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py index 8402e6e3..9a7c4a51 100644 --- a/platformio/builder/tools/platformio.py +++ b/platformio/builder/tools/platformio.py @@ -220,15 +220,10 @@ def BuildDependentLibraries(env, src_dir): # pylint: disable=R0914 return state def _parse_includes(state, node): - if node.path in state['paths']: - return state - else: - state['paths'].add(node.path) - skip_includes = ("arduino.h", "energia.h") matches = INCLUDES_RE.findall(node.get_text_contents()) for (inc_type, inc_name) in matches: - base_dir = dirname(node.path) + base_dir = dirname(node.get_abspath()) if inc_name.lower() in skip_includes: continue if join(base_dir, inc_name) in state['paths']: