From c8dee393d130342f5035f061ec3760f8cb071dac Mon Sep 17 00:00:00 2001 From: Anatoly Techtonik Date: Tue, 6 Jul 2010 19:25:37 +0000 Subject: Aegis cleanup - remove references from bootstrap.py (issue #2639) --- README | 7 +++---- bootstrap.py | 22 ---------------------- 2 files changed, 3 insertions(+), 26 deletions(-) diff --git a/README b/README index 280b68c..c2e1e5b 100644 --- a/README +++ b/README @@ -579,10 +579,9 @@ bin/ man page format bootstrap.py - A build script for use with Aegis. This collects a current copy - of SCons from the Aegis baseline directories in a bootstrap/ - subdirectory, and then executes SCons with the supplied - command-line arguments. + Build script for running SCons from the current source code + checkout. This copies SCons files to bootstrap/ subdirectory, + and then executes SCons with the supplied command-line arguments. build/ This doesn't exist yet if you're looking at a vanilla source diff --git a/bootstrap.py b/bootstrap.py index 3f76138..2656f4f 100644 --- a/bootstrap.py +++ b/bootstrap.py @@ -69,12 +69,6 @@ the following SCons options: the SCons script itself doesn't need to, so this option gets "eaten" by the bootstrap.py script. - -Y, --repository - - These options are used under Aegis to specify a search path - for the source files that may not have been copied in to the - Aegis change. - This is essentially a minimal build of SCons to bootstrap ourselves into executing it for the full build of all the packages, as specified in our local SConstruct file. @@ -142,22 +136,6 @@ while command_line_args: elif arg[:12] == '--directory=': os.chdir(arg[12:]) - elif arg in ('-Y', '--repository'): - try: - dir = command_line_args.pop(0) - except IndexError: - sys.stderr.write(requires_an_argument % arg) - sys.exit(1) - else: - search.append(dir) - pass_through_args.extend([arg, dir]) - elif arg[:2] == '-Y': - search.append(arg[2:]) - pass_through_args.append(arg) - elif arg[:13] == '--repository=': - search.append(arg[13:]) - pass_through_args.append(arg) - else: pass_through_args.append(arg) -- cgit v0.12