diff options
| -rwxr-xr-x | bin/bootstrap-traverser.py | 33 | ||||
| -rwxr-xr-x | bin/just-mr.py | 49 |
2 files changed, 48 insertions, 34 deletions
diff --git a/bin/bootstrap-traverser.py b/bin/bootstrap-traverser.py index 96b0a293..0d820f1c 100755 --- a/bin/bootstrap-traverser.py +++ b/bin/bootstrap-traverser.py @@ -7,7 +7,7 @@ import shutil import subprocess import sys -from optparse import OptionParser +from argparse import ArgumentParser def log(*args, **kwargs): print(*args, file=sys.stderr, **kwargs) @@ -100,19 +100,24 @@ def traverse(*, graph, to_build, out, root, config): os.path.join(out, location)) def main(): - parser = OptionParser() - parser.add_option("-C", dest="repository_config", - help="Repository-description file to use", - metavar="FILE") - parser.add_option("-o", dest="output_directory", - help="Directory to place output to") - parser.add_option("--local_build_root", dest="local_build_root", - help="Root for storing intermediate outputs", - metavar="PATH") - parser.add_option("--default_workspace", dest="default_workspace", - help="Workspace root to use if none is specified", - metavar="PATH") - (options, args) = parser.parse_args() + parser = ArgumentParser() + parser.add_argument("-C", + dest="repository_config", + help="Repository-description file to use", + metavar="FILE") + parser.add_argument("-o", + dest="output_directory", + help="Directory to place output to") + parser.add_argument("--local_build_root", + dest="local_build_root", + help="Root for storing intermediate outputs", + metavar="PATH") + parser.add_argument("--default_workspace", + dest="default_workspace", + help="Workspace root to use if none is specified", + metavar="PATH") + + (options, args) = parser.parse_known_args() if len(args) != 2: fail("usage: %r <graph> <targets_to_build>" % (sys.argv[0],)) diff --git a/bin/just-mr.py b/bin/just-mr.py index 1a1c868c..d6859380 100755 --- a/bin/just-mr.py +++ b/bin/just-mr.py @@ -8,7 +8,7 @@ import subprocess import sys import tempfile -from optparse import OptionParser +from argparse import ArgumentParser from pathlib import Path JUST="just" @@ -475,25 +475,34 @@ def fetch(*, config, args): def main(): - parser = OptionParser() - parser.add_option("-C", dest="repository_config", - help="Repository-description file to use", - metavar="FILE") - parser.add_option("-L", dest="checkout_location", - help="Specification file for checkout locations") - parser.add_option("--local_build_root", dest="local_build_root", - help="Root for CAS, repository space, etc", - metavar="PATH") - parser.add_option("--distdir", dest="distdir", action="append", - help="Directory to look for distfiles before fetching", - metavar="PATH") - parser.add_option("--just", dest="just", - help="Path to the just binary", - metavar="PATH") - parser.add_option("--always_file", dest="always_file", action="store_true", - default=False, help="Always create file roots") - - (options, args) = parser.parse_args() + parser = ArgumentParser() + parser.add_argument("-C", + dest="repository_config", + help="Repository-description file to use", + metavar="FILE") + parser.add_argument("-L", + dest="checkout_location", + help="Specification file for checkout locations") + parser.add_argument("--local_build_root", + dest="local_build_root", + help="Root for CAS, repository space, etc", + metavar="PATH") + parser.add_argument("--distdir", + dest="distdir", + action="append", + help="Directory to look for distfiles before fetching", + metavar="PATH") + parser.add_argument("--just", + dest="just", + help="Path to the just binary", + metavar="PATH") + parser.add_argument("--always_file", + dest="always_file", + action="store_true", + default=False, + help="Always create file roots") + + (options, args) = parser.parse_known_args() config = read_config(options.repository_config) global ROOT ROOT = options.local_build_root or os.path.join(Path.home(), ".cache/just") |