platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-31 18:44:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling symbolic links within source code directory // Resolve #190

Browse Source
This commit is contained in:
Ivan Kravets
2015-05-08 18:09:35 +01:00
parent 1a39781cff
commit e960302b6d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY.rst
View File

@@ -11,6 +11,8 @@ Release History
(`issue #154 <https://github.com/platformio/platformio/issues/154>`_) (`issue #154 <https://github.com/platformio/platformio/issues/154>`_)
* Fixed parsing of includes for PlatformIO Library Dependency Finder * Fixed parsing of includes for PlatformIO Library Dependency Finder
(`issue #189 <https://github.com/platformio/platformio/issues/189>`_) (`issue #189 <https://github.com/platformio/platformio/issues/189>`_)
* Fixed handling symbolic links within source code directory
(`issue #190 <https://github.com/platformio/platformio/issues/190>`_)
* Fixed cancelling any previous definition of name, either built in or provided * Fixed cancelling any previous definition of name, either built in or provided
with a ``-D`` option with a ``-D`` option
(`issue #191 <https://github.com/platformio/platformio/issues/191>`_) (`issue #191 <https://github.com/platformio/platformio/issues/191>`_)

4
platformio/builder/tools/platformio.py
View File

@@ -95,7 +95,7 @@ def VariantDirRecursive(env, variant_dir, src_dir, duplicate=True,
ignore_pattern = (".git", ".svn") ignore_pattern = (".git", ".svn")
variants = [] variants = []
src_dir = env.subst(src_dir) src_dir = env.subst(src_dir)
for root, _, _ in walk(src_dir): for root, _, _ in walk(src_dir, followlinks=True):
_src_dir = root _src_dir = root
_var_dir = variant_dir + root.replace(src_dir, "") _var_dir = variant_dir + root.replace(src_dir, "")
if any([s in _var_dir.lower() for s in ignore_pattern]): if any([s in _var_dir.lower() for s in ignore_pattern]):
@@ -224,7 +224,7 @@ def BuildDependentLibraries(env, src_dir): # pylint: disable=R0914
return result return result
def _process_src_dir(state, src_dir): def _process_src_dir(state, src_dir):
for root, _, _ in walk(src_dir): for root, _, _ in walk(src_dir, followlinks=True):
for node in (env.GlobCXXFiles(root) + for node in (env.GlobCXXFiles(root) +
env.Glob(join(root, "*.h"))): env.Glob(join(root, "*.h"))):
state = _parse_includes(state, node) state = _parse_includes(state, node)