Attachment #475588 for bug #617744

Lines 545-550 def bootstrap(): Link Here

(-)a/src/bootstrap/bootstrap.py (-2 / +5 lines)
545	except:	545	except:
546	pass	546	pass
547		547
		548	if '\nverbose = 2' in rb.config_toml:
		549	rb.verbose = 2
		550	elif '\nverbose = 1' in rb.config_toml:
		551	rb.verbose = 1
		552
548	rb.use_vendored_sources = '\nvendor = true' in rb.config_toml or \	553	rb.use_vendored_sources = '\nvendor = true' in rb.config_toml or \
549	'CFG_ENABLE_VENDOR' in rb.config_mk	554	'CFG_ENABLE_VENDOR' in rb.config_mk
550		555
551	-
552	--
553	src/bootstrap/bootstrap.py \| 4 ++++	556	src/bootstrap/bootstrap.py \| 4 ++++
554	1 file changed, 4 insertions(+)	557	1 file changed, 4 insertions(+)

Lines 370-375 class RustBuild(object): Link Here

(-)a/src/bootstrap/bootstrap.py (-2 / +4 lines)
370	raise Exception("no cargo executable found at `%s`" % self.cargo())	370	raise Exception("no cargo executable found at `%s`" % self.cargo())
371	args = [self.cargo(), "build", "--manifest-path",	371	args = [self.cargo(), "build", "--manifest-path",
372	os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]	372	os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
		373	if self.verbose:
		374	args.append("--verbose")
		375	if self.verbose > 1:
		376	args.append("--verbose")
373	if self.use_locked_deps:	377	if self.use_locked_deps:
374	args.append("--locked")	378	args.append("--locked")
375	if self.use_vendored_sources:	379	if self.use_vendored_sources:
376	-
377	--
378	src/bootstrap/bootstrap.py \| 14 ++++----------	380	src/bootstrap/bootstrap.py \| 14 ++++----------
379	1 file changed, 4 insertions(+), 10 deletions(-)	381	1 file changed, 4 insertions(+), 10 deletions(-)




            shutil.move(tp, fp)
    shutil.rmtree(os.path.join(dst, fname))

def run(args, verbose=False, exception=False, env=None):
    if verbose:
        print("running: " + ' '.join(args))
    sys.stdout.flush()
    # Use Popen here instead of call() as it apparently allows powershell on
    # Windows to not lock up waiting for input presumably.
    ret = subprocess.Popen(args, env=env)
    code = ret.wait()
    if code != 0:
        err = "failed to run: " + ' '.join(args)

            args.append("--locked")
        if self.use_vendored_sources:
            args.append("--frozen")
        run(args, env=env, verbose=self.verbose)

    def run(self, args, env):
        proc = subprocess.Popen(args, env=env)
        ret = proc.wait()
        if ret != 0:
            sys.exit(ret)

    def build_triple(self):
        default_encoding = sys.getdefaultencoding()

    env["BUILD"] = rb.build
    env["SRC"] = rb.rust_root
    env["BOOTSTRAP_PARENT_ID"] = str(os.getpid())
    run(args, env=env, verbose=rb.verbose)

def main():
    start_time = time()
- 

Return to bug 617744

Lines 126-138 def unpack(tarball, dst, verbose=False, match=None): Link Here

(-)a/src/bootstrap/bootstrap.py (-11 / +4 lines)
126	shutil.move(tp, fp)	126	shutil.move(tp, fp)
127	shutil.rmtree(os.path.join(dst, fname))	127	shutil.rmtree(os.path.join(dst, fname))
128		128
129	def run(args, verbose=False, exception=False):	129	def run(args, verbose=False, exception=False, env=None):
130	if verbose:	130	if verbose:
131	print("running: " + ' '.join(args))	131	print("running: " + ' '.join(args))
132	sys.stdout.flush()	132	sys.stdout.flush()
133	# Use Popen here instead of call() as it apparently allows powershell on	133	# Use Popen here instead of call() as it apparently allows powershell on
134	# Windows to not lock up waiting for input presumably.	134	# Windows to not lock up waiting for input presumably.
135	ret = subprocess.Popen(args)	135	ret = subprocess.Popen(args, env=env)
136	code = ret.wait()	136	code = ret.wait()
137	if code != 0:	137	if code != 0:
138	err = "failed to run: " + ' '.join(args)	138	err = "failed to run: " + ' '.join(args)
Lines 378-390 class RustBuild(object): Link Here
378	args.append("--locked")	378	args.append("--locked")
379	if self.use_vendored_sources:	379	if self.use_vendored_sources:
380	args.append("--frozen")	380	args.append("--frozen")
381	self.run(args, env)	381	run(args, env=env, verbose=self.verbose)
382
383	def run(self, args, env):
384	proc = subprocess.Popen(args, env=env)
385	ret = proc.wait()
386	if ret != 0:
387	sys.exit(ret)
388		382
389	def build_triple(self):	383	def build_triple(self):
390	default_encoding = sys.getdefaultencoding()	384	default_encoding = sys.getdefaultencoding()
Lines 603-609 def bootstrap(): Link Here
603	env["BUILD"] = rb.build	597	env["BUILD"] = rb.build
604	env["SRC"] = rb.rust_root	598	env["SRC"] = rb.rust_root
605	env["BOOTSTRAP_PARENT_ID"] = str(os.getpid())	599	env["BOOTSTRAP_PARENT_ID"] = str(os.getpid())
606	rb.run(args, env)	600	run(args, env=env, verbose=rb.verbose)
607		601
608	def main():	602	def main():
609	start_time = time()	603	start_time = time()
610	-