feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Handle old "espressif" platform name for LDF

Browse Source
This commit is contained in:
Ivan Kravets
2017-11-29 15:32:38 +02:00
parent 1b0776167c
commit 3c6bd9824e
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,15 +218,14 @@ class LibBuilderBase(object):
return LibBuilderBase.COMPAT_MODE_DEFAULT return LibBuilderBase.COMPAT_MODE_DEFAULT
@staticmethod @staticmethod
def items_in_list(items, ilist): def items_to_list(items):
if not isinstance(items, list):
items = [i.strip() for i in items.split(",")]
return [i.lower() for i in items if i]
def _items_to_list(items_): def items_in_list(self, items, ilist):
if not isinstance(items_, list): items = self.items_to_list(items)
items_ = [i.strip() for i in items_.split(",")] ilist = self.items_to_list(ilist)
return [i.lower() for i in items_ if i]
items = _items_to_list(items)
ilist = _items_to_list(ilist)
if "*" in items or "*" in ilist: if "*" in items or "*" in ilist:
return True return True
return set(items) & set(ilist) return set(items) & set(ilist)
@ -511,6 +510,17 @@ class PlatformIOLibBuilder(LibBuilderBase):
assert isfile(join(self.path, "library.json")) assert isfile(join(self.path, "library.json"))
manifest = util.load_json(join(self.path, "library.json")) manifest = util.load_json(join(self.path, "library.json"))
assert "name" in manifest assert "name" in manifest
# replace "espressif" dev/platform with ESP8266/ESP32
if "platforms" in manifest:
new_platforms = []
for platform in self.items_to_list(manifest['platforms']):
if platform == "espressif":
new_platforms.extend(["espressif8266", "espressif32"])
else:
new_platforms.append(platform)
manifest['platforms'] = new_platforms
return manifest return manifest
def _is_arduino_manifest(self): def _is_arduino_manifest(self):