a59eafbc9d
* fix sdmmc config * Fix warnings in EEPROM from @Curclamas * remove leftover TAG in EEPROM * Initial add of @stickbreaker i2c * Add log_n * fix warnings when log is off * i2c code clean up and reorganization * add flags to interrupt allocator * fix sdmmc config * Fix warnings in EEPROM from @Curclamas * remove leftover TAG in EEPROM * fix errors with latest IDF * fix debug optimization (#1365) incorrect optimization for debugging tick markers. * Fix some missing BT header * Change BTSerial log calls * Update BLE lib * Arduino-ESP32 release management scripted (#1515) * Calculate an absolute path for a custom partitions table (#1452) * * Arduino-ESP32 release management scripted (ready-to-merge) * * secure env for espressif/arduino-esp32 * * build tests enabled * gitter webhook enabled * * gitter room link fixed * better comment * * filepaths fixed * BT Serial adjustments * * don't run sketch builds & tests for tagged builds * Return false from WiFi.hostByName() if hostname is not resolved * Free BT Memory when BT is not used * WIFI_MODE_NULL is not supported anymore * Select some key examples to build with PlatformIO to save some time * Update BLE lib * Fixed BLE lib * Major WiFi overhaul - auto reconnect on connection loss now works - moved to event groups - some code clean up and procedure optimizations - new methods to get a more elaborate system ststus * Add cmake tests to travis * Add initial AsyncUDP * Add NetBIOS lib and fix CMake includes * Add Initial WebServer * Fix WebServer and examples * travis not quiting on build fail * Try different travis build * Update IDF to aaf1239 * Fix WPS Example * fix script permission and add some fail tests to sketch builder * Add missing space in WiFiClient::write(Stream &stream)
79 lines
2.9 KiB
Python
79 lines
2.9 KiB
Python
#!/usr/bin/env python
|
|
# This script merges two Arduino Board Manager package json files.
|
|
# Usage:
|
|
# python merge_packages.py package_esp8266com_index.json version/new/package_esp8266com_index.json
|
|
# Written by Ivan Grokhotkov, 2015
|
|
#
|
|
from __future__ import print_function
|
|
from distutils.version import LooseVersion
|
|
import re
|
|
import json
|
|
import sys
|
|
|
|
def load_package(filename):
|
|
pkg = json.load(open(filename))['packages'][0]
|
|
print("Loaded package {0} from {1}".format(pkg['name'], filename), file=sys.stderr)
|
|
print("{0} platform(s), {1} tools".format(len(pkg['platforms']), len(pkg['tools'])), file=sys.stderr)
|
|
return pkg
|
|
|
|
def merge_objects(versions, obj):
|
|
for o in obj:
|
|
name = o['name'].encode('ascii')
|
|
ver = o['version'].encode('ascii')
|
|
if not name in versions:
|
|
print("found new object, {0}".format(name), file=sys.stderr)
|
|
versions[name] = {}
|
|
if not ver in versions[name]:
|
|
print("found new version {0} for object {1}".format(ver, name), file=sys.stderr)
|
|
versions[name][ver] = o
|
|
return versions
|
|
|
|
# Normalize ESP release version string (x.x.x) by adding '-rc<MAXINT>' (x.x.x-rc9223372036854775807) to ensure having REL above any RC
|
|
# Dummy approach, functional anyway for current ESP package versioning (unlike NormalizedVersion/LooseVersion/StrictVersion & similar crap)
|
|
def pkgVersionNormalized(versionString):
|
|
|
|
verStr = str(versionString)
|
|
verParts = re.split('\.|-rc', verStr, flags=re.IGNORECASE)
|
|
|
|
if len(verParts) == 3:
|
|
verStr = str(versionString) + '-rc' + str(sys.maxint)
|
|
elif len(verParts) != 4:
|
|
print("pkgVersionNormalized WARNING: unexpected version format: {0})".format(verStr), file=sys.stderr)
|
|
|
|
return verStr
|
|
|
|
|
|
def main(args):
|
|
if len(args) < 3:
|
|
print("Usage: {0} <package1> <package2>".format(args[0]), file=sys.stderr)
|
|
return 1
|
|
|
|
tools = {}
|
|
platforms = {}
|
|
pkg1 = load_package(args[1])
|
|
tools = merge_objects(tools, pkg1['tools']);
|
|
platforms = merge_objects(platforms, pkg1['platforms']);
|
|
pkg2 = load_package(args[2])
|
|
tools = merge_objects(tools, pkg2['tools']);
|
|
platforms = merge_objects(platforms, pkg2['platforms']);
|
|
|
|
pkg1['tools'] = []
|
|
pkg1['platforms'] = []
|
|
|
|
for name in tools:
|
|
for version in tools[name]:
|
|
print("Adding tool {0}-{1}".format(name, version), file=sys.stderr)
|
|
pkg1['tools'].append(tools[name][version])
|
|
|
|
for name in platforms:
|
|
for version in platforms[name]:
|
|
print("Adding platform {0}-{1}".format(name, version), file=sys.stderr)
|
|
pkg1['platforms'].append(platforms[name][version])
|
|
|
|
pkg1['platforms'] = sorted(pkg1['platforms'], key=lambda k: LooseVersion(pkgVersionNormalized(k['version'])), reverse=True)
|
|
|
|
json.dump({'packages':[pkg1]}, sys.stdout, indent=2)
|
|
|
|
if __name__ == '__main__':
|
|
sys.exit(main(sys.argv))
|