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

Improve compatibility with Arduino 1.0 library format

Browse Source
This commit is contained in:
Ivan Kravets
2016-08-26 18:52:44 +03:00
parent 37dff70cd6
commit 8e09d637e7
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platformio/__init__.py
View File

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

15
platformio/builder/tools/piolib.py
View File

@ -346,21 +346,22 @@ class ArduinoLibBuilder(LibBuilderBase):
def get_inc_dirs(self, use_build_dir=False): def get_inc_dirs(self, use_build_dir=False):
inc_dirs = LibBuilderBase.get_inc_dirs(self, use_build_dir) inc_dirs = LibBuilderBase.get_inc_dirs(self, use_build_dir)
if not isdir(join(self.src_dir, "utility")): if not isdir(join(self.path, "utility")):
return inc_dirs return inc_dirs
inc_dirs.append( inc_dirs.append(
join(self.build_dir if use_build_dir else self.src_dir, "utility")) join(self.build_dir if use_build_dir else self.path, "utility"))
return inc_dirs return inc_dirs
@property @property
def src_filter(self): def src_filter(self):
if isdir(join(self.path, "src")): if isdir(join(self.path, "src")):
return LibBuilderBase.src_filter.fget(self) return LibBuilderBase.src_filter.fget(self)
src_filter = [ src_filter = []
"+<*.%s>" % ext is_utility = isdir(join(self.path, "utility"))
for ext in piotool.SRC_BUILD_EXT + piotool.SRC_HEADER_EXT for ext in piotool.SRC_BUILD_EXT + piotool.SRC_HEADER_EXT:
] src_filter.append("+<*.%s>" % ext)
src_filter.append("+<utility%s>" % sep) if is_utility:
src_filter.append("+<utility%s*.%s>" % (sep, ext))
return src_filter return src_filter
def is_framework_compatible(self, framework): def is_framework_compatible(self, framework):