djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mpy-cross/mpy_cross: Fix default path to mpy-cross binary.

Browse Source 
Needed to be updated to use build/mpy-cross.

Also fixes some other issues in the Python wrapper:
 - Rename find_mpy_cross_binary to _find_mpy_cross_binary
 - Fix passing of -march arg.
 - Decode stdout from subprocess.
 - Print stdout from mpy-cross in __main__.py.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared 2022-09-28 01:04:05 +10:00
parent bdbc44474f
commit 71050870b8
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mpy-cross/mpy_cross/__init__.py
View File

@ -62,9 +62,11 @@ class CrossCompileError(Exception):
def find_mpy_cross_binary(mpy_cross):
def _find_mpy_cross_binary(mpy_cross):
if mpy_cross:
return mpy_cross
return os.path.abspath(os.path.join(os.path.dirname(__file__), "../mpy-cross"))
return os.path.abspath(os.path.join(os.path.dirname(__file__), "../build/mpy-cross"))
def compile(src, dest=None, src_path=None, opt=None, march=None, mpy_cross=None, extra_args=None):
@ -82,7 +84,7 @@ def compile(src, dest=None, src_path=None, opt=None, march=None, mpy_cross=None,
args += ["-o", dest]
if march:
args += ["-march", march]
args += ["-march=" + march]
if opt is not None:
args += ["-O{}".format(opt)]
@ -96,7 +98,7 @@ def compile(src, dest=None, src_path=None, opt=None, march=None, mpy_cross=None,
def run(args, mpy_cross=None):
mpy_cross = find_mpy_cross_binary(mpy_cross)
mpy_cross = _find_mpy_cross_binary(mpy_cross)
if not os.path.exists(mpy_cross):
raise CrossCompileError("mpy-cross binary not found at {}.".format(mpy_cross))
@ -108,6 +110,6 @@ def run(args, mpy_cross=None):
pass
try:
subprocess.check_output([mpy_cross] + args, stderr=subprocess.STDOUT)
return subprocess.check_output([mpy_cross] + args, stderr=subprocess.STDOUT).decode()
except subprocess.CalledProcessError as er:
raise CrossCompileError(er.output)
raise CrossCompileError(er.output.decode())

2
mpy-cross/mpy_cross/__main__.py
View File

@ -32,7 +32,7 @@ import sys
from . import run, CrossCompileError
try:
run(sys.argv[1:])
print(run(sys.argv[1:]))
except CrossCompileError as er:
print(er.args[0], file=sys.stderr)
raise SystemExit(1)