From c5177efd0b1f5a4bd70540c3ae8640202a92636c Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Sat, 1 Jun 2019 22:24:38 +0300 Subject: [PATCH] Minor fixes --- platformio/builder/tools/piolib.py | 4 ++-- platformio/builder/tools/pioplatform.py | 22 ++++++++++------------ platformio/managers/package.py | 9 ++++----- platformio/util.py | 11 +++++------ 4 files changed, 21 insertions(+), 25 deletions(-) diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py index c7629f11..29389e38 100644 --- a/platformio/builder/tools/piolib.py +++ b/platformio/builder/tools/piolib.py @@ -1020,11 +1020,11 @@ def ConfigureProjectLibBuilder(env): ldf_mode = LibBuilderBase.lib_ldf_mode.fget(project) print("LDF: Library Dependency Finder -> http://bit.ly/configure-pio-ldf") - print("LDF Modes: Finder [%s] Compatibility [%s]" % + print("LDF Modes: Finder ~ %s, Compatibility ~ %s" % (ldf_mode, project.lib_compat_mode)) lib_builders = env.GetLibBuilders() - print("Collected %d compatible libraries" % len(lib_builders)) + print("Found %d compatible libraries" % len(lib_builders)) print("Scanning dependencies...") project.search_deps_recursive() diff --git a/platformio/builder/tools/pioplatform.py b/platformio/builder/tools/pioplatform.py index 56b27da4..a2971bce 100644 --- a/platformio/builder/tools/pioplatform.py +++ b/platformio/builder/tools/pioplatform.py @@ -117,7 +117,7 @@ def LoadPioPlatform(env): env.Replace(LDSCRIPT_PATH=board_config.get("build.ldscript")) -def PrintConfiguration(env): +def PrintConfiguration(env): # pylint: disable=too-many-statements platform = env.PioPlatform() board_config = env.BoardConfig() if "BOARD" in env else None @@ -129,7 +129,7 @@ def PrintConfiguration(env): ] def _get_plaform_data(): - data = ["PLATFORM: %s @ %s" % (platform.title, platform.version)] + data = ["PLATFORM: %s %s" % (platform.title, platform.version)] src_manifest_path = platform.pm.get_src_manifest_path( platform.get_dir()) if src_manifest_path: @@ -150,12 +150,12 @@ def PrintConfiguration(env): data.append(mcu.upper()) if f_cpu: f_cpu = int("".join([c for c in str(f_cpu) if c.isdigit()])) - data.append("%dMHz" % (f_cpu / 1000000)) + data.append("%dMHz," % (f_cpu / 1000000)) if not board_config: return data ram = board_config.get("upload", {}).get("maximum_ram_size") flash = board_config.get("upload", {}).get("maximum_size") - data.append("%s RAM [%s Flash]" % + data.append("%s RAM, %s Flash" % (util.format_filesize(ram), util.format_filesize(flash))) return data @@ -165,8 +165,8 @@ def PrintConfiguration(env): if not debug_tools: return None data = [ - "DEBUG:", - "CURRENT(%s)" % board_config.get_debug_tool_name( + "DEBUG:", "Current", + "(%s)" % board_config.get_debug_tool_name( env.GetProjectOption("debug_tool")) ] onboard = [] @@ -177,9 +177,9 @@ def PrintConfiguration(env): else: external.append(key) if onboard: - data.append("ON-BOARD(%s)" % ", ".join(sorted(onboard))) + data.extend(["On-board", "(%s)" % ", ".join(sorted(onboard))]) if external: - data.append("EXTERNAL(%s)" % ", ".join(sorted(external))) + data.extend(["External", "(%s)" % ", ".join(sorted(external))]) return data def _get_packages_data(): @@ -192,16 +192,14 @@ def PrintConfiguration(env): continue manifest = platform.pm.load_manifest(pkg_dir) original_version = util.get_original_version(manifest['version']) - info = "%s %s %s" % (manifest['name'], - "#" if "__src_url" in manifest else "@", - manifest['version']) + info = "%s %s" % (manifest['name'], manifest['version']) extra = [] if original_version: extra.append(original_version) if "__src_url" in manifest and int(ARGUMENTS.get("PIOVERBOSE", 0)): extra.append(manifest['__src_url']) if extra: - info += "(%s)" % ", ".join(extra) + info += " (%s)" % ", ".join(extra) data.append(info) return ["PACKAGES:", ", ".join(data)] diff --git a/platformio/managers/package.py b/platformio/managers/package.py index 3e9495e7..fc3f4105 100644 --- a/platformio/managers/package.py +++ b/platformio/managers/package.py @@ -741,11 +741,10 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin): action="Install", label=manifest['name']) - if not silent: - click.secho( - "{name} @ {version} has been successfully installed!". - format(**manifest), - fg="green") + click.secho( + "{name} @ {version} has been successfully installed!".format( + **manifest), + fg="green") return pkg_dir diff --git a/platformio/util.py b/platformio/util.py index a7657526..e07ce391 100644 --- a/platformio/util.py +++ b/platformio/util.py @@ -507,13 +507,12 @@ def ensure_udev_rules(): def get_original_version(version): if version.count(".") != 2: return None - _, y = version.split(".")[:2] - if int(y) < 100: + _, raw = version.split(".")[:2] + if int(raw) <= 99: return None - if len(y) % 2 != 0: - y = "0" + y - parts = [str(int(y[i * 2:i * 2 + 2])) for i in range(int(len(y) / 2))] - return ".".join(parts) + if int(raw) <= 999: + return "%s.%s" % (raw[:-2], int(raw[-2:])) + return "%s.%s.%s" % (raw[:-4], int(raw[-4:-2]), int(raw[-2:])) def rmtree_(path):