bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #110999 - clubby789:bootstrap-stderr, r=Mark-Simulacrum

Browse source 
Output some bootstrap messages on stderr

Fixes #110995
This commit is contained in:
Matthias Krüger 2023-04-30 16:25:48 +02:00 • committed by GitHub
commit a42261086f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

76
src/bootstrap/bootstrap.py
View file

@ -42,23 +42,23 @@ def get(base, url, path, checksums, verbose=False):
if os.path.exists(path): if os.path.exists(path):
if verify(path, sha256, False): if verify(path, sha256, False):
if verbose: if verbose:
print("using already-download file", path) print("using already-download file", path, file=sys.stderr)
return return
else: else:
if verbose: if verbose:
print("ignoring already-download file", print("ignoring already-download file",
path, "due to failed verification") path, "due to failed verification", file=sys.stderr)
os.unlink(path) os.unlink(path)
download(temp_path, "{}/{}".format(base, url), True, verbose) download(temp_path, "{}/{}".format(base, url), True, verbose)
if not verify(temp_path, sha256, verbose): if not verify(temp_path, sha256, verbose):
raise RuntimeError("failed verification") raise RuntimeError("failed verification")
if verbose: if verbose:
print("moving {} to {}".format(temp_path, path)) print("moving {} to {}".format(temp_path, path), file=sys.stderr)
shutil.move(temp_path, path) shutil.move(temp_path, path)
finally: finally:
if os.path.isfile(temp_path): if os.path.isfile(temp_path):
if verbose: if verbose:
print("removing", temp_path) print("removing", temp_path, file=sys.stderr)
os.unlink(temp_path) os.unlink(temp_path)
@ -68,7 +68,7 @@ def download(path, url, probably_big, verbose):
_download(path, url, probably_big, verbose, True) _download(path, url, probably_big, verbose, True)
return return
except RuntimeError: except RuntimeError:
print("\nspurious failure, trying again") print("\nspurious failure, trying again", file=sys.stderr)
_download(path, url, probably_big, verbose, False) _download(path, url, probably_big, verbose, False)
@ -79,7 +79,7 @@ def _download(path, url, probably_big, verbose, exception):
# - If we are on win32 fallback to powershell # - If we are on win32 fallback to powershell
# - Otherwise raise the error if appropriate # - Otherwise raise the error if appropriate
if probably_big or verbose: if probably_big or verbose:
print("downloading {}".format(url)) print("downloading {}".format(url), file=sys.stderr)
try: try:
if probably_big or verbose: if probably_big or verbose:
@ -115,20 +115,20 @@ def _download(path, url, probably_big, verbose, exception):
def verify(path, expected, verbose): def verify(path, expected, verbose):
"""Check if the sha256 sum of the given path is valid""" """Check if the sha256 sum of the given path is valid"""
if verbose: if verbose:
print("verifying", path) print("verifying", path, file=sys.stderr)
with open(path, "rb") as source: with open(path, "rb") as source:
found = hashlib.sha256(source.read()).hexdigest() found = hashlib.sha256(source.read()).hexdigest()
verified = found == expected verified = found == expected
if not verified: if not verified:
print("invalid checksum:\n" print("invalid checksum:\n"
" found: {}\n" " found: {}\n"
" expected: {}".format(found, expected)) " expected: {}".format(found, expected), file=sys.stderr)
return verified return verified
def unpack(tarball, tarball_suffix, dst, verbose=False, match=None): def unpack(tarball, tarball_suffix, dst, verbose=False, match=None):
"""Unpack the given tarball file""" """Unpack the given tarball file"""
print("extracting", tarball) print("extracting", tarball, file=sys.stderr)
fname = os.path.basename(tarball).replace(tarball_suffix, "") fname = os.path.basename(tarball).replace(tarball_suffix, "")
with contextlib.closing(tarfile.open(tarball)) as tar: with contextlib.closing(tarfile.open(tarball)) as tar:
for member in tar.getnames(): for member in tar.getnames():
@ -141,7 +141,7 @@ def unpack(tarball, tarball_suffix, dst, verbose=False, match=None):
dst_path = os.path.join(dst, name) dst_path = os.path.join(dst, name)
if verbose: if verbose:
print(" extracting", member) print(" extracting", member, file=sys.stderr)
tar.extract(member, dst) tar.extract(member, dst)
src_path = os.path.join(dst, member) src_path = os.path.join(dst, member)
if os.path.isdir(src_path) and os.path.exists(dst_path): if os.path.isdir(src_path) and os.path.exists(dst_path):
@ -153,7 +153,7 @@ def unpack(tarball, tarball_suffix, dst, verbose=False, match=None):
def run(args, verbose=False, exception=False, is_bootstrap=False, **kwargs): def run(args, verbose=False, exception=False, is_bootstrap=False, **kwargs):
"""Run a child program in a new process""" """Run a child program in a new process"""
if verbose: if verbose:
print("running: " + ' '.join(args)) print("running: " + ' '.join(args), file=sys.stderr)
sys.stdout.flush() sys.stdout.flush()
# Ensure that the .exe is used on Windows just in case a Linux ELF has been # Ensure that the .exe is used on Windows just in case a Linux ELF has been
# compiled in the same directory. # compiled in the same directory.
@ -193,8 +193,8 @@ def require(cmd, exit=True, exception=False):
if exception: if exception:
raise raise
elif exit: elif exit:
print("error: unable to run `{}`: {}".format(' '.join(cmd), exc)) print("error: unable to run `{}`: {}".format(' '.join(cmd), exc), file=sys.stderr)
print("Please make sure it's installed and in the path.") print("Please make sure it's installed and in the path.", file=sys.stderr)
sys.exit(1) sys.exit(1)
return None return None
@ -218,8 +218,8 @@ def default_build_triple(verbose):
if sys.platform == 'darwin': if sys.platform == 'darwin':
if verbose: if verbose:
print("not using rustc detection as it is unreliable on macOS") print("not using rustc detection as it is unreliable on macOS", file=sys.stderr)
print("falling back to auto-detect") print("falling back to auto-detect", file=sys.stderr)
else: else:
try: try:
version = subprocess.check_output(["rustc", "--version", "--verbose"], version = subprocess.check_output(["rustc", "--version", "--verbose"],
@ -228,12 +228,14 @@ def default_build_triple(verbose):
host = next(x for x in version.split('\n') if x.startswith("host: ")) host = next(x for x in version.split('\n') if x.startswith("host: "))
triple = host.split("host: ")[1] triple = host.split("host: ")[1]
if verbose: if verbose:
print("detected default triple {} from pre-installed rustc".format(triple)) print("detected default triple {} from pre-installed rustc".format(triple),
file=sys.stderr)
return triple return triple
except Exception as e: except Exception as e:
if verbose: if verbose:
print("pre-installed rustc not detected: {}".format(e)) print("pre-installed rustc not detected: {}".format(e),
print("falling back to auto-detect") file=sys.stderr)
print("falling back to auto-detect", file=sys.stderr)
required = not platform_is_win32() required = not platform_is_win32()
ostype = require(["uname", "-s"], exit=required) ostype = require(["uname", "-s"], exit=required)
@ -545,7 +547,7 @@ class RustBuild(object):
answer = self._should_fix_bins_and_dylibs = get_answer() answer = self._should_fix_bins_and_dylibs = get_answer()
if answer: if answer:
print("info: You seem to be using Nix.") print("info: You seem to be using Nix.", file=sys.stderr)
return answer return answer
def fix_bin_or_dylib(self, fname): def fix_bin_or_dylib(self, fname):
@ -558,7 +560,7 @@ class RustBuild(object):
Please see https://nixos.org/patchelf.html for more information Please see https://nixos.org/patchelf.html for more information
""" """
assert self._should_fix_bins_and_dylibs is True assert self._should_fix_bins_and_dylibs is True
print("attempting to patch", fname) print("attempting to patch", fname, file=sys.stderr)
# Only build `.nix-deps` once. # Only build `.nix-deps` once.
nix_deps_dir = self.nix_deps_dir nix_deps_dir = self.nix_deps_dir
@ -591,7 +593,7 @@ class RustBuild(object):
"nix-build", "-E", nix_expr, "-o", nix_deps_dir, "nix-build", "-E", nix_expr, "-o", nix_deps_dir,
]) ])
except subprocess.CalledProcessError as reason: except subprocess.CalledProcessError as reason:
print("warning: failed to call nix-build:", reason) print("warning: failed to call nix-build:", reason, file=sys.stderr)
return return
self.nix_deps_dir = nix_deps_dir self.nix_deps_dir = nix_deps_dir
@ -611,7 +613,7 @@ class RustBuild(object):
try: try:
subprocess.check_output([patchelf] + patchelf_args + [fname]) subprocess.check_output([patchelf] + patchelf_args + [fname])
except subprocess.CalledProcessError as reason: except subprocess.CalledProcessError as reason:
print("warning: failed to call patchelf:", reason) print("warning: failed to call patchelf:", reason, file=sys.stderr)
return return
def rustc_stamp(self): def rustc_stamp(self):
@ -755,7 +757,7 @@ class RustBuild(object):
if "GITHUB_ACTIONS" in env: if "GITHUB_ACTIONS" in env:
print("::group::Building bootstrap") print("::group::Building bootstrap")
else: else:
print("Building bootstrap") print("Building bootstrap", file=sys.stderr)
build_dir = os.path.join(self.build_dir, "bootstrap") build_dir = os.path.join(self.build_dir, "bootstrap")
if self.clean and os.path.exists(build_dir): if self.clean and os.path.exists(build_dir):
shutil.rmtree(build_dir) shutil.rmtree(build_dir)
@ -849,9 +851,12 @@ class RustBuild(object):
if 'SUDO_USER' in os.environ and not self.use_vendored_sources: if 'SUDO_USER' in os.environ and not self.use_vendored_sources:
if os.getuid() == 0: if os.getuid() == 0:
self.use_vendored_sources = True self.use_vendored_sources = True
print('info: looks like you\'re trying to run this command as root') print('info: looks like you\'re trying to run this command as root',
print(' and so in order to preserve your $HOME this will now') file=sys.stderr)
print(' use vendored sources by default.') print(' and so in order to preserve your $HOME this will now',
file=sys.stderr)
print(' use vendored sources by default.',
file=sys.stderr)
cargo_dir = os.path.join(self.rust_root, '.cargo') cargo_dir = os.path.join(self.rust_root, '.cargo')
if self.use_vendored_sources: if self.use_vendored_sources:
@ -861,14 +866,18 @@ class RustBuild(object):
"--sync ./src/tools/rust-analyzer/Cargo.toml " \ "--sync ./src/tools/rust-analyzer/Cargo.toml " \
"--sync ./compiler/rustc_codegen_cranelift/Cargo.toml " \ "--sync ./compiler/rustc_codegen_cranelift/Cargo.toml " \
"--sync ./src/bootstrap/Cargo.toml " "--sync ./src/bootstrap/Cargo.toml "
print('error: vendoring required, but vendor directory does not exist.') print('error: vendoring required, but vendor directory does not exist.',
file=sys.stderr)
print(' Run `cargo vendor {}` to initialize the ' print(' Run `cargo vendor {}` to initialize the '
'vendor directory.'.format(sync_dirs)) 'vendor directory.'.format(sync_dirs),
print('Alternatively, use the pre-vendored `rustc-src` dist component.') file=sys.stderr)
print('Alternatively, use the pre-vendored `rustc-src` dist component.',
file=sys.stderr)
raise Exception("{} not found".format(vendor_dir)) raise Exception("{} not found".format(vendor_dir))
if not os.path.exists(cargo_dir): if not os.path.exists(cargo_dir):
print('error: vendoring required, but .cargo/config does not exist.') print('error: vendoring required, but .cargo/config does not exist.',
file=sys.stderr)
raise Exception("{} not found".format(cargo_dir)) raise Exception("{} not found".format(cargo_dir))
else: else:
if os.path.exists(cargo_dir): if os.path.exists(cargo_dir):
@ -978,7 +987,7 @@ def main():
print( print(
"info: Downloading and building bootstrap before processing --help command.\n" "info: Downloading and building bootstrap before processing --help command.\n"
" See src/bootstrap/README.md for help with common commands." " See src/bootstrap/README.md for help with common commands."
) , file=sys.stderr)
exit_code = 0 exit_code = 0
success_word = "successfully" success_word = "successfully"
@ -989,11 +998,12 @@ def main():
exit_code = error.code exit_code = error.code
else: else:
exit_code = 1 exit_code = 1
print(error) print(error, file=sys.stderr)
success_word = "unsuccessfully" success_word = "unsuccessfully"
if not help_triggered: if not help_triggered:
print("Build completed", success_word, "in", format_build_time(time() - start_time)) print("Build completed", success_word, "in", format_build_time(time() - start_time),
file=sys.stderr)
sys.exit(exit_code) sys.exit(exit_code)

