bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

bootstrap: --help handling

Browse source
This commit is contained in:
KaDiWa 2023-01-29 21:53:10 +01:00
parent 385dbff9e5
commit b925031c5f
No known key found for this signature in database
GPG key ID: 0B52AE391C674CE5
1 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/bootstrap/bootstrap.py
View file

@ -820,17 +820,10 @@ class RustBuild(object):
if os.path.exists(cargo_dir): if os.path.exists(cargo_dir):
shutil.rmtree(cargo_dir) shutil.rmtree(cargo_dir)
def bootstrap(help_triggered): def parse_args():
"""Configure, fetch, build and run the initial bootstrap""" """Parse the command line arguments that the python script needs."""
parser = argparse.ArgumentParser(add_help=False)
# If the user is asking for help, let them know that the whole download-and-build parser.add_argument('-h', '--help', action='store_true')
# process has to happen before anything is printed out.
if help_triggered:
print("info: Downloading and building bootstrap before processing --help")
print(" command. See src/bootstrap/README.md for help with common")
print(" commands.")
parser = argparse.ArgumentParser(description='Build rust')
parser.add_argument('--config') parser.add_argument('--config')
parser.add_argument('--build-dir') parser.add_argument('--build-dir')
parser.add_argument('--build') parser.add_argument('--build')
@ -838,9 +831,10 @@ def bootstrap(help_triggered):
parser.add_argument('--clean', action='store_true') parser.add_argument('--clean', action='store_true')
parser.add_argument('-v', '--verbose', action='count', default=0) parser.add_argument('-v', '--verbose', action='count', default=0)
args = [a for a in sys.argv if a != '-h' and a != '--help'] return parser.parse_known_args(sys.argv)[0]
args, _ = parser.parse_known_args(args)
def bootstrap(args):
"""Configure, fetch, build and run the initial bootstrap"""
# Configure initial bootstrap # Configure initial bootstrap
build = RustBuild() build = RustBuild()
build.rust_root = os.path.abspath(os.path.join(__file__, '../../..')) build.rust_root = os.path.abspath(os.path.join(__file__, '../../..'))
@ -918,23 +912,30 @@ def main():
if len(sys.argv) > 1 and sys.argv[1] == 'help': if len(sys.argv) > 1 and sys.argv[1] == 'help':
sys.argv[1] = '-h' sys.argv[1] = '-h'
help_triggered = ( args = parse_args()
'-h' in sys.argv) or ('--help' in sys.argv) or (len(sys.argv) == 1) help_triggered = args.help or len(sys.argv) == 1
# If the user is asking for help, let them know that the whole download-and-build
# process has to happen before anything is printed out.
if help_triggered:
print(
"info: Downloading and building bootstrap before processing --help command.\n"
" See src/bootstrap/README.md for help with common commands."
)
exit_code = 0
try: try:
bootstrap(help_triggered) bootstrap(args)
if not help_triggered:
print("Build completed successfully in {}".format(
format_build_time(time() - start_time)))
except (SystemExit, KeyboardInterrupt) as error: except (SystemExit, KeyboardInterrupt) as error:
if hasattr(error, 'code') and isinstance(error.code, int): if hasattr(error, 'code') and isinstance(error.code, int):
exit_code = error.code exit_code = error.code
else: else:
exit_code = 1 exit_code = 1
print(error) print(error)
if not help_triggered:
print("Build completed unsuccessfully in {}".format( if not help_triggered:
format_build_time(time() - start_time))) print("Build completed successfully in", format_build_time(time() - start_time))
sys.exit(exit_code) sys.exit(exit_code)
if __name__ == '__main__': if __name__ == '__main__':