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

Improve support for "library.properties" manifest

Browse Source
This commit is contained in:
Ivan Kravets
2016-08-23 13:40:32 +03:00
parent 81d3b7fd11
commit 5a63060699
2 changed files with 10 additions and 4 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, "0a6") VERSION = (3, 0, "0a7")
__version__ = ".".join([str(s) for s in VERSION]) __version__ = ".".join([str(s) for s in VERSION])
__title__ = "platformio" __title__ = "platformio"

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

@ -33,7 +33,9 @@ class LibBuilderFactory(object):
@staticmethod @staticmethod
def new(env, path): def new(env, path):
clsname = "UnknownLibBuilder" clsname = "UnknownLibBuilder"
if isfile(join(path, "library.json")): if isfile(join(path, "library.properties")):
clsname = "ArduinoLibBuilder"
elif isfile(join(path, "library.json")):
clsname = "PlatformIOLibBuilder" clsname = "PlatformIOLibBuilder"
else: else:
env_frameworks = [ env_frameworks = [
@ -354,8 +356,12 @@ class ArduinoLibBuilder(LibBuilderBase):
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)
return ["+<*.%s>" % ext src_filter = [
for ext in piotool.SRC_BUILD_EXT + piotool.SRC_HEADER_EXT] "+<*.%s>" % ext
for ext in piotool.SRC_BUILD_EXT + piotool.SRC_HEADER_EXT
]
src_filter.append("+<utility%s>" + sep)
return src_filter
def is_framework_compatible(self, framework): def is_framework_compatible(self, framework):
return framework.lower() in ("arduino", "energia") return framework.lower() in ("arduino", "energia")