Chromium Code Reviews| Index: native_client_sdk/src/build_tools/parse_dsc.py |
| diff --git a/native_client_sdk/src/build_tools/parse_dsc.py b/native_client_sdk/src/build_tools/parse_dsc.py |
| index f552049ae8d3b6a65f64daff8bd8b5e429806c77..592a6a9124fa7a052f064b053ad2b5cc937762c1 100755 |
| --- a/native_client_sdk/src/build_tools/parse_dsc.py |
| +++ b/native_client_sdk/src/build_tools/parse_dsc.py |
| @@ -5,7 +5,7 @@ |
| import collections |
| import fnmatch |
| -import optparse |
| +import argparse |
|
binji
2014/11/13 23:57:02
sort
Sam Clegg
2014/11/30 17:55:11
Done.
|
| import os |
| import sys |
| @@ -244,24 +244,18 @@ def PrintProjectTree(tree): |
| print '\t' + val['NAME'] |
| -def main(argv): |
| - parser = optparse.OptionParser(usage='%prog [options] <dir>') |
| - parser.add_option('-e', '--experimental', |
| +def main(args): |
| + parser = argparse.ArgumentParser(description=__doc__) |
| + parser.add_argument('-e', '--experimental', |
| help='build experimental examples and libraries', action='store_true') |
| - parser.add_option('-t', '--toolchain', |
| + parser.add_argument('-t', '--toolchain', |
| help='Build using toolchain. Can be passed more than once.', |
| action='append') |
| + parser.add_argument('project_root', default='.') |
| - options, args = parser.parse_args(argv[1:]) |
| + options = parser.parse_args(args) |
| filters = {} |
| - load_from_dir = '.' |
| - if len(args) > 1: |
| - parser.error('Expected 0 or 1 args, got %d.' % len(args)) |
| - |
| - if args: |
| - load_from_dir = args[0] |
| - |
| if options.toolchain: |
| filters['TOOLS'] = options.toolchain |
| @@ -269,7 +263,7 @@ def main(argv): |
| filters['EXPERIMENTAL'] = False |
| try: |
| - tree = LoadProjectTree(load_from_dir, include=filters) |
| + tree = LoadProjectTree(options.project_root, include=filters) |
| except ValidationError as e: |
| sys.stderr.write(str(e) + '\n') |
| return 1 |
| @@ -279,4 +273,4 @@ def main(argv): |
| if __name__ == '__main__': |
| - sys.exit(main(sys.argv)) |
| + sys.exit(main(sys.argv[1:])) |