From abd02570f49ed42ca63c1774a0b4a5907a5621f7 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Tue, 25 Aug 2015 16:45:12 +0300 Subject: [PATCH] Use toolchain's includes pattern "include*" for Project Generator // Resolve #277 --- HISTORY.rst | 2 ++ platformio/__init__.py | 2 +- platformio/builder/tools/piomisc.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 9d616f9f..52b406e4 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -29,6 +29,8 @@ PlatformIO 2.0 (`issue #272 `_) * Generate "readme.txt" for project "lib" directory (`issue #273 `_) +* Use toolchain's includes pattern ``include*`` for Project Generator + (`issue #277 `_) * Fixed includes list for Windows OS when generating project for `Eclipse IDE `__ (`issue #270 `_) * Fixed ``AttributeError: 'module' object has no attribute 'packages'`` diff --git a/platformio/__init__.py b/platformio/__init__.py index c2a8a344..8b0740cd 100644 --- a/platformio/__init__.py +++ b/platformio/__init__.py @@ -1,7 +1,7 @@ # Copyright (C) Ivan Kravets # See LICENSE for details. -VERSION = (2, 3, "0a2") +VERSION = (2, 3, "0a3") __version__ = ".".join([str(s) for s in VERSION]) __title__ = "platformio" diff --git a/platformio/builder/tools/piomisc.py b/platformio/builder/tools/piomisc.py index fb3f3fca..de64d606 100644 --- a/platformio/builder/tools/piomisc.py +++ b/platformio/builder/tools/piomisc.py @@ -135,8 +135,8 @@ def DumpIDEData(env): toolchain_dir = env.subst( join("$PIOPACKAGES_DIR", "$PIOPACKAGE_TOOLCHAIN")) toolchain_incglobs = [ - join(toolchain_dir, "*", "include"), - join(toolchain_dir, "lib", "gcc", "*", "*", "include") + join(toolchain_dir, "*", "include*"), + join(toolchain_dir, "lib", "gcc", "*", "*", "include*") ] for g in toolchain_incglobs: data['includes'].extend(glob(g))