Fix parsing logic of deploy.py script
This commit is contained in:
34
deploy.py
34
deploy.py
@@ -255,7 +255,6 @@ class RemoveConstAction(argparse.Action):
|
|||||||
class OpenSKInstaller:
|
class OpenSKInstaller:
|
||||||
|
|
||||||
def __init__(self, args):
|
def __init__(self, args):
|
||||||
colorama.init()
|
|
||||||
self.args = args
|
self.args = args
|
||||||
# Where all the TAB files should go
|
# Where all the TAB files should go
|
||||||
self.tab_folder = os.path.join("target", "tab")
|
self.tab_folder = os.path.join("target", "tab")
|
||||||
@@ -617,18 +616,6 @@ class OpenSKInstaller:
|
|||||||
assert_python_library("intelhex")
|
assert_python_library("intelhex")
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
if self.args.listing == "boards":
|
|
||||||
print(os.linesep.join(get_supported_boards()))
|
|
||||||
return 0
|
|
||||||
|
|
||||||
if self.args.listing == "programmers":
|
|
||||||
print(os.linesep.join(PROGRAMMERS))
|
|
||||||
return 0
|
|
||||||
|
|
||||||
if self.args.listing:
|
|
||||||
# Missing check?
|
|
||||||
fatal("Listing {} is not implemented.".format(self.args.listing))
|
|
||||||
|
|
||||||
self.check_prerequisites()
|
self.check_prerequisites()
|
||||||
self.update_rustc_if_needed()
|
self.update_rustc_if_needed()
|
||||||
|
|
||||||
@@ -726,9 +713,23 @@ class OpenSKInstaller:
|
|||||||
|
|
||||||
|
|
||||||
def main(args):
|
def main(args):
|
||||||
|
colorama.init()
|
||||||
|
|
||||||
# Make sure the current working directory is the right one before running
|
# Make sure the current working directory is the right one before running
|
||||||
os.chdir(os.path.realpath(os.path.dirname(__file__)))
|
os.chdir(os.path.realpath(os.path.dirname(__file__)))
|
||||||
|
|
||||||
|
if args.listing == "boards":
|
||||||
|
print(os.linesep.join(get_supported_boards()))
|
||||||
|
return 0
|
||||||
|
|
||||||
|
if args.listing == "programmers":
|
||||||
|
print(os.linesep.join(PROGRAMMERS))
|
||||||
|
return 0
|
||||||
|
|
||||||
|
if args.listing:
|
||||||
|
# Missing check?
|
||||||
|
fatal("Listing {} is not implemented.".format(args.listing))
|
||||||
|
|
||||||
OpenSKInstaller(args).run()
|
OpenSKInstaller(args).run()
|
||||||
|
|
||||||
|
|
||||||
@@ -872,7 +873,12 @@ if __name__ == "__main__":
|
|||||||
help=("When set, the output of elf2tab is appended to this file."),
|
help=("When set, the output of elf2tab is appended to this file."),
|
||||||
)
|
)
|
||||||
|
|
||||||
apps_group = main_parser.add_mutually_exclusive_group(required=True)
|
# Start parsing to know if we're going to list things or not.
|
||||||
|
partial_args, _ = main_parser.parse_known_args()
|
||||||
|
|
||||||
|
# We only need the apps_group if we have a board set
|
||||||
|
apps_group = main_parser.add_mutually_exclusive_group(
|
||||||
|
required=(partial_args.board is not None))
|
||||||
apps_group.add_argument(
|
apps_group.add_argument(
|
||||||
"--no-app",
|
"--no-app",
|
||||||
dest="application",
|
dest="application",
|
||||||
|
|||||||
Reference in New Issue
Block a user