8000 Usability: Improve "tools/mpy_cross_all" to invoke the "mpy-cross" program coming from the mpy_cross distribution by amotl · Pull Request #4956 · micropython/micropython · GitHub
[go: up one dir, main page]
Skip to content
8000

Usability: Improve "tools/mpy_cross_all" to invoke the "mpy-cross" program coming from the mpy_cross distribution #4956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Usability: Improve "tools/mpy_cross_all" to invoke the "mpy-cross" program coming from the mpy_cross distribution #4956

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
557e43b
tools/mpy_cross_all: Run "mpy-cross" through the mpy_cross distribution
amotl Jul 28, 2019
762ab8a
Add more target opts
amotl Sep 21, 2019
5699249
Add "pycom" target option
amotl Sep 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 87 additions & 22 deletions tools/mpy_cross_all.py
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,103 @@
#!/usr/bin/env python3
import argparse
#
# Motivation
# - https://github.com/micropython/micropython/issues/3040
# - https://github.com/micropython/micropython/pull/3057
# - https://github.com/micropython/micropython/issues/4955
#
import os
import os.path
import argparse
import shlex
import subprocess

try:
import mpy_cross
USE_MPY_CROSS_WRAPPER = True
except ImportError:
USE_MPY_CROSS_WRAPPER = False

argparser = argparse.ArgumentParser(description="Compile all .py files to .mpy recursively")
argparser.add_argument("-o", "--out", help="output directory (default: input dir)")
argparser.add_argument("--target", help="select MicroPython target config")
argparser.add_argument("-mcache-lookup-bc", action="store_true", help="cache map lookups in the bytecode")
argparser.add_argument("dir", help="input directory")
args = argparser.parse_args()

TARGET_OPTS = {
"unix": "-mcache-lookup-bc",
"baremetal": "",
"pycom": "",
"bytecode": "-X emit=bytecode",
"native": "-X emit=native",
"viper": "-X emit=viper",
}

args.dir = args.dir.rstrip("/")

if not args.out:
args.out = args.dir
def read_args():
argparser = argparse.ArgumentParser(description="Compile all .py files to .mpy recursively")
argparser.add_argument("-o", "--out", help="output directory (default: input dir)")
argparser.add_argument("--target", help="select MicroPython target config")
argparser.add_argument("-mcache-lookup-bc", action="store_true", help="cache map lookups in the bytecode")
argparser.add_argument("dir", help="input directory")
args = argparser.parse_args()

args.dir = args.dir.rstrip("/")

if not args.out:
args.out = args.dir

return args


def invoke_mpy_cross(arglist):

# MicroPython mpy-cross distribution
# https://pypi.org/project/mpy-cross/
if USE_MPY_CROSS_WRAPPER:
mpy_cross_args = shlex.split(arglist)
outcome = mpy_cross.run(*mpy_cross_args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
outcome.wait()
stdout, stderr = outcome.communicate()
if outcome.returncode != 0:
print('ERROR: Invoking "mpy_cross.run()" failed')
cmd = '{} {}'.format(mpy_cross.mpy_cross, ' '.join(mpy_cross_args))
print('ERROR: The command was: {}'.format(cmd))
print()
print('STDOUT:\n', stdout.decode())
print('STDERR:\n', stderr.decode())
raise RuntimeError('Invoking "mpy_cross.run()" failed')

# os.system(mpy-cross ...)
else:
cmd = "mpy-cross {}".format(arglist)
res = os.system(cmd)
if res != 0:
print('ERROR: Invoking "mpy-cross" directly failed')
print('ERROR: The command was: {}'.format(cmd))
raise RuntimeError('Invoking "mpy-cross" failed')

path_prefix_len = len(args.dir) + 1

for path, subdirs, files in os.walk(args.dir):
for f in files:
if f.endswith(".py"):
fpath = path + "/" + f
#print(fpath)
out_fpath = args.out + "/" + fpath[path_prefix_len:-3] + ".mpy"
def run():
args = read_args()

path_prefix_len = len(args.dir) + 1

for path, subdirs, files in os.walk(args.dir):
for filepath in files:
if not filepath.endswith(".py"):
continue

fpath_py = os.path.join(path, filepath)
fpath_mpy = fpath_py[path_prefix_len:-3] + ".mpy"

out_fpath = os.path.join(args.out, fpath_mpy)

# Create output directory gracefully.
out_dir = os.path.dirname(out_fpath)
if not os.path.isdir(out_dir):
os.makedirs(out_dir)
cmd = "mpy-cross -v -v %s -s %s %s -o %s" % (TARGET_OPTS.get(args.target, ""),
fpath[path_prefix_len:], fpath, out_fpath)
#print(cmd)
res = os.system(cmd)
assert res == 0

target_config = TARGET_OPTS.get(args.target, "")
fname = fpath_py[path_prefix_len:]

mpy_cross_args = "-v -v {target_config} -s {fname} {fpath_py} -o {out_fpath}".format(**locals())
invoke_mpy_cross(mpy_cross_args)


if __name__ == '__main__':
run()
0