8
src/bootstrap/download.rs
View file

@ -112,7 +112,7 @@ impl Config {
is_nixos && !Path::new("/lib").exists() is_nixos && !Path::new("/lib").exists()
}); });
if val { if val {
println!("info: You seem to be using Nix."); eprintln!("info: You seem to be using Nix.");
} }
val val
} }
@ -226,7 +226,7 @@ impl Config {
curl.stdout(Stdio::from(f)); curl.stdout(Stdio::from(f));
if !self.check_run(&mut curl) { if !self.check_run(&mut curl) {
if self.build.contains("windows-msvc") { if self.build.contains("windows-msvc") {
println!("Fallback to PowerShell"); eprintln!("Fallback to PowerShell");
for _ in 0..3 { for _ in 0..3 {
if self.try_run(Command::new("PowerShell.exe").args(&[ if self.try_run(Command::new("PowerShell.exe").args(&[
"/nologo", "/nologo",
@ -239,7 +239,7 @@ impl Config {
])) { ])) {
return; return;
} }
println!("\nspurious failure, trying again"); eprintln!("\nspurious failure, trying again");
} }
} }
if !help_on_error.is_empty() { if !help_on_error.is_empty() {
@ -250,7 +250,7 @@ impl Config {
} }
fn unpack(&self, tarball: &Path, dst: &Path, pattern: &str) { fn unpack(&self, tarball: &Path, dst: &Path, pattern: &str) {
println!("extracting {} to {}", tarball.display(), dst.display()); eprintln!("extracting {} to {}", tarball.display(), dst.display());
if !dst.exists() { if !dst.exists() {
t!(fs::create_dir_all(dst)); t!(fs::create_dir_all(dst));
} }