forked from platformio/platformio-core
Minor fixes
This commit is contained in:
@ -1020,11 +1020,11 @@ def ConfigureProjectLibBuilder(env):
|
|||||||
ldf_mode = LibBuilderBase.lib_ldf_mode.fget(project)
|
ldf_mode = LibBuilderBase.lib_ldf_mode.fget(project)
|
||||||
|
|
||||||
print("LDF: Library Dependency Finder -> http://bit.ly/configure-pio-ldf")
|
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))
|
(ldf_mode, project.lib_compat_mode))
|
||||||
|
|
||||||
lib_builders = env.GetLibBuilders()
|
lib_builders = env.GetLibBuilders()
|
||||||
print("Collected %d compatible libraries" % len(lib_builders))
|
print("Found %d compatible libraries" % len(lib_builders))
|
||||||
|
|
||||||
print("Scanning dependencies...")
|
print("Scanning dependencies...")
|
||||||
project.search_deps_recursive()
|
project.search_deps_recursive()
|
||||||
|
@ -117,7 +117,7 @@ def LoadPioPlatform(env):
|
|||||||
env.Replace(LDSCRIPT_PATH=board_config.get("build.ldscript"))
|
env.Replace(LDSCRIPT_PATH=board_config.get("build.ldscript"))
|
||||||
|
|
||||||
|
|
||||||
def PrintConfiguration(env):
|
def PrintConfiguration(env): # pylint: disable=too-many-statements
|
||||||
platform = env.PioPlatform()
|
platform = env.PioPlatform()
|
||||||
board_config = env.BoardConfig() if "BOARD" in env else None
|
board_config = env.BoardConfig() if "BOARD" in env else None
|
||||||
|
|
||||||
@ -129,7 +129,7 @@ def PrintConfiguration(env):
|
|||||||
]
|
]
|
||||||
|
|
||||||
def _get_plaform_data():
|
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(
|
src_manifest_path = platform.pm.get_src_manifest_path(
|
||||||
platform.get_dir())
|
platform.get_dir())
|
||||||
if src_manifest_path:
|
if src_manifest_path:
|
||||||
@ -150,12 +150,12 @@ def PrintConfiguration(env):
|
|||||||
data.append(mcu.upper())
|
data.append(mcu.upper())
|
||||||
if f_cpu:
|
if f_cpu:
|
||||||
f_cpu = int("".join([c for c in str(f_cpu) if c.isdigit()]))
|
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:
|
if not board_config:
|
||||||
return data
|
return data
|
||||||
ram = board_config.get("upload", {}).get("maximum_ram_size")
|
ram = board_config.get("upload", {}).get("maximum_ram_size")
|
||||||
flash = board_config.get("upload", {}).get("maximum_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)))
|
(util.format_filesize(ram), util.format_filesize(flash)))
|
||||||
return data
|
return data
|
||||||
|
|
||||||
@ -165,8 +165,8 @@ def PrintConfiguration(env):
|
|||||||
if not debug_tools:
|
if not debug_tools:
|
||||||
return None
|
return None
|
||||||
data = [
|
data = [
|
||||||
"DEBUG:",
|
"DEBUG:", "Current",
|
||||||
"CURRENT(%s)" % board_config.get_debug_tool_name(
|
"(%s)" % board_config.get_debug_tool_name(
|
||||||
env.GetProjectOption("debug_tool"))
|
env.GetProjectOption("debug_tool"))
|
||||||
]
|
]
|
||||||
onboard = []
|
onboard = []
|
||||||
@ -177,9 +177,9 @@ def PrintConfiguration(env):
|
|||||||
else:
|
else:
|
||||||
external.append(key)
|
external.append(key)
|
||||||
if onboard:
|
if onboard:
|
||||||
data.append("ON-BOARD(%s)" % ", ".join(sorted(onboard)))
|
data.extend(["On-board", "(%s)" % ", ".join(sorted(onboard))])
|
||||||
if external:
|
if external:
|
||||||
data.append("EXTERNAL(%s)" % ", ".join(sorted(external)))
|
data.extend(["External", "(%s)" % ", ".join(sorted(external))])
|
||||||
return data
|
return data
|
||||||
|
|
||||||
def _get_packages_data():
|
def _get_packages_data():
|
||||||
@ -192,16 +192,14 @@ def PrintConfiguration(env):
|
|||||||
continue
|
continue
|
||||||
manifest = platform.pm.load_manifest(pkg_dir)
|
manifest = platform.pm.load_manifest(pkg_dir)
|
||||||
original_version = util.get_original_version(manifest['version'])
|
original_version = util.get_original_version(manifest['version'])
|
||||||
info = "%s %s %s" % (manifest['name'],
|
info = "%s %s" % (manifest['name'], manifest['version'])
|
||||||
"#" if "__src_url" in manifest else "@",
|
|
||||||
manifest['version'])
|
|
||||||
extra = []
|
extra = []
|
||||||
if original_version:
|
if original_version:
|
||||||
extra.append(original_version)
|
extra.append(original_version)
|
||||||
if "__src_url" in manifest and int(ARGUMENTS.get("PIOVERBOSE", 0)):
|
if "__src_url" in manifest and int(ARGUMENTS.get("PIOVERBOSE", 0)):
|
||||||
extra.append(manifest['__src_url'])
|
extra.append(manifest['__src_url'])
|
||||||
if extra:
|
if extra:
|
||||||
info += "(%s)" % ", ".join(extra)
|
info += " (%s)" % ", ".join(extra)
|
||||||
data.append(info)
|
data.append(info)
|
||||||
return ["PACKAGES:", ", ".join(data)]
|
return ["PACKAGES:", ", ".join(data)]
|
||||||
|
|
||||||
|
@ -741,11 +741,10 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin):
|
|||||||
action="Install",
|
action="Install",
|
||||||
label=manifest['name'])
|
label=manifest['name'])
|
||||||
|
|
||||||
if not silent:
|
click.secho(
|
||||||
click.secho(
|
"{name} @ {version} has been successfully installed!".format(
|
||||||
"{name} @ {version} has been successfully installed!".
|
**manifest),
|
||||||
format(**manifest),
|
fg="green")
|
||||||
fg="green")
|
|
||||||
|
|
||||||
return pkg_dir
|
return pkg_dir
|
||||||
|
|
||||||
|
@ -507,13 +507,12 @@ def ensure_udev_rules():
|
|||||||
def get_original_version(version):
|
def get_original_version(version):
|
||||||
if version.count(".") != 2:
|
if version.count(".") != 2:
|
||||||
return None
|
return None
|
||||||
_, y = version.split(".")[:2]
|
_, raw = version.split(".")[:2]
|
||||||
if int(y) < 100:
|
if int(raw) <= 99:
|
||||||
return None
|
return None
|
||||||
if len(y) % 2 != 0:
|
if int(raw) <= 999:
|
||||||
y = "0" + y
|
return "%s.%s" % (raw[:-2], int(raw[-2:]))
|
||||||
parts = [str(int(y[i * 2:i * 2 + 2])) for i in range(int(len(y) / 2))]
|
return "%s.%s.%s" % (raw[:-4], int(raw[-4:-2]), int(raw[-2:]))
|
||||||
return ".".join(parts)
|
|
||||||
|
|
||||||
|
|
||||||
def rmtree_(path):
|
def rmtree_(path):
|
||||||
|
Reference in New Issue
Block a user