//! out to `rust-installer` still. This may one day be replaced with bits and
//! pieces of `rustup.rs`!
+use std::collections::HashSet;
use std::env;
use std::fs;
-use std::io::Write;
-use std::path::{PathBuf, Path};
-use std::process::{Command, Stdio};
+use std::path::{Path, PathBuf};
+use std::process::Command;
use build_helper::{output, t};
-use crate::{Compiler, Mode, LLVM_TOOLS};
-use crate::channel;
-use crate::util::{is_dylib, exe};
use crate::builder::{Builder, RunConfig, ShouldRun, Step};
+use crate::cache::{Interned, INTERNER};
use crate::compile;
+use crate::config::TargetSelection;
+use crate::tarball::{GeneratedTarball, OverlayKind, Tarball};
use crate::tool::{self, Tool};
-use crate::cache::{INTERNER, Interned};
+use crate::util::{exe, is_dylib, timeit};
+use crate::{Compiler, DependencyType, Mode, LLVM_TOOLS};
use time::{self, Timespec};
pub fn pkgname(builder: &Builder<'_>, component: &str) -> String {
- if component == "cargo" {
- format!("{}-{}", component, builder.cargo_package_vers())
- } else if component == "rls" {
- format!("{}-{}", component, builder.rls_package_vers())
- } else if component == "clippy" {
- format!("{}-{}", component, builder.clippy_package_vers())
- } else if component == "miri" {
- format!("{}-{}", component, builder.miri_package_vers())
- } else if component == "rustfmt" {
- format!("{}-{}", component, builder.rustfmt_package_vers())
- } else if component == "llvm-tools" {
- format!("{}-{}", component, builder.llvm_tools_package_vers())
- } else if component == "lldb" {
- format!("{}-{}", component, builder.lldb_package_vers())
- } else {
- assert!(component.starts_with("rust"));
- format!("{}-{}", component, builder.rust_package_vers())
- }
+ format!("{}-{}", component, builder.rust_package_vers())
}
-fn distdir(builder: &Builder<'_>) -> PathBuf {
+pub(crate) fn distdir(builder: &Builder<'_>) -> PathBuf {
builder.out.join("dist")
}
builder.out.join("tmp/dist")
}
-fn rust_installer(builder: &Builder<'_>) -> Command {
- builder.tool_cmd(Tool::RustInstaller)
-}
-
fn missing_tool(tool_name: &str, skip: bool) {
if skip {
println!("Unable to build {}, skipping dist", tool_name)
}
}
+fn should_build_extended_tool(builder: &Builder<'_>, tool: &str) -> bool {
+ if !builder.config.extended {
+ return false;
+ }
+ builder.config.tools.as_ref().map_or(true, |tools| tools.contains(tool))
+}
+
#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
pub struct Docs {
- pub stage: u32,
- pub host: Interned<String>,
+ pub host: TargetSelection,
}
impl Step for Docs {
- type Output = PathBuf;
+ type Output = Option<GeneratedTarball>;
const DEFAULT: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
- run.path("src/doc")
+ let default = run.builder.config.docs;
+ run.path("src/doc").default_condition(default)
}
fn make_run(run: RunConfig<'_>) {
- run.builder.ensure(Docs {
- stage: run.builder.top_stage,
- host: run.target,
- });
+ run.builder.ensure(Docs { host: run.target });
}
/// Builds the `rust-docs` installer component.
- fn run(self, builder: &Builder<'_>) -> PathBuf {
+ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
let host = self.host;
+ builder.default_doc(&[]);
- let name = pkgname(builder, "rust-docs");
-
- builder.info(&format!("Dist docs ({})", host));
- if !builder.config.docs {
- builder.info("\tskipping - docs disabled");
- return distdir(builder).join(format!("{}-{}.tar.gz", name, host));
- }
-
- builder.default_doc(None);
-
- let image = tmpdir(builder).join(format!("{}-{}-image", name, host));
- let _ = fs::remove_dir_all(&image);
+ let dest = "share/doc/rust/html";
- let dst = image.join("share/doc/rust/html");
- t!(fs::create_dir_all(&dst));
- let src = builder.doc_out(host);
- builder.cp_r(&src, &dst);
-
- let mut cmd = rust_installer(builder);
- cmd.arg("generate")
- .arg("--product-name=Rust-Documentation")
- .arg("--rel-manifest-dir=rustlib")
- .arg("--success-message=Rust-documentation-is-installed.")
- .arg("--image-dir").arg(&image)
- .arg("--work-dir").arg(&tmpdir(builder))
- .arg("--output-dir").arg(&distdir(builder))
- .arg(format!("--package-name={}-{}", name, host))
- .arg("--component-name=rust-docs")
- .arg("--legacy-manifest-dirs=rustlib,cargo")
- .arg("--bulk-dirs=share/doc/rust/html");
- builder.run(&mut cmd);
- builder.remove_dir(&image);
-
- distdir(builder).join(format!("{}-{}.tar.gz", name, host))
+ let mut tarball = Tarball::new(builder, "rust-docs", &host.triple);
+ tarball.set_product_name("Rust Documentation");
+ tarball.add_bulk_dir(&builder.doc_out(host), dest);
+ tarball.add_file(&builder.src.join("src/doc/robots.txt"), dest, 0o644);
+ Some(tarball.generate())
}
}
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
pub struct RustcDocs {
- pub stage: u32,
- pub host: Interned<String>,
+ pub host: TargetSelection,
}
impl Step for RustcDocs {
- type Output = PathBuf;
+ type Output = Option<GeneratedTarball>;
const DEFAULT: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
}
fn make_run(run: RunConfig<'_>) {
- run.builder.ensure(RustcDocs {
- stage: run.builder.top_stage,
- host: run.target,
- });
+ run.builder.ensure(RustcDocs { host: run.target });
}
/// Builds the `rustc-docs` installer component.
- fn run(self, builder: &Builder<'_>) -> PathBuf {
+ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
let host = self.host;
-
- let name = pkgname(builder, "rustc-docs");
-
- builder.info(&format!("Dist compiler docs ({})", host));
if !builder.config.compiler_docs {
- builder.info("\tskipping - compiler docs disabled");
- return distdir(builder).join(format!("{}-{}.tar.gz", name, host));
+ return None;
}
+ builder.default_doc(&[]);
- builder.default_doc(None);
-
- let image = tmpdir(builder).join(format!("{}-{}-image", name, host));
- let _ = fs::remove_dir_all(&image);
-
- let dst = image.join("share/doc/rust/html");
- t!(fs::create_dir_all(&dst));
- let src = builder.compiler_doc_out(host);
- builder.cp_r(&src, &dst);
-
- let mut cmd = rust_installer(builder);
- cmd.arg("generate")
- .arg("--product-name=Rustc-Documentation")
- .arg("--rel-manifest-dir=rustlib")
- .arg("--success-message=Rustc-documentation-is-installed.")
- .arg("--image-dir").arg(&image)
- .arg("--work-dir").arg(&tmpdir(builder))
- .arg("--output-dir").arg(&distdir(builder))
- .arg(format!("--package-name={}-{}", name, host))
- .arg("--component-name=rustc-docs")
- .arg("--legacy-manifest-dirs=rustlib,cargo")
- .arg("--bulk-dirs=share/doc/rust/html");
- builder.run(&mut cmd);
- builder.remove_dir(&image);
-
- distdir(builder).join(format!("{}-{}.tar.gz", name, host))
+ let mut tarball = Tarball::new(builder, "rustc-docs", &host.triple);
+ tarball.set_product_name("Rustc Documentation");
+ tarball.add_bulk_dir(&builder.compiler_doc_out(host), "share/doc/rust/html/rustc");
+ Some(tarball.generate())
}
}
let mut found = Vec::with_capacity(files.len());
for file in files {
- let file_path =
- path.iter()
- .map(|dir| dir.join(file))
- .find(|p| p.exists());
+ let file_path = path.iter().map(|dir| dir.join(file)).find(|p| p.exists());
if let Some(file_path) = file_path {
found.push(file_path);
}
fn make_win_dist(
- rust_root: &Path, plat_root: &Path, target_triple: Interned<String>, builder: &Builder<'_>
+ rust_root: &Path,
+ plat_root: &Path,
+ target: TargetSelection,
+ builder: &Builder<'_>,
) {
//Ask gcc where it keeps its stuff
- let mut cmd = Command::new(builder.cc(target_triple));
+ let mut cmd = Command::new(builder.cc(target));
cmd.arg("-print-search-dirs");
let gcc_out = output(&mut cmd);
let idx = line.find(':').unwrap();
let key = &line[..idx];
let trim_chars: &[_] = &[' ', '='];
- let value =
- line[(idx + 1)..]
- .trim_start_matches(trim_chars)
- .split(';')
- .map(PathBuf::from);
+ let value = env::split_paths(line[(idx + 1)..].trim_start_matches(trim_chars));
if key == "programs" {
bin_path.extend(value);
}
}
- let target_tools = ["gcc.exe", "ld.exe", "dlltool.exe", "libwinpthread-1.dll"];
- let mut rustc_dlls = vec!["libstdc++-6.dll", "libwinpthread-1.dll"];
- if target_triple.starts_with("i686-") {
+ let compiler = if target == "i686-pc-windows-gnu" {
+ "i686-w64-mingw32-gcc.exe"
+ } else if target == "x86_64-pc-windows-gnu" {
+ "x86_64-w64-mingw32-gcc.exe"
+ } else {
+ "gcc.exe"
+ };
+ let target_tools = [compiler, "ld.exe", "dlltool.exe", "libwinpthread-1.dll"];
+ let mut rustc_dlls = vec!["libwinpthread-1.dll"];
+ if target.starts_with("i686-") {
rustc_dlls.push("libgcc_s_dw2-1.dll");
} else {
rustc_dlls.push("libgcc_s_seh-1.dll");
}
- let target_libs = [ //MinGW libs
+ let target_libs = [
+ //MinGW libs
"libgcc.a",
"libgcc_eh.a",
"libgcc_s.a",
}
//Copy platform tools to platform-specific bin directory
- let target_bin_dir = plat_root.join("lib").join("rustlib").join(target_triple).join("bin");
+ let target_bin_dir = plat_root
+ .join("lib")
+ .join("rustlib")
+ .join(target.triple)
+ .join("bin")
+ .join("self-contained");
fs::create_dir_all(&target_bin_dir).expect("creating target_bin_dir failed");
for src in target_tools {
builder.copy_to_folder(&src, &target_bin_dir);
// Warn windows-gnu users that the bundled GCC cannot compile C files
builder.create(
&target_bin_dir.join("GCC-WARNING.txt"),
- "gcc.exe contained in this folder cannot be used for compiling C files - it is only\
- used as a linker. In order to be able to compile projects containing C code use\
- the GCC provided by MinGW or Cygwin."
+ "gcc.exe contained in this folder cannot be used for compiling C files - it is only \
+ used as a linker. In order to be able to compile projects containing C code use \
+ the GCC provided by MinGW or Cygwin.",
);
//Copy platform libs to platform-specific lib directory
- let target_lib_dir = plat_root.join("lib").join("rustlib").join(target_triple).join("lib");
+ let target_lib_dir = plat_root
+ .join("lib")
+ .join("rustlib")
+ .join(target.triple)
+ .join("lib")
+ .join("self-contained");
fs::create_dir_all(&target_lib_dir).expect("creating target_lib_dir failed");
for src in target_libs {
builder.copy_to_folder(&src, &target_lib_dir);
#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
pub struct Mingw {
- pub host: Interned<String>,
+ pub host: TargetSelection,
}
impl Step for Mingw {
- type Output = Option<PathBuf>;
+ type Output = Option<GeneratedTarball>;
const DEFAULT: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
///
/// This contains all the bits and pieces to run the MinGW Windows targets
/// without any extra installed software (e.g., we bundle gcc, libraries, etc).
- fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
+ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
let host = self.host;
-
if !host.contains("pc-windows-gnu") {
return None;
}
- builder.info(&format!("Dist mingw ({})", host));
- let name = pkgname(builder, "rust-mingw");
- let image = tmpdir(builder).join(format!("{}-{}-image", name, host));
- let _ = fs::remove_dir_all(&image);
- t!(fs::create_dir_all(&image));
+ let mut tarball = Tarball::new(builder, "rust-mingw", &host.triple);
+ tarball.set_product_name("Rust MinGW");
// The first argument is a "temporary directory" which is just
// thrown away (this contains the runtime DLLs included in the rustc package
// above) and the second argument is where to place all the MinGW components
// (which is what we want).
- make_win_dist(&tmpdir(builder), &image, host, &builder);
-
- let mut cmd = rust_installer(builder);
- cmd.arg("generate")
- .arg("--product-name=Rust-MinGW")
- .arg("--rel-manifest-dir=rustlib")
- .arg("--success-message=Rust-MinGW-is-installed.")
- .arg("--image-dir").arg(&image)
- .arg("--work-dir").arg(&tmpdir(builder))
- .arg("--output-dir").arg(&distdir(builder))
- .arg(format!("--package-name={}-{}", name, host))
- .arg("--component-name=rust-mingw")
- .arg("--legacy-manifest-dirs=rustlib,cargo");
- builder.run(&mut cmd);
- t!(fs::remove_dir_all(&image));
- Some(distdir(builder).join(format!("{}-{}.tar.gz", name, host)))
+ make_win_dist(&tmpdir(builder), tarball.image_dir(), host, &builder);
+
+ Some(tarball.generate())
}
}
}
impl Step for Rustc {
- type Output = PathBuf;
+ type Output = GeneratedTarball;
const DEFAULT: bool = true;
const ONLY_HOSTS: bool = true;
}
fn make_run(run: RunConfig<'_>) {
- run.builder.ensure(Rustc {
- compiler: run.builder.compiler(run.builder.top_stage, run.target),
- });
+ run.builder
+ .ensure(Rustc { compiler: run.builder.compiler(run.builder.top_stage, run.target) });
}
/// Creates the `rustc` installer component.
- fn run(self, builder: &Builder<'_>) -> PathBuf {
+ fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
let compiler = self.compiler;
let host = self.compiler.host;
- builder.info(&format!("Dist rustc stage{} ({})", compiler.stage, host));
- let name = pkgname(builder, "rustc");
- let image = tmpdir(builder).join(format!("{}-{}-image", name, host));
- let _ = fs::remove_dir_all(&image);
- let overlay = tmpdir(builder).join(format!("{}-{}-overlay", name, host));
- let _ = fs::remove_dir_all(&overlay);
+ let tarball = Tarball::new(builder, "rustc", &host.triple);
// Prepare the rustc "image", what will actually end up getting installed
- prepare_image(builder, compiler, &image);
-
- // Prepare the overlay which is part of the tarball but won't actually be
- // installed
- let cp = |file: &str| {
- builder.install(&builder.src.join(file), &overlay, 0o644);
- };
- cp("COPYRIGHT");
- cp("LICENSE-APACHE");
- cp("LICENSE-MIT");
- cp("README.md");
- // tiny morsel of metadata is used by rust-packaging
- let version = builder.rust_version();
- builder.create(&overlay.join("version"), &version);
- if let Some(sha) = builder.rust_sha() {
- builder.create(&overlay.join("git-commit-hash"), &sha);
- }
+ prepare_image(builder, compiler, tarball.image_dir());
// On MinGW we've got a few runtime DLL dependencies that we need to
// include. The first argument to this script is where to put these DLLs
// install will *also* include the rust-mingw package, which also needs
// licenses, so to be safe we just include it here in all MinGW packages.
if host.contains("pc-windows-gnu") {
- make_win_dist(&image, &tmpdir(builder), host, builder);
-
- let dst = image.join("share/doc");
- t!(fs::create_dir_all(&dst));
- builder.cp_r(&builder.src.join("src/etc/third-party"), &dst);
+ make_win_dist(tarball.image_dir(), &tmpdir(builder), host, builder);
+ tarball.add_dir(builder.src.join("src/etc/third-party"), "share/doc");
}
- // Finally, wrap everything up in a nice tarball!
- let mut cmd = rust_installer(builder);
- cmd.arg("generate")
- .arg("--product-name=Rust")
- .arg("--rel-manifest-dir=rustlib")
- .arg("--success-message=Rust-is-ready-to-roll.")
- .arg("--image-dir").arg(&image)
- .arg("--work-dir").arg(&tmpdir(builder))
- .arg("--output-dir").arg(&distdir(builder))
- .arg("--non-installed-overlay").arg(&overlay)
- .arg(format!("--package-name={}-{}", name, host))
- .arg("--component-name=rustc")
- .arg("--legacy-manifest-dirs=rustlib,cargo");
- builder.run(&mut cmd);
- builder.remove_dir(&image);
- builder.remove_dir(&overlay);
-
- return distdir(builder).join(format!("{}-{}.tar.gz", name, host));
+ return tarball.generate();
fn prepare_image(builder: &Builder<'_>, compiler: Compiler, image: &Path) {
let host = compiler.host;
let src = builder.sysroot(compiler);
- let libdir = builder.rustc_libdir(compiler);
// Copy rustc/rustdoc binaries
t!(fs::create_dir_all(image.join("bin")));
// Copy runtime DLLs needed by the compiler
if libdir_relative.to_str() != Some("bin") {
+ let libdir = builder.rustc_libdir(compiler);
for entry in builder.read_dir(&libdir) {
let name = entry.file_name();
if let Some(s) = name.to_str() {
if is_dylib(s) {
- builder.install(&entry.path(), &image.join(&libdir_relative), 0o644);
+ // Don't use custom libdir here because ^lib/ will be resolved again
+ // with installer
+ builder.install(&entry.path(), &image.join("lib"), 0o644);
}
}
}
// Copy over the codegen backends
let backends_src = builder.sysroot_codegen_backends(compiler);
- let backends_rel = backends_src.strip_prefix(&src).unwrap();
- let backends_dst = image.join(&backends_rel);
+ let backends_rel = backends_src
+ .strip_prefix(&src)
+ .unwrap()
+ .strip_prefix(builder.sysroot_libdir_relative(compiler))
+ .unwrap();
+ // Don't use custom libdir here because ^lib/ will be resolved again with installer
+ let backends_dst = image.join("lib").join(&backends_rel);
+
t!(fs::create_dir_all(&backends_dst));
builder.cp_r(&backends_src, &backends_dst);
// components like the llvm tools and LLD. LLD is included below and
// tools/LLDB come later, so let's just throw it in the rustc
// component for now.
- maybe_install_llvm_dylib(builder, host, image);
+ maybe_install_llvm_runtime(builder, host, image);
+
+ let src_dir = builder.sysroot_libdir(compiler, host).parent().unwrap().join("bin");
+ let dst_dir = image.join("lib/rustlib").join(&*host.triple).join("bin");
+ t!(fs::create_dir_all(&dst_dir));
// Copy over lld if it's there
if builder.config.lld_enabled {
- let exe = exe("rust-lld", &compiler.host);
- let src = builder.sysroot_libdir(compiler, host)
- .parent()
- .unwrap()
- .join("bin")
- .join(&exe);
- // for the rationale about this rename check `compile::copy_lld_to_sysroot`
- let dst = image.join("lib/rustlib")
- .join(&*host)
- .join("bin")
- .join(&exe);
- t!(fs::create_dir_all(&dst.parent().unwrap()));
- builder.copy(&src, &dst);
+ let rust_lld = exe("rust-lld", compiler.host);
+ builder.copy(&src_dir.join(&rust_lld), &dst_dir.join(&rust_lld));
+ // for `-Z gcc-ld=lld`
+ let gcc_lld_dir = dst_dir.join("gcc-ld");
+ t!(fs::create_dir(&gcc_lld_dir));
+ builder.copy(&src_dir.join(&rust_lld), &gcc_lld_dir.join(exe("ld", compiler.host)));
+ builder
+ .copy(&src_dir.join(&rust_lld), &gcc_lld_dir.join(exe("ld64", compiler.host)));
}
+ // Copy over llvm-dwp if it's there
+ let exe = exe("rust-llvm-dwp", compiler.host);
+ builder.copy(&src_dir.join(&exe), &dst_dir.join(&exe));
+
// Man pages
t!(fs::create_dir_all(image.join("share/man/man1")));
let man_src = builder.src.join("src/doc/man");
// Reproducible builds: If SOURCE_DATE_EPOCH is set, use that as the time.
let time = env::var("SOURCE_DATE_EPOCH")
.map(|timestamp| {
- let epoch = timestamp.parse().map_err(|err| {
- format!("could not parse SOURCE_DATE_EPOCH: {}", err)
- }).unwrap();
+ let epoch = timestamp
+ .parse()
+ .map_err(|err| format!("could not parse SOURCE_DATE_EPOCH: {}", err))
+ .unwrap();
time::at(Timespec::new(epoch, 0))
})
let page_dst = man_dst.join(file_entry.file_name());
t!(fs::copy(&page_src, &page_dst));
// template in month/year and version number
- builder.replace_in_file(&page_dst,
- &[("<INSERT DATE HERE>", &month_year),
- ("<INSERT VERSION HERE>", channel::CFG_RELEASE_NUM)]);
+ builder.replace_in_file(
+ &page_dst,
+ &[
+ ("<INSERT DATE HERE>", &month_year),
+ ("<INSERT VERSION HERE>", &builder.version),
+ ],
+ );
}
// Debugger scripts
- builder.ensure(DebuggerScripts {
- sysroot: INTERNER.intern_path(image.to_owned()),
- host,
- });
+ builder
+ .ensure(DebuggerScripts { sysroot: INTERNER.intern_path(image.to_owned()), host });
// Misc license info
let cp = |file: &str| {
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
pub struct DebuggerScripts {
pub sysroot: Interned<PathBuf>,
- pub host: Interned<String>,
+ pub host: TargetSelection,
}
impl Step for DebuggerScripts {
fn make_run(run: RunConfig<'_>) {
run.builder.ensure(DebuggerScripts {
- sysroot: run.builder.sysroot(run.builder.compiler(run.builder.top_stage, run.host)),
+ sysroot: run
+ .builder
+ .sysroot(run.builder.compiler(run.builder.top_stage, run.build_triple())),
host: run.target,
});
}
};
if host.contains("windows-msvc") {
// windbg debugger scripts
- builder.install(&builder.src.join("src/etc/rust-windbg.cmd"), &sysroot.join("bin"),
- 0o755);
+ builder.install(
+ &builder.src.join("src/etc/rust-windbg.cmd"),
+ &sysroot.join("bin"),
+ 0o755,
+ );
cp_debugger_script("natvis/intrinsic.natvis");
cp_debugger_script("natvis/liballoc.natvis");
cp_debugger_script("natvis/libcore.natvis");
+ cp_debugger_script("natvis/libstd.natvis");
} else {
- cp_debugger_script("debugger_pretty_printers_common.py");
+ cp_debugger_script("rust_types.py");
// gdb debugger scripts
- builder.install(&builder.src.join("src/etc/rust-gdb"), &sysroot.join("bin"),
- 0o755);
- builder.install(&builder.src.join("src/etc/rust-gdbgui"), &sysroot.join("bin"),
- 0o755);
+ builder.install(&builder.src.join("src/etc/rust-gdb"), &sysroot.join("bin"), 0o755);
+ builder.install(&builder.src.join("src/etc/rust-gdbgui"), &sysroot.join("bin"), 0o755);
cp_debugger_script("gdb_load_rust_pretty_printers.py");
- cp_debugger_script("gdb_rust_pretty_printing.py");
+ cp_debugger_script("gdb_lookup.py");
+ cp_debugger_script("gdb_providers.py");
// lldb debugger scripts
- builder.install(&builder.src.join("src/etc/rust-lldb"), &sysroot.join("bin"),
- 0o755);
+ builder.install(&builder.src.join("src/etc/rust-lldb"), &sysroot.join("bin"), 0o755);
+
+ cp_debugger_script("lldb_lookup.py");
+ cp_debugger_script("lldb_providers.py");
+ cp_debugger_script("lldb_commands")
+ }
+ }
+}
+
+fn skip_host_target_lib(builder: &Builder<'_>, compiler: Compiler) -> bool {
+ // The only true set of target libraries came from the build triple, so
+ // let's reduce redundant work by only producing archives from that host.
+ if compiler.host != builder.config.build {
+ builder.info("\tskipping, not a build host");
+ true
+ } else {
+ false
+ }
+}
- cp_debugger_script("lldb_rust_formatters.py");
+/// Copy stamped files into an image's `target/lib` directory.
+fn copy_target_libs(builder: &Builder<'_>, target: TargetSelection, image: &Path, stamp: &Path) {
+ let dst = image.join("lib/rustlib").join(target.triple).join("lib");
+ let self_contained_dst = dst.join("self-contained");
+ t!(fs::create_dir_all(&dst));
+ t!(fs::create_dir_all(&self_contained_dst));
+ for (path, dependency_type) in builder.read_stamp_file(stamp) {
+ if dependency_type == DependencyType::TargetSelfContained {
+ builder.copy(&path, &self_contained_dst.join(path.file_name().unwrap()));
+ } else if dependency_type == DependencyType::Target || builder.config.build == target {
+ builder.copy(&path, &dst.join(path.file_name().unwrap()));
}
}
}
#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
pub struct Std {
pub compiler: Compiler,
- pub target: Interned<String>,
+ pub target: TargetSelection,
}
impl Step for Std {
- type Output = PathBuf;
+ type Output = Option<GeneratedTarball>;
const DEFAULT: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
- run.path("src/libstd")
+ run.path("library/std")
}
fn make_run(run: RunConfig<'_>) {
run.builder.ensure(Std {
- compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
+ compiler: run.builder.compiler_for(
+ run.builder.top_stage,
+ run.builder.config.build,
+ run.target,
+ ),
target: run.target,
});
}
- fn run(self, builder: &Builder<'_>) -> PathBuf {
+ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
let compiler = self.compiler;
let target = self.target;
- let name = pkgname(builder, "rust-std");
- builder.info(&format!("Dist std stage{} ({} -> {})",
- compiler.stage, &compiler.host, target));
-
- // The only true set of target libraries came from the build triple, so
- // let's reduce redundant work by only producing archives from that host.
- if compiler.host != builder.config.build {
- builder.info("\tskipping, not a build host");
- return distdir(builder).join(format!("{}-{}.tar.gz", name, target));
+ if skip_host_target_lib(builder, compiler) {
+ return None;
}
- // We want to package up as many target libraries as possible
- // for the `rust-std` package, so if this is a host target we
- // depend on librustc and otherwise we just depend on libtest.
- if builder.hosts.iter().any(|t| t == target) {
- builder.ensure(compile::Rustc { compiler, target });
- } else {
- if builder.no_std(target) == Some(true) {
- // the `test` doesn't compile for no-std targets
- builder.ensure(compile::Std { compiler, target });
- } else {
- builder.ensure(compile::Test { compiler, target });
- }
- }
+ builder.ensure(compile::Std { compiler, target });
- let image = tmpdir(builder).join(format!("{}-{}-image", name, target));
- let _ = fs::remove_dir_all(&image);
+ let mut tarball = Tarball::new(builder, "rust-std", &target.triple);
+ tarball.include_target_in_component_name(true);
- let dst = image.join("lib/rustlib").join(target);
- t!(fs::create_dir_all(&dst));
- let mut src = builder.sysroot_libdir(compiler, target).to_path_buf();
- src.pop(); // Remove the trailing /lib folder from the sysroot_libdir
- builder.cp_filtered(&src, &dst, &|path| {
- if let Some(name) = path.file_name().and_then(|s| s.to_str()) {
- if name == builder.config.rust_codegen_backends_dir.as_str() {
- return false
- }
- if name == "bin" {
- return false
- }
- if name.contains("LLVM") {
- return false
- }
- }
- true
+ let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target);
+ let stamp = compile::libstd_stamp(builder, compiler_to_use, target);
+ copy_target_libs(builder, target, &tarball.image_dir(), &stamp);
+
+ Some(tarball.generate())
+ }
+}
+
+#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
+pub struct RustcDev {
+ pub compiler: Compiler,
+ pub target: TargetSelection,
+}
+
+impl Step for RustcDev {
+ type Output = Option<GeneratedTarball>;
+ const DEFAULT: bool = true;
+ const ONLY_HOSTS: bool = true;
+
+ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+ run.path("rustc-dev")
+ }
+
+ fn make_run(run: RunConfig<'_>) {
+ run.builder.ensure(RustcDev {
+ compiler: run.builder.compiler_for(
+ run.builder.top_stage,
+ run.builder.config.build,
+ run.target,
+ ),
+ target: run.target,
});
+ }
- let mut cmd = rust_installer(builder);
- cmd.arg("generate")
- .arg("--product-name=Rust")
- .arg("--rel-manifest-dir=rustlib")
- .arg("--success-message=std-is-standing-at-the-ready.")
- .arg("--image-dir").arg(&image)
- .arg("--work-dir").arg(&tmpdir(builder))
- .arg("--output-dir").arg(&distdir(builder))
- .arg(format!("--package-name={}-{}", name, target))
- .arg(format!("--component-name=rust-std-{}", target))
- .arg("--legacy-manifest-dirs=rustlib,cargo");
- builder.run(&mut cmd);
- builder.remove_dir(&image);
- distdir(builder).join(format!("{}-{}.tar.gz", name, target))
+ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
+ let compiler = self.compiler;
+ let target = self.target;
+ if skip_host_target_lib(builder, compiler) {
+ return None;
+ }
+
+ builder.ensure(compile::Rustc { compiler, target });
+
+ let tarball = Tarball::new(builder, "rustc-dev", &target.triple);
+
+ let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target);
+ let stamp = compile::librustc_stamp(builder, compiler_to_use, target);
+ copy_target_libs(builder, target, tarball.image_dir(), &stamp);
+
+ let src_files = &["Cargo.lock"];
+ // This is the reduced set of paths which will become the rustc-dev component
+ // (essentially the compiler crates and all of their path dependencies).
+ copy_src_dirs(
+ builder,
+ &builder.src,
+ &["compiler"],
+ &[],
+ &tarball.image_dir().join("lib/rustlib/rustc-src/rust"),
+ );
+ // This particular crate is used as a build dependency of the above.
+ copy_src_dirs(
+ builder,
+ &builder.src,
+ &["src/build_helper"],
+ &[],
+ &tarball.image_dir().join("lib/rustlib/rustc-src/rust"),
+ );
+ for file in src_files {
+ tarball.add_file(builder.src.join(file), "lib/rustlib/rustc-src/rust", 0o644);
+ }
+
+ Some(tarball.generate())
}
}
#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
pub struct Analysis {
pub compiler: Compiler,
- pub target: Interned<String>,
+ pub target: TargetSelection,
}
impl Step for Analysis {
- type Output = PathBuf;
+ type Output = Option<GeneratedTarball>;
const DEFAULT: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
- let builder = run.builder;
- run.path("analysis").default_condition(builder.config.extended)
+ let default = should_build_extended_tool(&run.builder, "analysis");
+ run.path("analysis").default_condition(default)
}
fn make_run(run: RunConfig<'_>) {
run.builder.ensure(Analysis {
- compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
+ // Find the actual compiler (handling the full bootstrap option) which
+ // produced the save-analysis data because that data isn't copied
+ // through the sysroot uplifting.
+ compiler: run.builder.compiler_for(
+ run.builder.top_stage,
+ run.builder.config.build,
+ run.target,
+ ),
target: run.target,
});
}
/// Creates a tarball of save-analysis metadata, if available.
- fn run(self, builder: &Builder<'_>) -> PathBuf {
+ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
let compiler = self.compiler;
let target = self.target;
- assert!(builder.config.extended);
- builder.info("Dist analysis");
- let name = pkgname(builder, "rust-analysis");
-
- if &compiler.host != builder.config.build {
- builder.info("\tskipping, not a build host");
- return distdir(builder).join(format!("{}-{}.tar.gz", name, target));
+ if compiler.host != builder.config.build {
+ return None;
}
- builder.ensure(Std { compiler, target });
-
- // Package save-analysis from stage1 if not doing a full bootstrap, as the
- // stage2 artifacts is simply copied from stage1 in that case.
- let compiler = if builder.force_use_stage1(compiler, target) {
- builder.compiler(1, compiler.host)
- } else {
- compiler.clone()
- };
-
- let image = tmpdir(builder).join(format!("{}-{}-image", name, target));
+ builder.ensure(compile::Std { compiler, target });
+ let src = builder
+ .stage_out(compiler, Mode::Std)
+ .join(target.triple)
+ .join(builder.cargo_dir())
+ .join("deps")
+ .join("save-analysis");
- let src = builder.stage_out(compiler, Mode::Std)
- .join(target).join(builder.cargo_dir()).join("deps");
-
- let image_src = src.join("save-analysis");
- let dst = image.join("lib/rustlib").join(target).join("analysis");
- t!(fs::create_dir_all(&dst));
- builder.info(&format!("image_src: {:?}, dst: {:?}", image_src, dst));
- builder.cp_r(&image_src, &dst);
-
- let mut cmd = rust_installer(builder);
- cmd.arg("generate")
- .arg("--product-name=Rust")
- .arg("--rel-manifest-dir=rustlib")
- .arg("--success-message=save-analysis-saved.")
- .arg("--image-dir").arg(&image)
- .arg("--work-dir").arg(&tmpdir(builder))
- .arg("--output-dir").arg(&distdir(builder))
- .arg(format!("--package-name={}-{}", name, target))
- .arg(format!("--component-name=rust-analysis-{}", target))
- .arg("--legacy-manifest-dirs=rustlib,cargo");
- builder.run(&mut cmd);
- builder.remove_dir(&image);
- distdir(builder).join(format!("{}-{}.tar.gz", name, target))
+ let mut tarball = Tarball::new(builder, "rust-analysis", &target.triple);
+ tarball.include_target_in_component_name(true);
+ tarball.add_dir(src, format!("lib/rustlib/{}/analysis", target.triple));
+ Some(tarball.generate())
}
}
-fn copy_src_dirs(builder: &Builder<'_>, src_dirs: &[&str], exclude_dirs: &[&str], dst_dir: &Path) {
+/// Use the `builder` to make a filtered copy of `base`/X for X in (`src_dirs` - `exclude_dirs`) to
+/// `dst_dir`.
+fn copy_src_dirs(
+ builder: &Builder<'_>,
+ base: &Path,
+ src_dirs: &[&str],
+ exclude_dirs: &[&str],
+ dst_dir: &Path,
+) {
fn filter_fn(exclude_dirs: &[&str], dir: &str, path: &Path) -> bool {
let spath = match path.to_str() {
Some(path) => path,
None => return false,
};
- if spath.ends_with("~") || spath.ends_with(".pyc") {
- return false
+ if spath.ends_with('~') || spath.ends_with(".pyc") {
+ return false;
}
const LLVM_PROJECTS: &[&str] = &[
- "llvm-project/clang", "llvm-project\\clang",
- "llvm-project/lld", "llvm-project\\lld",
- "llvm-project/lldb", "llvm-project\\lldb",
- "llvm-project/llvm", "llvm-project\\llvm",
+ "llvm-project/clang",
+ "llvm-project\\clang",
+ "llvm-project/libunwind",
+ "llvm-project\\libunwind",
+ "llvm-project/lld",
+ "llvm-project\\lld",
+ "llvm-project/lldb",
+ "llvm-project\\lldb",
+ "llvm-project/llvm",
+ "llvm-project\\llvm",
+ "llvm-project/compiler-rt",
+ "llvm-project\\compiler-rt",
];
- if spath.contains("llvm-project") && !spath.ends_with("llvm-project")
+ if spath.contains("llvm-project")
+ && !spath.ends_with("llvm-project")
&& !LLVM_PROJECTS.iter().any(|path| spath.contains(path))
{
return false;
}
- const LLVM_TEST: &[&str] = &[
- "llvm-project/llvm/test", "llvm-project\\llvm\\test",
- "llvm-emscripten/test", "llvm-emscripten\\test",
- ];
- if LLVM_TEST.iter().any(|path| spath.contains(path)) &&
- (spath.ends_with(".ll") ||
- spath.ends_with(".td") ||
- spath.ends_with(".s")) {
- return false
- }
- if spath.contains("test/emscripten") || spath.contains("test\\emscripten") {
- return false
+ const LLVM_TEST: &[&str] = &["llvm-project/llvm/test", "llvm-project\\llvm\\test"];
+ if LLVM_TEST.iter().any(|path| spath.contains(path))
+ && (spath.ends_with(".ll") || spath.ends_with(".td") || spath.ends_with(".s"))
+ {
+ return false;
}
let full_path = Path::new(dir).join(path);
}
let excludes = [
- "CVS", "RCS", "SCCS", ".git", ".gitignore", ".gitmodules",
- ".gitattributes", ".cvsignore", ".svn", ".arch-ids", "{arch}",
- "=RELEASE-ID", "=meta-update", "=update", ".bzr", ".bzrignore",
- ".bzrtags", ".hg", ".hgignore", ".hgrags", "_darcs",
+ "CVS",
+ "RCS",
+ "SCCS",
+ ".git",
+ ".gitignore",
+ ".gitmodules",
+ ".gitattributes",
+ ".cvsignore",
+ ".svn",
+ ".arch-ids",
+ "{arch}",
+ "=RELEASE-ID",
+ "=meta-update",
+ "=update",
+ ".bzr",
+ ".bzrignore",
+ ".bzrtags",
+ ".hg",
+ ".hgignore",
+ ".hgrags",
+ "_darcs",
];
- !path.iter()
- .map(|s| s.to_str().unwrap())
- .any(|s| excludes.contains(&s))
+ !path.iter().map(|s| s.to_str().unwrap()).any(|s| excludes.contains(&s))
}
// Copy the directories using our filter
for item in src_dirs {
let dst = &dst_dir.join(item);
t!(fs::create_dir_all(dst));
- builder.cp_filtered(
- &builder.src.join(item), dst, &|path| filter_fn(exclude_dirs, item, path));
+ builder.cp_filtered(&base.join(item), dst, &|path| filter_fn(exclude_dirs, item, path));
}
}
impl Step for Src {
/// The output path of the src installer tarball
- type Output = PathBuf;
+ type Output = GeneratedTarball;
const DEFAULT: bool = true;
const ONLY_HOSTS: bool = true;
}
/// Creates the `rust-src` installer component
- fn run(self, builder: &Builder<'_>) -> PathBuf {
- builder.info("Dist src");
+ fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
+ let tarball = Tarball::new_targetless(builder, "rust-src");
- let name = pkgname(builder, "rust-src");
- let image = tmpdir(builder).join(format!("{}-image", name));
- let _ = fs::remove_dir_all(&image);
-
- let dst = image.join("lib/rustlib/src");
- let dst_src = dst.join("rust");
- t!(fs::create_dir_all(&dst_src));
+ // A lot of tools expect the rust-src component to be entirely in this directory, so if you
+ // change that (e.g. by adding another directory `lib/rustlib/src/foo` or
+ // `lib/rustlib/src/rust/foo`), you will need to go around hunting for implicit assumptions
+ // and fix them...
+ //
+ // NOTE: if you update the paths here, you also should update the "virtual" path
+ // translation code in `imported_source_files` in `src/librustc_metadata/rmeta/decoder.rs`
+ let dst_src = tarball.image_dir().join("lib/rustlib/src/rust");
- let src_files = [
- "Cargo.lock",
- ];
+ let src_files = ["Cargo.lock"];
// This is the reduced set of paths which will become the rust-src component
- // (essentially libstd and all of its path dependencies)
- let std_src_dirs = [
- "src/build_helper",
- "src/liballoc",
- "src/libcore",
- "src/libpanic_abort",
- "src/libpanic_unwind",
- "src/librustc_asan",
- "src/librustc_lsan",
- "src/librustc_msan",
- "src/librustc_tsan",
- "src/libstd",
- "src/libunwind",
- "src/libtest",
- "src/libterm",
- "src/libprofiler_builtins",
- "src/stdsimd",
- "src/libproc_macro",
- "src/tools/rustc-std-workspace-core",
- "src/tools/rustc-std-workspace-alloc",
- "src/librustc",
- "src/libsyntax",
- ];
-
- copy_src_dirs(builder, &std_src_dirs[..], &[], &dst_src);
+ // (essentially libstd and all of its path dependencies).
+ copy_src_dirs(
+ builder,
+ &builder.src,
+ &["library", "src/llvm-project/libunwind"],
+ &[
+ // not needed and contains symlinks which rustup currently
+ // chokes on when unpacking.
+ "library/backtrace/crates",
+ ],
+ &dst_src,
+ );
for file in src_files.iter() {
builder.copy(&builder.src.join(file), &dst_src.join(file));
}
- // Create source tarball in rust-installer format
- let mut cmd = rust_installer(builder);
- cmd.arg("generate")
- .arg("--product-name=Rust")
- .arg("--rel-manifest-dir=rustlib")
- .arg("--success-message=Awesome-Source.")
- .arg("--image-dir").arg(&image)
- .arg("--work-dir").arg(&tmpdir(builder))
- .arg("--output-dir").arg(&distdir(builder))
- .arg(format!("--package-name={}", name))
- .arg("--component-name=rust-src")
- .arg("--legacy-manifest-dirs=rustlib,cargo");
- builder.run(&mut cmd);
-
- builder.remove_dir(&image);
- distdir(builder).join(&format!("{}.tar.gz", name))
+ tarball.generate()
}
}
-const CARGO_VENDOR_VERSION: &str = "0.1.22";
-
#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
pub struct PlainSourceTarball;
impl Step for PlainSourceTarball {
/// Produces the location of the tarball generated
- type Output = PathBuf;
+ type Output = GeneratedTarball;
const DEFAULT: bool = true;
const ONLY_HOSTS: bool = true;
}
/// Creates the plain source tarball
- fn run(self, builder: &Builder<'_>) -> PathBuf {
- builder.info("Create plain source tarball");
-
- // Make sure that the root folder of tarball has the correct name
- let plain_name = format!("{}-src", pkgname(builder, "rustc"));
- let plain_dst_src = tmpdir(builder).join(&plain_name);
- let _ = fs::remove_dir_all(&plain_dst_src);
- t!(fs::create_dir_all(&plain_dst_src));
+ fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
+ let tarball = Tarball::new(builder, "rustc", "src");
+ let plain_dst_src = tarball.image_dir();
// This is the set of root paths which will become part of the source package
let src_files = [
"Cargo.toml",
"Cargo.lock",
];
- let src_dirs = [
- "src",
- ];
+ let src_dirs = ["src", "compiler", "library"];
- copy_src_dirs(builder, &src_dirs[..], &[], &plain_dst_src);
+ copy_src_dirs(builder, &builder.src, &src_dirs, &[], &plain_dst_src);
// Copy the files normally
for item in &src_files {
// If we're building from git sources, we need to vendor a complete distribution.
if builder.rust_info.is_git() {
- // Get cargo-vendor installed, if it isn't already.
- let mut has_cargo_vendor = false;
- let mut cmd = Command::new(&builder.initial_cargo);
- for line in output(cmd.arg("install").arg("--list")).lines() {
- has_cargo_vendor |= line.starts_with("cargo-vendor ");
- }
- if !has_cargo_vendor {
- let mut cmd = builder.cargo(
- builder.compiler(0, builder.config.build),
- Mode::ToolBootstrap,
- builder.config.build,
- "install"
- );
- cmd.arg("--force")
- .arg("--debug")
- .arg("--vers").arg(CARGO_VENDOR_VERSION)
- .arg("cargo-vendor");
- builder.run(&mut cmd);
- }
-
// Vendor all Cargo dependencies
let mut cmd = Command::new(&builder.initial_cargo);
cmd.arg("vendor")
- .current_dir(&plain_dst_src);
+ .arg("--sync")
+ .arg(builder.src.join("./src/tools/rust-analyzer/Cargo.toml"))
+ .arg(builder.src.join("./compiler/rustc_codegen_cranelift/Cargo.toml"))
+ .current_dir(&plain_dst_src);
builder.run(&mut cmd);
}
- // Create plain source tarball
- let plain_name = format!("rustc-{}-src", builder.rust_package_vers());
- let mut tarball = distdir(builder).join(&format!("{}.tar.gz", plain_name));
- tarball.set_extension(""); // strip .gz
- tarball.set_extension(""); // strip .tar
- if let Some(dir) = tarball.parent() {
- builder.create_dir(&dir);
- }
- builder.info("running installer");
- let mut cmd = rust_installer(builder);
- cmd.arg("tarball")
- .arg("--input").arg(&plain_name)
- .arg("--output").arg(&tarball)
- .arg("--work-dir=.")
- .current_dir(tmpdir(builder));
- builder.run(&mut cmd);
- distdir(builder).join(&format!("{}.tar.gz", plain_name))
+ tarball.bare()
}
}
// characters and on `C:\` paths, so normalize both of them away.
pub fn sanitize_sh(path: &Path) -> String {
let path = path.to_str().unwrap().replace("\\", "/");
- return change_drive(&path).unwrap_or(path);
+ return change_drive(unc_to_lfs(&path)).unwrap_or(path);
+
+ fn unc_to_lfs(s: &str) -> &str {
+ s.strip_prefix("//?/").unwrap_or(s)
+ }
fn change_drive(s: &str) -> Option<String> {
let mut ch = s.chars();
let drive = ch.next().unwrap_or('C');
if ch.next() != Some(':') {
- return None
+ return None;
}
if ch.next() != Some('/') {
- return None
+ return None;
}
Some(format!("/{}/{}", drive, &s[drive.len_utf8() + 2..]))
}
#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
pub struct Cargo {
- pub stage: u32,
- pub target: Interned<String>,
+ pub compiler: Compiler,
+ pub target: TargetSelection,
}
impl Step for Cargo {
- type Output = PathBuf;
+ type Output = Option<GeneratedTarball>;
+ const DEFAULT: bool = true;
const ONLY_HOSTS: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
- run.path("cargo")
+ let default = should_build_extended_tool(&run.builder, "cargo");
+ run.path("cargo").default_condition(default)
}
fn make_run(run: RunConfig<'_>) {
run.builder.ensure(Cargo {
- stage: run.builder.top_stage,
+ compiler: run.builder.compiler_for(
+ run.builder.top_stage,
+ run.builder.config.build,
+ run.target,
+ ),
target: run.target,
});
}
- fn run(self, builder: &Builder<'_>) -> PathBuf {
- let stage = self.stage;
+ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
+ let compiler = self.compiler;
let target = self.target;
- builder.info(&format!("Dist cargo stage{} ({})", stage, target));
+ let cargo = builder.ensure(tool::Cargo { compiler, target });
let src = builder.src.join("src/tools/cargo");
let etc = src.join("src/etc");
- let release_num = builder.release_num("cargo");
- let name = pkgname(builder, "cargo");
- let version = builder.cargo_info.version(builder, &release_num);
-
- let tmp = tmpdir(builder);
- let image = tmp.join("cargo-image");
- drop(fs::remove_dir_all(&image));
- builder.create_dir(&image);
// Prepare the image directory
- builder.create_dir(&image.join("share/zsh/site-functions"));
- builder.create_dir(&image.join("etc/bash_completion.d"));
- let cargo = builder.ensure(tool::Cargo {
- compiler: builder.compiler(stage, builder.config.build),
- target
- });
- builder.install(&cargo, &image.join("bin"), 0o755);
- for man in t!(etc.join("man").read_dir()) {
- let man = t!(man);
- builder.install(&man.path(), &image.join("share/man/man1"), 0o644);
+ let mut tarball = Tarball::new(builder, "cargo", &target.triple);
+ tarball.set_overlay(OverlayKind::Cargo);
+
+ tarball.add_file(&cargo, "bin", 0o755);
+ tarball.add_file(etc.join("_cargo"), "share/zsh/site-functions", 0o644);
+ tarball.add_renamed_file(etc.join("cargo.bashcomp.sh"), "etc/bash_completion.d", "cargo");
+ tarball.add_dir(etc.join("man"), "share/man/man1");
+ tarball.add_legal_and_readme_to("share/doc/cargo");
+
+ for dirent in fs::read_dir(cargo.parent().unwrap()).expect("read_dir") {
+ let dirent = dirent.expect("read dir entry");
+ if dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") {
+ tarball.add_file(&dirent.path(), "libexec", 0o755);
+ }
}
- builder.install(&etc.join("_cargo"), &image.join("share/zsh/site-functions"), 0o644);
- builder.copy(&etc.join("cargo.bashcomp.sh"),
- &image.join("etc/bash_completion.d/cargo"));
- let doc = image.join("share/doc/cargo");
- builder.install(&src.join("README.md"), &doc, 0o644);
- builder.install(&src.join("LICENSE-MIT"), &doc, 0o644);
- builder.install(&src.join("LICENSE-APACHE"), &doc, 0o644);
- builder.install(&src.join("LICENSE-THIRD-PARTY"), &doc, 0o644);
-
- // Prepare the overlay
- let overlay = tmp.join("cargo-overlay");
- drop(fs::remove_dir_all(&overlay));
- builder.create_dir(&overlay);
- builder.install(&src.join("README.md"), &overlay, 0o644);
- builder.install(&src.join("LICENSE-MIT"), &overlay, 0o644);
- builder.install(&src.join("LICENSE-APACHE"), &overlay, 0o644);
- builder.install(&src.join("LICENSE-THIRD-PARTY"), &overlay, 0o644);
- builder.create(&overlay.join("version"), &version);
-
- // Generate the installer tarball
- let mut cmd = rust_installer(builder);
- cmd.arg("generate")
- .arg("--product-name=Rust")
- .arg("--rel-manifest-dir=rustlib")
- .arg("--success-message=Rust-is-ready-to-roll.")
- .arg("--image-dir").arg(&image)
- .arg("--work-dir").arg(&tmpdir(builder))
- .arg("--output-dir").arg(&distdir(builder))
- .arg("--non-installed-overlay").arg(&overlay)
- .arg(format!("--package-name={}-{}", name, target))
- .arg("--component-name=cargo")
- .arg("--legacy-manifest-dirs=rustlib,cargo");
- builder.run(&mut cmd);
- distdir(builder).join(format!("{}-{}.tar.gz", name, target))
+
+ Some(tarball.generate())
}
}
#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
pub struct Rls {
- pub stage: u32,
- pub target: Interned<String>,
+ pub compiler: Compiler,
+ pub target: TargetSelection,
}
impl Step for Rls {
- type Output = Option<PathBuf>;
+ type Output = Option<GeneratedTarball>;
const ONLY_HOSTS: bool = true;
+ const DEFAULT: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
- run.path("rls")
+ let default = should_build_extended_tool(&run.builder, "rls");
+ run.path("rls").default_condition(default)
}
fn make_run(run: RunConfig<'_>) {
run.builder.ensure(Rls {
- stage: run.builder.top_stage,
+ compiler: run.builder.compiler_for(
+ run.builder.top_stage,
+ run.builder.config.build,
+ run.target,
+ ),
target: run.target,
});
}
- fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
- let stage = self.stage;
+ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
+ let compiler = self.compiler;
let target = self.target;
- assert!(builder.config.extended);
- builder.info(&format!("Dist RLS stage{} ({})", stage, target));
- let src = builder.src.join("src/tools/rls");
- let release_num = builder.release_num("rls");
- let name = pkgname(builder, "rls");
- let version = builder.rls_info.version(builder, &release_num);
+ let rls = builder
+ .ensure(tool::Rls { compiler, target, extra_features: Vec::new() })
+ .or_else(|| {
+ missing_tool("RLS", builder.build.config.missing_tools);
+ None
+ })?;
- let tmp = tmpdir(builder);
- let image = tmp.join("rls-image");
- drop(fs::remove_dir_all(&image));
- t!(fs::create_dir_all(&image));
+ let mut tarball = Tarball::new(builder, "rls", &target.triple);
+ tarball.set_overlay(OverlayKind::RLS);
+ tarball.is_preview(true);
+ tarball.add_file(rls, "bin", 0o755);
+ tarball.add_legal_and_readme_to("share/doc/rls");
+ Some(tarball.generate())
+ }
+}
- // Prepare the image directory
- // We expect RLS to build, because we've exited this step above if tool
- // state for RLS isn't testing.
- let rls = builder.ensure(tool::Rls {
- compiler: builder.compiler(stage, builder.config.build),
- target, extra_features: Vec::new()
- }).or_else(|| { missing_tool("RLS", builder.build.config.missing_tools); None })?;
-
- builder.install(&rls, &image.join("bin"), 0o755);
- let doc = image.join("share/doc/rls");
- builder.install(&src.join("README.md"), &doc, 0o644);
- builder.install(&src.join("LICENSE-MIT"), &doc, 0o644);
- builder.install(&src.join("LICENSE-APACHE"), &doc, 0o644);
-
- // Prepare the overlay
- let overlay = tmp.join("rls-overlay");
- drop(fs::remove_dir_all(&overlay));
- t!(fs::create_dir_all(&overlay));
- builder.install(&src.join("README.md"), &overlay, 0o644);
- builder.install(&src.join("LICENSE-MIT"), &overlay, 0o644);
- builder.install(&src.join("LICENSE-APACHE"), &overlay, 0o644);
- builder.create(&overlay.join("version"), &version);
-
- // Generate the installer tarball
- let mut cmd = rust_installer(builder);
- cmd.arg("generate")
- .arg("--product-name=Rust")
- .arg("--rel-manifest-dir=rustlib")
- .arg("--success-message=RLS-ready-to-serve.")
- .arg("--image-dir").arg(&image)
- .arg("--work-dir").arg(&tmpdir(builder))
- .arg("--output-dir").arg(&distdir(builder))
- .arg("--non-installed-overlay").arg(&overlay)
- .arg(format!("--package-name={}-{}", name, target))
- .arg("--legacy-manifest-dirs=rustlib,cargo")
- .arg("--component-name=rls-preview");
-
- builder.run(&mut cmd);
- Some(distdir(builder).join(format!("{}-{}.tar.gz", name, target)))
+#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
+pub struct RustAnalyzer {
+ pub compiler: Compiler,
+ pub target: TargetSelection,
+}
+
+impl Step for RustAnalyzer {
+ type Output = Option<GeneratedTarball>;
+ const DEFAULT: bool = true;
+ const ONLY_HOSTS: bool = true;
+
+ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+ let default = should_build_extended_tool(&run.builder, "rust-analyzer");
+ run.path("rust-analyzer").default_condition(default)
+ }
+
+ fn make_run(run: RunConfig<'_>) {
+ run.builder.ensure(RustAnalyzer {
+ compiler: run.builder.compiler_for(
+ run.builder.top_stage,
+ run.builder.config.build,
+ run.target,
+ ),
+ target: run.target,
+ });
+ }
+
+ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
+ // This prevents rust-analyzer from being built for "dist" or "install"
+ // on the stable/beta channels. It is a nightly-only tool and should
+ // not be included.
+ if !builder.build.unstable_features() {
+ return None;
+ }
+ let compiler = self.compiler;
+ let target = self.target;
+
+ if target.contains("riscv64") {
+ // riscv64 currently has an LLVM bug that makes rust-analyzer unable
+ // to build. See #74813 for details.
+ return None;
+ }
+
+ let rust_analyzer = builder
+ .ensure(tool::RustAnalyzer { compiler, target, extra_features: Vec::new() })
+ .expect("rust-analyzer always builds");
+
+ let mut tarball = Tarball::new(builder, "rust-analyzer", &target.triple);
+ tarball.set_overlay(OverlayKind::RustAnalyzer);
+ tarball.is_preview(true);
+ tarball.add_file(rust_analyzer, "bin", 0o755);
+ tarball.add_legal_and_readme_to("share/doc/rust-analyzer");
+ Some(tarball.generate())
}
}
#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
pub struct Clippy {
- pub stage: u32,
- pub target: Interned<String>,
+ pub compiler: Compiler,
+ pub target: TargetSelection,
}
impl Step for Clippy {
- type Output = Option<PathBuf>;
+ type Output = Option<GeneratedTarball>;
+ const DEFAULT: bool = true;
const ONLY_HOSTS: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
- run.path("clippy")
+ let default = should_build_extended_tool(&run.builder, "clippy");
+ run.path("clippy").default_condition(default)
}
fn make_run(run: RunConfig<'_>) {
run.builder.ensure(Clippy {
- stage: run.builder.top_stage,
+ compiler: run.builder.compiler_for(
+ run.builder.top_stage,
+ run.builder.config.build,
+ run.target,
+ ),
target: run.target,
});
}
- fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
- let stage = self.stage;
+ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
+ let compiler = self.compiler;
let target = self.target;
- assert!(builder.config.extended);
-
- builder.info(&format!("Dist clippy stage{} ({})", stage, target));
- let src = builder.src.join("src/tools/clippy");
- let release_num = builder.release_num("clippy");
- let name = pkgname(builder, "clippy");
- let version = builder.clippy_info.version(builder, &release_num);
-
- let tmp = tmpdir(builder);
- let image = tmp.join("clippy-image");
- drop(fs::remove_dir_all(&image));
- builder.create_dir(&image);
// Prepare the image directory
// We expect clippy to build, because we've exited this step above if tool
// state for clippy isn't testing.
- let clippy = builder.ensure(tool::Clippy {
- compiler: builder.compiler(stage, builder.config.build),
- target, extra_features: Vec::new()
- }).or_else(|| { missing_tool("clippy", builder.build.config.missing_tools); None })?;
- let cargoclippy = builder.ensure(tool::CargoClippy {
- compiler: builder.compiler(stage, builder.config.build),
- target, extra_features: Vec::new()
- }).or_else(|| { missing_tool("cargo clippy", builder.build.config.missing_tools); None })?;
-
- builder.install(&clippy, &image.join("bin"), 0o755);
- builder.install(&cargoclippy, &image.join("bin"), 0o755);
- let doc = image.join("share/doc/clippy");
- builder.install(&src.join("README.md"), &doc, 0o644);
- builder.install(&src.join("LICENSE-APACHE"), &doc, 0o644);
- builder.install(&src.join("LICENSE-MIT"), &doc, 0o644);
-
- // Prepare the overlay
- let overlay = tmp.join("clippy-overlay");
- drop(fs::remove_dir_all(&overlay));
- t!(fs::create_dir_all(&overlay));
- builder.install(&src.join("README.md"), &overlay, 0o644);
- builder.install(&src.join("LICENSE-APACHE"), &doc, 0o644);
- builder.install(&src.join("LICENSE-MIT"), &doc, 0o644);
- builder.create(&overlay.join("version"), &version);
-
- // Generate the installer tarball
- let mut cmd = rust_installer(builder);
- cmd.arg("generate")
- .arg("--product-name=Rust")
- .arg("--rel-manifest-dir=rustlib")
- .arg("--success-message=clippy-ready-to-serve.")
- .arg("--image-dir").arg(&image)
- .arg("--work-dir").arg(&tmpdir(builder))
- .arg("--output-dir").arg(&distdir(builder))
- .arg("--non-installed-overlay").arg(&overlay)
- .arg(format!("--package-name={}-{}", name, target))
- .arg("--legacy-manifest-dirs=rustlib,cargo")
- .arg("--component-name=clippy-preview");
-
- builder.run(&mut cmd);
- Some(distdir(builder).join(format!("{}-{}.tar.gz", name, target)))
+ let clippy = builder
+ .ensure(tool::Clippy { compiler, target, extra_features: Vec::new() })
+ .expect("clippy expected to build - essential tool");
+ let cargoclippy = builder
+ .ensure(tool::CargoClippy { compiler, target, extra_features: Vec::new() })
+ .expect("clippy expected to build - essential tool");
+
+ let mut tarball = Tarball::new(builder, "clippy", &target.triple);
+ tarball.set_overlay(OverlayKind::Clippy);
+ tarball.is_preview(true);
+ tarball.add_file(clippy, "bin", 0o755);
+ tarball.add_file(cargoclippy, "bin", 0o755);
+ tarball.add_legal_and_readme_to("share/doc/clippy");
+ Some(tarball.generate())
}
}
#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
pub struct Miri {
- pub stage: u32,
- pub target: Interned<String>,
+ pub compiler: Compiler,
+ pub target: TargetSelection,
}
impl Step for Miri {
- type Output = Option<PathBuf>;
+ type Output = Option<GeneratedTarball>;
+ const DEFAULT: bool = true;
const ONLY_HOSTS: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
- run.path("miri")
+ let default = should_build_extended_tool(&run.builder, "miri");
+ run.path("miri").default_condition(default)
}
fn make_run(run: RunConfig<'_>) {
run.builder.ensure(Miri {
- stage: run.builder.top_stage,
+ compiler: run.builder.compiler_for(
+ run.builder.top_stage,
+ run.builder.config.build,
+ run.target,
+ ),
target: run.target,
});
}
- fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
- let stage = self.stage;
+ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
+ // This prevents miri from being built for "dist" or "install"
+ // on the stable/beta channels. It is a nightly-only tool and should
+ // not be included.
+ if !builder.build.unstable_features() {
+ return None;
+ }
+ let compiler = self.compiler;
let target = self.target;
- assert!(builder.config.extended);
-
- builder.info(&format!("Dist miri stage{} ({})", stage, target));
- let src = builder.src.join("src/tools/miri");
- let release_num = builder.release_num("miri");
- let name = pkgname(builder, "miri");
- let version = builder.miri_info.version(builder, &release_num);
-
- let tmp = tmpdir(builder);
- let image = tmp.join("miri-image");
- drop(fs::remove_dir_all(&image));
- builder.create_dir(&image);
- // Prepare the image directory
- // We expect miri to build, because we've exited this step above if tool
- // state for miri isn't testing.
- let miri = builder.ensure(tool::Miri {
- compiler: builder.compiler(stage, builder.config.build),
- target, extra_features: Vec::new()
- }).or_else(|| { missing_tool("miri", builder.build.config.missing_tools); None })?;
- let cargomiri = builder.ensure(tool::CargoMiri {
- compiler: builder.compiler(stage, builder.config.build),
- target, extra_features: Vec::new()
- }).or_else(|| { missing_tool("cargo miri", builder.build.config.missing_tools); None })?;
-
- builder.install(&miri, &image.join("bin"), 0o755);
- builder.install(&cargomiri, &image.join("bin"), 0o755);
- let doc = image.join("share/doc/miri");
- builder.install(&src.join("README.md"), &doc, 0o644);
- builder.install(&src.join("LICENSE-APACHE"), &doc, 0o644);
- builder.install(&src.join("LICENSE-MIT"), &doc, 0o644);
-
- // Prepare the overlay
- let overlay = tmp.join("miri-overlay");
- drop(fs::remove_dir_all(&overlay));
- t!(fs::create_dir_all(&overlay));
- builder.install(&src.join("README.md"), &overlay, 0o644);
- builder.install(&src.join("LICENSE-APACHE"), &doc, 0o644);
- builder.install(&src.join("LICENSE-MIT"), &doc, 0o644);
- builder.create(&overlay.join("version"), &version);
-
- // Generate the installer tarball
- let mut cmd = rust_installer(builder);
- cmd.arg("generate")
- .arg("--product-name=Rust")
- .arg("--rel-manifest-dir=rustlib")
- .arg("--success-message=miri-ready-to-serve.")
- .arg("--image-dir").arg(&image)
- .arg("--work-dir").arg(&tmpdir(builder))
- .arg("--output-dir").arg(&distdir(builder))
- .arg("--non-installed-overlay").arg(&overlay)
- .arg(format!("--package-name={}-{}", name, target))
- .arg("--legacy-manifest-dirs=rustlib,cargo")
- .arg("--component-name=miri-preview");
-
- builder.run(&mut cmd);
- Some(distdir(builder).join(format!("{}-{}.tar.gz", name, target)))
+ let miri = builder
+ .ensure(tool::Miri { compiler, target, extra_features: Vec::new() })
+ .or_else(|| {
+ missing_tool("miri", builder.build.config.missing_tools);
+ None
+ })?;
+ let cargomiri = builder
+ .ensure(tool::CargoMiri { compiler, target, extra_features: Vec::new() })
+ .or_else(|| {
+ missing_tool("cargo miri", builder.build.config.missing_tools);
+ None
+ })?;
+
+ let mut tarball = Tarball::new(builder, "miri", &target.triple);
+ tarball.set_overlay(OverlayKind::Miri);
+ tarball.is_preview(true);
+ tarball.add_file(miri, "bin", 0o755);
+ tarball.add_file(cargomiri, "bin", 0o755);
+ tarball.add_legal_and_readme_to("share/doc/miri");
+ Some(tarball.generate())
}
}
#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
pub struct Rustfmt {
- pub stage: u32,
- pub target: Interned<String>,
+ pub compiler: Compiler,
+ pub target: TargetSelection,
}
impl Step for Rustfmt {
- type Output = Option<PathBuf>;
+ type Output = Option<GeneratedTarball>;
+ const DEFAULT: bool = true;
const ONLY_HOSTS: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
- run.path("rustfmt")
+ let default = should_build_extended_tool(&run.builder, "rustfmt");
+ run.path("rustfmt").default_condition(default)
}
fn make_run(run: RunConfig<'_>) {
run.builder.ensure(Rustfmt {
- stage: run.builder.top_stage,
+ compiler: run.builder.compiler_for(
+ run.builder.top_stage,
+ run.builder.config.build,
+ run.target,
+ ),
target: run.target,
});
}
- fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
- let stage = self.stage;
+ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
+ let compiler = self.compiler;
let target = self.target;
- builder.info(&format!("Dist Rustfmt stage{} ({})", stage, target));
- let src = builder.src.join("src/tools/rustfmt");
- let release_num = builder.release_num("rustfmt");
- let name = pkgname(builder, "rustfmt");
- let version = builder.rustfmt_info.version(builder, &release_num);
+ let rustfmt = builder
+ .ensure(tool::Rustfmt { compiler, target, extra_features: Vec::new() })
+ .or_else(|| {
+ missing_tool("Rustfmt", builder.build.config.missing_tools);
+ None
+ })?;
+ let cargofmt = builder
+ .ensure(tool::Cargofmt { compiler, target, extra_features: Vec::new() })
+ .or_else(|| {
+ missing_tool("Cargofmt", builder.build.config.missing_tools);
+ None
+ })?;
+
+ let mut tarball = Tarball::new(builder, "rustfmt", &target.triple);
+ tarball.set_overlay(OverlayKind::Rustfmt);
+ tarball.is_preview(true);
+ tarball.add_file(rustfmt, "bin", 0o755);
+ tarball.add_file(cargofmt, "bin", 0o755);
+ tarball.add_legal_and_readme_to("share/doc/rustfmt");
+ Some(tarball.generate())
+ }
+}
+
+#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
+pub struct RustDemangler {
+ pub compiler: Compiler,
+ pub target: TargetSelection,
+}
- let tmp = tmpdir(builder);
- let image = tmp.join("rustfmt-image");
- drop(fs::remove_dir_all(&image));
- builder.create_dir(&image);
+impl Step for RustDemangler {
+ type Output = Option<GeneratedTarball>;
+ const DEFAULT: bool = true;
+ const ONLY_HOSTS: bool = true;
+
+ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+ // While other tools use `should_build_extended_tool` to decide whether to be run by
+ // default or not, `rust-demangler` must be build when *either* it's enabled as a tool like
+ // the other ones or if `profiler = true`. Because we don't know the target at this stage
+ // we run the step by default when only `extended = true`, and decide whether to actually
+ // run it or not later.
+ let default = run.builder.config.extended;
+ run.path("rust-demangler").default_condition(default)
+ }
+
+ fn make_run(run: RunConfig<'_>) {
+ run.builder.ensure(RustDemangler {
+ compiler: run.builder.compiler_for(
+ run.builder.top_stage,
+ run.builder.config.build,
+ run.target,
+ ),
+ target: run.target,
+ });
+ }
+
+ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
+ let compiler = self.compiler;
+ let target = self.target;
+
+ // Only build this extended tool if explicitly included in `tools`, or if `profiler = true`
+ let condition = should_build_extended_tool(builder, "rust-demangler")
+ || builder.config.profiler_enabled(target);
+ if builder.config.extended && !condition {
+ return None;
+ }
+
+ let rust_demangler = builder
+ .ensure(tool::RustDemangler { compiler, target, extra_features: Vec::new() })
+ .expect("rust-demangler expected to build - in-tree tool");
// Prepare the image directory
- let rustfmt = builder.ensure(tool::Rustfmt {
- compiler: builder.compiler(stage, builder.config.build),
- target, extra_features: Vec::new()
- }).or_else(|| { missing_tool("Rustfmt", builder.build.config.missing_tools); None })?;
- let cargofmt = builder.ensure(tool::Cargofmt {
- compiler: builder.compiler(stage, builder.config.build),
- target, extra_features: Vec::new()
- }).or_else(|| { missing_tool("Cargofmt", builder.build.config.missing_tools); None })?;
-
- builder.install(&rustfmt, &image.join("bin"), 0o755);
- builder.install(&cargofmt, &image.join("bin"), 0o755);
- let doc = image.join("share/doc/rustfmt");
- builder.install(&src.join("README.md"), &doc, 0o644);
- builder.install(&src.join("LICENSE-MIT"), &doc, 0o644);
- builder.install(&src.join("LICENSE-APACHE"), &doc, 0o644);
-
- // Prepare the overlay
- let overlay = tmp.join("rustfmt-overlay");
- drop(fs::remove_dir_all(&overlay));
- builder.create_dir(&overlay);
- builder.install(&src.join("README.md"), &overlay, 0o644);
- builder.install(&src.join("LICENSE-MIT"), &overlay, 0o644);
- builder.install(&src.join("LICENSE-APACHE"), &overlay, 0o644);
- builder.create(&overlay.join("version"), &version);
-
- // Generate the installer tarball
- let mut cmd = rust_installer(builder);
- cmd.arg("generate")
- .arg("--product-name=Rust")
- .arg("--rel-manifest-dir=rustlib")
- .arg("--success-message=rustfmt-ready-to-fmt.")
- .arg("--image-dir").arg(&image)
- .arg("--work-dir").arg(&tmpdir(builder))
- .arg("--output-dir").arg(&distdir(builder))
- .arg("--non-installed-overlay").arg(&overlay)
- .arg(format!("--package-name={}-{}", name, target))
- .arg("--legacy-manifest-dirs=rustlib,cargo")
- .arg("--component-name=rustfmt-preview");
-
- builder.run(&mut cmd);
- Some(distdir(builder).join(format!("{}-{}.tar.gz", name, target)))
+ let mut tarball = Tarball::new(builder, "rust-demangler", &target.triple);
+ tarball.set_overlay(OverlayKind::RustDemangler);
+ tarball.is_preview(true);
+ tarball.add_file(&rust_demangler, "bin", 0o755);
+ tarball.add_legal_and_readme_to("share/doc/rust-demangler");
+ Some(tarball.generate())
}
}
#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
pub struct Extended {
stage: u32,
- host: Interned<String>,
- target: Interned<String>,
+ host: TargetSelection,
+ target: TargetSelection,
}
impl Step for Extended {
/// Creates a combined installer for the specified target in the provided stage.
fn run(self, builder: &Builder<'_>) {
- let stage = self.stage;
let target = self.target;
+ let stage = self.stage;
+ let compiler = builder.compiler_for(self.stage, self.host, self.target);
- builder.info(&format!("Dist extended stage{} ({})", stage, target));
-
- let rustc_installer = builder.ensure(Rustc {
- compiler: builder.compiler(stage, target),
- });
- let cargo_installer = builder.ensure(Cargo { stage, target });
- let rustfmt_installer = builder.ensure(Rustfmt { stage, target });
- let rls_installer = builder.ensure(Rls { stage, target });
- let llvm_tools_installer = builder.ensure(LlvmTools { stage, target });
- let clippy_installer = builder.ensure(Clippy { stage, target });
- let miri_installer = builder.ensure(Miri { stage, target });
- let lldb_installer = builder.ensure(Lldb { target });
- let mingw_installer = builder.ensure(Mingw { host: target });
- let analysis_installer = builder.ensure(Analysis {
- compiler: builder.compiler(stage, self.host),
- target
- });
-
- let docs_installer = builder.ensure(Docs { stage, host: target, });
- let std_installer = builder.ensure(Std {
- compiler: builder.compiler(stage, self.host),
- target,
- });
+ builder.info(&format!("Dist extended stage{} ({})", compiler.stage, target));
- let tmp = tmpdir(builder);
- let overlay = tmp.join("extended-overlay");
- let etc = builder.src.join("src/etc/installer");
- let work = tmp.join("work");
-
- let _ = fs::remove_dir_all(&overlay);
- builder.install(&builder.src.join("COPYRIGHT"), &overlay, 0o644);
- builder.install(&builder.src.join("LICENSE-APACHE"), &overlay, 0o644);
- builder.install(&builder.src.join("LICENSE-MIT"), &overlay, 0o644);
- let version = builder.rust_version();
- builder.create(&overlay.join("version"), &version);
- if let Some(sha) = builder.rust_sha() {
- builder.create(&overlay.join("git-commit-hash"), &sha);
+ let mut tarballs = Vec::new();
+ let mut built_tools = HashSet::new();
+ macro_rules! add_component {
+ ($name:expr => $step:expr) => {
+ if let Some(tarball) = builder.ensure_if_default($step) {
+ tarballs.push(tarball);
+ built_tools.insert($name);
+ }
+ };
}
- builder.install(&etc.join("README.md"), &overlay, 0o644);
// When rust-std package split from rustc, we needed to ensure that during
// upgrades rustc was upgraded before rust-std. To avoid rustc clobbering
// the std files during uninstall. To do this ensure that rustc comes
// before rust-std in the list below.
- let mut tarballs = Vec::new();
- tarballs.push(rustc_installer);
- tarballs.push(cargo_installer);
- tarballs.extend(rls_installer.clone());
- tarballs.extend(clippy_installer.clone());
- tarballs.extend(miri_installer.clone());
- tarballs.extend(rustfmt_installer.clone());
- tarballs.extend(llvm_tools_installer);
- tarballs.extend(lldb_installer);
- tarballs.push(analysis_installer);
- tarballs.push(std_installer);
- if builder.config.docs {
- tarballs.push(docs_installer);
- }
- if target.contains("pc-windows-gnu") {
- tarballs.push(mingw_installer.unwrap());
+ tarballs.push(builder.ensure(Rustc { compiler: builder.compiler(stage, target) }));
+ tarballs.push(builder.ensure(Std { compiler, target }).expect("missing std"));
+
+ if target.contains("windows-gnu") {
+ tarballs.push(builder.ensure(Mingw { host: target }).expect("missing mingw"));
}
- let mut input_tarballs = tarballs[0].as_os_str().to_owned();
- for tarball in &tarballs[1..] {
- input_tarballs.push(",");
- input_tarballs.push(tarball);
+
+ add_component!("rust-docs" => Docs { host: target });
+ add_component!("rust-demangler"=> RustDemangler { compiler, target });
+ add_component!("cargo" => Cargo { compiler, target });
+ add_component!("rustfmt" => Rustfmt { compiler, target });
+ add_component!("rls" => Rls { compiler, target });
+ add_component!("rust-analyzer" => RustAnalyzer { compiler, target });
+ add_component!("llvm-components" => LlvmTools { target });
+ add_component!("clippy" => Clippy { compiler, target });
+ add_component!("miri" => Miri { compiler, target });
+ add_component!("analysis" => Analysis { compiler, target });
+
+ let etc = builder.src.join("src/etc/installer");
+
+ // Avoid producing tarballs during a dry run.
+ if builder.config.dry_run {
+ return;
}
- let mut cmd = rust_installer(builder);
- cmd.arg("combine")
- .arg("--product-name=Rust")
- .arg("--rel-manifest-dir=rustlib")
- .arg("--success-message=Rust-is-ready-to-roll.")
- .arg("--work-dir").arg(&work)
- .arg("--output-dir").arg(&distdir(builder))
- .arg(format!("--package-name={}-{}", pkgname(builder, "rust"), target))
- .arg("--legacy-manifest-dirs=rustlib,cargo")
- .arg("--input-tarballs").arg(input_tarballs)
- .arg("--non-installed-overlay").arg(&overlay);
- builder.run(&mut cmd);
+ let tarball = Tarball::new(builder, "rust", &target.triple);
+ let generated = tarball.combine(&tarballs);
+
+ let tmp = tmpdir(builder).join("combined-tarball");
+ let work = generated.work_dir();
let mut license = String::new();
license += &builder.read(&builder.src.join("COPYRIGHT"));
license += &builder.read(&builder.src.join("LICENSE-APACHE"));
license += &builder.read(&builder.src.join("LICENSE-MIT"));
- license.push_str("\n");
- license.push_str("\n");
+ license.push('\n');
+ license.push('\n');
let rtf = r"{\rtf1\ansi\deff0{\fonttbl{\f0\fnil\fcharset0 Arial;}}\nowwrap\fs18";
let mut rtf = rtf.to_string();
- rtf.push_str("\n");
+ rtf.push('\n');
for line in license.lines() {
rtf.push_str(line);
rtf.push_str("\\line ");
}
- rtf.push_str("}");
+ rtf.push('}');
fn filter(contents: &str, marker: &str) -> String {
let start = format!("tool-{}-start", marker);
let xform = |p: &Path| {
let mut contents = t!(fs::read_to_string(p));
- if rls_installer.is_none() {
- contents = filter(&contents, "rls");
- }
- if clippy_installer.is_none() {
- contents = filter(&contents, "clippy");
- }
- if miri_installer.is_none() {
- contents = filter(&contents, "miri");
- }
- if rustfmt_installer.is_none() {
- contents = filter(&contents, "rustfmt");
+ for tool in &["rust-demangler", "rls", "rust-analyzer", "miri", "rustfmt"] {
+ if !built_tools.contains(tool) {
+ contents = filter(&contents, tool);
+ }
}
let ret = tmp.join(p.file_name().unwrap());
t!(fs::write(&ret, &contents));
};
if target.contains("apple-darwin") {
+ builder.info("building pkg installer");
let pkg = tmp.join("pkg");
let _ = fs::remove_dir_all(&pkg);
let pkgbuild = |component: &str| {
let mut cmd = Command::new("pkgbuild");
- cmd.arg("--identifier").arg(format!("org.rust-lang.{}", component))
- .arg("--scripts").arg(pkg.join(component))
+ cmd.arg("--identifier")
+ .arg(format!("org.rust-lang.{}", component))
+ .arg("--scripts")
+ .arg(pkg.join(component))
.arg("--nopayload")
.arg(pkg.join(component).with_extension("pkg"));
builder.run(&mut cmd);
let prepare = |name: &str| {
builder.create_dir(&pkg.join(name));
- builder.cp_r(&work.join(&format!("{}-{}", pkgname(builder, name), target)),
- &pkg.join(name));
+ builder.cp_r(
+ &work.join(&format!("{}-{}", pkgname(builder, name), target.triple)),
+ &pkg.join(name),
+ );
builder.install(&etc.join("pkg/postinstall"), &pkg.join(name), 0o755);
pkgbuild(name);
};
prepare("rust-docs");
prepare("rust-std");
prepare("rust-analysis");
-
- if rls_installer.is_some() {
- prepare("rls");
- }
- if clippy_installer.is_some() {
- prepare("clippy");
- }
- if miri_installer.is_some() {
- prepare("miri");
+ prepare("clippy");
+ for tool in &["rust-demangler", "rls", "rust-analyzer", "miri"] {
+ if built_tools.contains(tool) {
+ prepare(tool);
+ }
}
-
// create an 'uninstall' package
builder.install(&etc.join("pkg/postinstall"), &pkg.join("uninstall"), 0o755);
pkgbuild("uninstall");
builder.create(&pkg.join("res/LICENSE.txt"), &license);
builder.install(&etc.join("gfx/rust-logo.png"), &pkg.join("res"), 0o644);
let mut cmd = Command::new("productbuild");
- cmd.arg("--distribution").arg(xform(&etc.join("pkg/Distribution.xml")))
- .arg("--resources").arg(pkg.join("res"))
- .arg(distdir(builder).join(format!("{}-{}.pkg",
- pkgname(builder, "rust"),
- target)))
- .arg("--package-path").arg(&pkg);
+ cmd.arg("--distribution")
+ .arg(xform(&etc.join("pkg/Distribution.xml")))
+ .arg("--resources")
+ .arg(pkg.join("res"))
+ .arg(distdir(builder).join(format!(
+ "{}-{}.pkg",
+ pkgname(builder, "rust"),
+ target.triple
+ )))
+ .arg("--package-path")
+ .arg(&pkg);
+ let _time = timeit(builder);
builder.run(&mut cmd);
}
let prepare = |name: &str| {
builder.create_dir(&exe.join(name));
let dir = if name == "rust-std" || name == "rust-analysis" {
- format!("{}-{}", name, target)
+ format!("{}-{}", name, target.triple)
} else if name == "rls" {
"rls-preview".to_string()
+ } else if name == "rust-analyzer" {
+ "rust-analyzer-preview".to_string()
} else if name == "clippy" {
"clippy-preview".to_string()
+ } else if name == "rust-demangler" {
+ "rust-demangler-preview".to_string()
} else if name == "miri" {
"miri-preview".to_string()
} else {
name.to_string()
};
- builder.cp_r(&work.join(&format!("{}-{}", pkgname(builder, name), target))
- .join(dir),
- &exe.join(name));
+ builder.cp_r(
+ &work.join(&format!("{}-{}", pkgname(builder, name), target.triple)).join(dir),
+ &exe.join(name),
+ );
builder.remove(&exe.join(name).join("manifest.in"));
};
prepare("rustc");
prepare("rust-analysis");
prepare("rust-docs");
prepare("rust-std");
- if rls_installer.is_some() {
- prepare("rls");
- }
- if clippy_installer.is_some() {
- prepare("clippy");
- }
- if miri_installer.is_some() {
- prepare("miri");
+ prepare("clippy");
+ for tool in &["rust-demangler", "rls", "rust-analyzer", "miri"] {
+ if built_tools.contains(tool) {
+ prepare(tool);
+ }
}
if target.contains("windows-gnu") {
prepare("rust-mingw");
}
- builder.install(&xform(&etc.join("exe/rust.iss")), &exe, 0o644);
- builder.install(&etc.join("exe/modpath.iss"), &exe, 0o644);
- builder.install(&etc.join("exe/upgrade.iss"), &exe, 0o644);
builder.install(&etc.join("gfx/rust-logo.ico"), &exe, 0o644);
- builder.create(&exe.join("LICENSE.txt"), &license);
-
- // Generate exe installer
- let mut cmd = Command::new("iscc");
- cmd.arg("rust.iss")
- .current_dir(&exe);
- if target.contains("windows-gnu") {
- cmd.arg("/dMINGW");
- }
- add_env(builder, &mut cmd, target);
- builder.run(&mut cmd);
- builder.install(&exe.join(format!("{}-{}.exe", pkgname(builder, "rust"), target)),
- &distdir(builder),
- 0o755);
// Generate msi installer
let wix = PathBuf::from(env::var_os("WIX").unwrap());
let light = wix.join("bin/light.exe");
let heat_flags = ["-nologo", "-gg", "-sfrag", "-srd", "-sreg"];
- builder.run(Command::new(&heat)
- .current_dir(&exe)
- .arg("dir")
- .arg("rustc")
- .args(&heat_flags)
- .arg("-cg").arg("RustcGroup")
- .arg("-dr").arg("Rustc")
- .arg("-var").arg("var.RustcDir")
- .arg("-out").arg(exe.join("RustcGroup.wxs")));
- builder.run(Command::new(&heat)
- .current_dir(&exe)
- .arg("dir")
- .arg("rust-docs")
- .args(&heat_flags)
- .arg("-cg").arg("DocsGroup")
- .arg("-dr").arg("Docs")
- .arg("-var").arg("var.DocsDir")
- .arg("-out").arg(exe.join("DocsGroup.wxs"))
- .arg("-t").arg(etc.join("msi/squash-components.xsl")));
- builder.run(Command::new(&heat)
- .current_dir(&exe)
- .arg("dir")
- .arg("cargo")
- .args(&heat_flags)
- .arg("-cg").arg("CargoGroup")
- .arg("-dr").arg("Cargo")
- .arg("-var").arg("var.CargoDir")
- .arg("-out").arg(exe.join("CargoGroup.wxs"))
- .arg("-t").arg(etc.join("msi/remove-duplicates.xsl")));
- builder.run(Command::new(&heat)
- .current_dir(&exe)
- .arg("dir")
- .arg("rust-std")
- .args(&heat_flags)
- .arg("-cg").arg("StdGroup")
- .arg("-dr").arg("Std")
- .arg("-var").arg("var.StdDir")
- .arg("-out").arg(exe.join("StdGroup.wxs")));
- if rls_installer.is_some() {
- builder.run(Command::new(&heat)
- .current_dir(&exe)
- .arg("dir")
- .arg("rls")
- .args(&heat_flags)
- .arg("-cg").arg("RlsGroup")
- .arg("-dr").arg("Rls")
- .arg("-var").arg("var.RlsDir")
- .arg("-out").arg(exe.join("RlsGroup.wxs"))
- .arg("-t").arg(etc.join("msi/remove-duplicates.xsl")));
+ builder.run(
+ Command::new(&heat)
+ .current_dir(&exe)
+ .arg("dir")
+ .arg("rustc")
+ .args(&heat_flags)
+ .arg("-cg")
+ .arg("RustcGroup")
+ .arg("-dr")
+ .arg("Rustc")
+ .arg("-var")
+ .arg("var.RustcDir")
+ .arg("-out")
+ .arg(exe.join("RustcGroup.wxs")),
+ );
+ builder.run(
+ Command::new(&heat)
+ .current_dir(&exe)
+ .arg("dir")
+ .arg("rust-docs")
+ .args(&heat_flags)
+ .arg("-cg")
+ .arg("DocsGroup")
+ .arg("-dr")
+ .arg("Docs")
+ .arg("-var")
+ .arg("var.DocsDir")
+ .arg("-out")
+ .arg(exe.join("DocsGroup.wxs"))
+ .arg("-t")
+ .arg(etc.join("msi/squash-components.xsl")),
+ );
+ builder.run(
+ Command::new(&heat)
+ .current_dir(&exe)
+ .arg("dir")
+ .arg("cargo")
+ .args(&heat_flags)
+ .arg("-cg")
+ .arg("CargoGroup")
+ .arg("-dr")
+ .arg("Cargo")
+ .arg("-var")
+ .arg("var.CargoDir")
+ .arg("-out")
+ .arg(exe.join("CargoGroup.wxs"))
+ .arg("-t")
+ .arg(etc.join("msi/remove-duplicates.xsl")),
+ );
+ builder.run(
+ Command::new(&heat)
+ .current_dir(&exe)
+ .arg("dir")
+ .arg("rust-std")
+ .args(&heat_flags)
+ .arg("-cg")
+ .arg("StdGroup")
+ .arg("-dr")
+ .arg("Std")
+ .arg("-var")
+ .arg("var.StdDir")
+ .arg("-out")
+ .arg(exe.join("StdGroup.wxs")),
+ );
+ if built_tools.contains("rls") {
+ builder.run(
+ Command::new(&heat)
+ .current_dir(&exe)
+ .arg("dir")
+ .arg("rls")
+ .args(&heat_flags)
+ .arg("-cg")
+ .arg("RlsGroup")
+ .arg("-dr")
+ .arg("Rls")
+ .arg("-var")
+ .arg("var.RlsDir")
+ .arg("-out")
+ .arg(exe.join("RlsGroup.wxs"))
+ .arg("-t")
+ .arg(etc.join("msi/remove-duplicates.xsl")),
+ );
}
- if clippy_installer.is_some() {
- builder.run(Command::new(&heat)
- .current_dir(&exe)
- .arg("dir")
- .arg("clippy")
- .args(&heat_flags)
- .arg("-cg").arg("ClippyGroup")
- .arg("-dr").arg("Clippy")
- .arg("-var").arg("var.ClippyDir")
- .arg("-out").arg(exe.join("ClippyGroup.wxs"))
- .arg("-t").arg(etc.join("msi/remove-duplicates.xsl")));
+ if built_tools.contains("rust-analyzer") {
+ builder.run(
+ Command::new(&heat)
+ .current_dir(&exe)
+ .arg("dir")
+ .arg("rust-analyzer")
+ .args(&heat_flags)
+ .arg("-cg")
+ .arg("RustAnalyzerGroup")
+ .arg("-dr")
+ .arg("RustAnalyzer")
+ .arg("-var")
+ .arg("var.RustAnalyzerDir")
+ .arg("-out")
+ .arg(exe.join("RustAnalyzerGroup.wxs"))
+ .arg("-t")
+ .arg(etc.join("msi/remove-duplicates.xsl")),
+ );
}
- if miri_installer.is_some() {
- builder.run(Command::new(&heat)
- .current_dir(&exe)
- .arg("dir")
- .arg("miri")
- .args(&heat_flags)
- .arg("-cg").arg("MiriGroup")
- .arg("-dr").arg("Miri")
- .arg("-var").arg("var.MiriDir")
- .arg("-out").arg(exe.join("MiriGroup.wxs"))
- .arg("-t").arg(etc.join("msi/remove-duplicates.xsl")));
+ builder.run(
+ Command::new(&heat)
+ .current_dir(&exe)
+ .arg("dir")
+ .arg("clippy")
+ .args(&heat_flags)
+ .arg("-cg")
+ .arg("ClippyGroup")
+ .arg("-dr")
+ .arg("Clippy")
+ .arg("-var")
+ .arg("var.ClippyDir")
+ .arg("-out")
+ .arg(exe.join("ClippyGroup.wxs"))
+ .arg("-t")
+ .arg(etc.join("msi/remove-duplicates.xsl")),
+ );
+ if built_tools.contains("rust-demangler") {
+ builder.run(
+ Command::new(&heat)
+ .current_dir(&exe)
+ .arg("dir")
+ .arg("rust-demangler")
+ .args(&heat_flags)
+ .arg("-cg")
+ .arg("RustDemanglerGroup")
+ .arg("-dr")
+ .arg("RustDemangler")
+ .arg("-var")
+ .arg("var.RustDemanglerDir")
+ .arg("-out")
+ .arg(exe.join("RustDemanglerGroup.wxs"))
+ .arg("-t")
+ .arg(etc.join("msi/remove-duplicates.xsl")),
+ );
}
- builder.run(Command::new(&heat)
- .current_dir(&exe)
- .arg("dir")
- .arg("rust-analysis")
- .args(&heat_flags)
- .arg("-cg").arg("AnalysisGroup")
- .arg("-dr").arg("Analysis")
- .arg("-var").arg("var.AnalysisDir")
- .arg("-out").arg(exe.join("AnalysisGroup.wxs"))
- .arg("-t").arg(etc.join("msi/remove-duplicates.xsl")));
+ if built_tools.contains("miri") {
+ builder.run(
+ Command::new(&heat)
+ .current_dir(&exe)
+ .arg("dir")
+ .arg("miri")
+ .args(&heat_flags)
+ .arg("-cg")
+ .arg("MiriGroup")
+ .arg("-dr")
+ .arg("Miri")
+ .arg("-var")
+ .arg("var.MiriDir")
+ .arg("-out")
+ .arg(exe.join("MiriGroup.wxs"))
+ .arg("-t")
+ .arg(etc.join("msi/remove-duplicates.xsl")),
+ );
+ }
+ builder.run(
+ Command::new(&heat)
+ .current_dir(&exe)
+ .arg("dir")
+ .arg("rust-analysis")
+ .args(&heat_flags)
+ .arg("-cg")
+ .arg("AnalysisGroup")
+ .arg("-dr")
+ .arg("Analysis")
+ .arg("-var")
+ .arg("var.AnalysisDir")
+ .arg("-out")
+ .arg(exe.join("AnalysisGroup.wxs"))
+ .arg("-t")
+ .arg(etc.join("msi/remove-duplicates.xsl")),
+ );
if target.contains("windows-gnu") {
- builder.run(Command::new(&heat)
- .current_dir(&exe)
- .arg("dir")
- .arg("rust-mingw")
- .args(&heat_flags)
- .arg("-cg").arg("GccGroup")
- .arg("-dr").arg("Gcc")
- .arg("-var").arg("var.GccDir")
- .arg("-out").arg(exe.join("GccGroup.wxs")));
+ builder.run(
+ Command::new(&heat)
+ .current_dir(&exe)
+ .arg("dir")
+ .arg("rust-mingw")
+ .args(&heat_flags)
+ .arg("-cg")
+ .arg("GccGroup")
+ .arg("-dr")
+ .arg("Gcc")
+ .arg("-var")
+ .arg("var.GccDir")
+ .arg("-out")
+ .arg(exe.join("GccGroup.wxs")),
+ );
}
let candle = |input: &Path| {
- let output = exe.join(input.file_stem().unwrap())
- .with_extension("wixobj");
- let arch = if target.contains("x86_64") {"x64"} else {"x86"};
+ let output = exe.join(input.file_stem().unwrap()).with_extension("wixobj");
+ let arch = if target.contains("x86_64") { "x64" } else { "x86" };
let mut cmd = Command::new(&candle);
cmd.current_dir(&exe)
.arg("-nologo")
.arg("-dCargoDir=cargo")
.arg("-dStdDir=rust-std")
.arg("-dAnalysisDir=rust-analysis")
- .arg("-arch").arg(&arch)
- .arg("-out").arg(&output)
+ .arg("-dClippyDir=clippy")
+ .arg("-arch")
+ .arg(&arch)
+ .arg("-out")
+ .arg(&output)
.arg(&input);
add_env(builder, &mut cmd, target);
- if rls_installer.is_some() {
+ if built_tools.contains("rust-demangler") {
+ cmd.arg("-dRustDemanglerDir=rust-demangler");
+ }
+ if built_tools.contains("rls") {
cmd.arg("-dRlsDir=rls");
}
- if clippy_installer.is_some() {
- cmd.arg("-dClippyDir=clippy");
+ if built_tools.contains("rust-analyzer") {
+ cmd.arg("-dRustAnalyzerDir=rust-analyzer");
}
- if miri_installer.is_some() {
+ if built_tools.contains("miri") {
cmd.arg("-dMiriDir=miri");
}
if target.contains("windows-gnu") {
candle("DocsGroup.wxs".as_ref());
candle("CargoGroup.wxs".as_ref());
candle("StdGroup.wxs".as_ref());
- if rls_installer.is_some() {
+ candle("ClippyGroup.wxs".as_ref());
+ if built_tools.contains("rust-demangler") {
+ candle("RustDemanglerGroup.wxs".as_ref());
+ }
+ if built_tools.contains("rls") {
candle("RlsGroup.wxs".as_ref());
}
- if clippy_installer.is_some() {
- candle("ClippyGroup.wxs".as_ref());
+ if built_tools.contains("rust-analyzer") {
+ candle("RustAnalyzerGroup.wxs".as_ref());
}
- if miri_installer.is_some() {
+ if built_tools.contains("miri") {
candle("MiriGroup.wxs".as_ref());
}
candle("AnalysisGroup.wxs".as_ref());
builder.install(&etc.join("gfx/banner.bmp"), &exe, 0o644);
builder.install(&etc.join("gfx/dialogbg.bmp"), &exe, 0o644);
- let filename = format!("{}-{}.msi", pkgname(builder, "rust"), target);
+ builder.info(&format!("building `msi` installer with {:?}", light));
+ let filename = format!("{}-{}.msi", pkgname(builder, "rust"), target.triple);
let mut cmd = Command::new(&light);
cmd.arg("-nologo")
- .arg("-ext").arg("WixUIExtension")
- .arg("-ext").arg("WixUtilExtension")
- .arg("-out").arg(exe.join(&filename))
+ .arg("-ext")
+ .arg("WixUIExtension")
+ .arg("-ext")
+ .arg("WixUtilExtension")
+ .arg("-out")
+ .arg(exe.join(&filename))
.arg("rust.wixobj")
.arg("ui.wixobj")
.arg("rustwelcomedlg.wixobj")
.arg("CargoGroup.wixobj")
.arg("StdGroup.wixobj")
.arg("AnalysisGroup.wixobj")
+ .arg("ClippyGroup.wixobj")
.current_dir(&exe);
- if rls_installer.is_some() {
+ if built_tools.contains("rls") {
cmd.arg("RlsGroup.wixobj");
}
- if clippy_installer.is_some() {
- cmd.arg("ClippyGroup.wixobj");
+ if built_tools.contains("rust-analyzer") {
+ cmd.arg("RustAnalyzerGroup.wixobj");
}
- if miri_installer.is_some() {
+ if built_tools.contains("rust-demangler") {
+ cmd.arg("RustDemanglerGroup.wixobj");
+ }
+ if built_tools.contains("miri") {
cmd.arg("MiriGroup.wixobj");
}
// ICE57 wrongly complains about the shortcuts
cmd.arg("-sice:ICE57");
+ let _time = timeit(builder);
builder.run(&mut cmd);
if !builder.config.dry_run {
}
}
-fn add_env(builder: &Builder<'_>, cmd: &mut Command, target: Interned<String>) {
- let mut parts = channel::CFG_RELEASE_NUM.split('.');
+fn add_env(builder: &Builder<'_>, cmd: &mut Command, target: TargetSelection) {
+ let mut parts = builder.version.split('.');
cmd.env("CFG_RELEASE_INFO", builder.rust_version())
- .env("CFG_RELEASE_NUM", channel::CFG_RELEASE_NUM)
- .env("CFG_RELEASE", builder.rust_release())
- .env("CFG_VER_MAJOR", parts.next().unwrap())
- .env("CFG_VER_MINOR", parts.next().unwrap())
- .env("CFG_VER_PATCH", parts.next().unwrap())
- .env("CFG_VER_BUILD", "0") // just needed to build
- .env("CFG_PACKAGE_VERS", builder.rust_package_vers())
- .env("CFG_PACKAGE_NAME", pkgname(builder, "rust"))
- .env("CFG_BUILD", target)
- .env("CFG_CHANNEL", &builder.config.channel);
+ .env("CFG_RELEASE_NUM", &builder.version)
+ .env("CFG_RELEASE", builder.rust_release())
+ .env("CFG_VER_MAJOR", parts.next().unwrap())
+ .env("CFG_VER_MINOR", parts.next().unwrap())
+ .env("CFG_VER_PATCH", parts.next().unwrap())
+ .env("CFG_VER_BUILD", "0") // just needed to build
+ .env("CFG_PACKAGE_VERS", builder.rust_package_vers())
+ .env("CFG_PACKAGE_NAME", pkgname(builder, "rust"))
+ .env("CFG_BUILD", target.triple)
+ .env("CFG_CHANNEL", &builder.config.channel);
if target.contains("windows-gnu") {
- cmd.env("CFG_MINGW", "1")
- .env("CFG_ABI", "GNU");
+ cmd.env("CFG_MINGW", "1").env("CFG_ABI", "GNU");
} else {
- cmd.env("CFG_MINGW", "0")
- .env("CFG_ABI", "MSVC");
+ cmd.env("CFG_MINGW", "0").env("CFG_ABI", "MSVC");
}
if target.contains("x86_64") {
- cmd.env("CFG_PLATFORM", "x64");
+ cmd.env("CFG_PLATFORM", "x64");
} else {
- cmd.env("CFG_PLATFORM", "x86");
+ cmd.env("CFG_PLATFORM", "x86");
}
}
-#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
-pub struct HashSign;
-
-impl Step for HashSign {
- type Output = ();
- const ONLY_HOSTS: bool = true;
-
- fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
- run.path("hash-and-sign")
- }
-
- fn make_run(run: RunConfig<'_>) {
- run.builder.ensure(HashSign);
- }
-
- fn run(self, builder: &Builder<'_>) {
- let mut cmd = builder.tool_cmd(Tool::BuildManifest);
- if builder.config.dry_run {
- return;
+/// Maybe add LLVM object files to the given destination lib-dir. Allows either static or dynamic linking.
+///
+
+/// Returns whether the files were actually copied.
+fn maybe_install_llvm(builder: &Builder<'_>, target: TargetSelection, dst_libdir: &Path) -> bool {
+ if let Some(config) = builder.config.target_config.get(&target) {
+ if config.llvm_config.is_some() && !builder.config.llvm_from_ci {
+ // If the LLVM was externally provided, then we don't currently copy
+ // artifacts into the sysroot. This is not necessarily the right
+ // choice (in particular, it will require the LLVM dylib to be in
+ // the linker's load path at runtime), but the common use case for
+ // external LLVMs is distribution provided LLVMs, and in that case
+ // they're usually in the standard search path (e.g., /usr/lib) and
+ // copying them here is going to cause problems as we may end up
+ // with the wrong files and isn't what distributions want.
+ //
+ // This behavior may be revisited in the future though.
+ //
+ // If the LLVM is coming from ourselves (just from CI) though, we
+ // still want to install it, as it otherwise won't be available.
+ return false;
}
- let sign = builder.config.dist_sign_folder.as_ref().unwrap_or_else(|| {
- panic!("\n\nfailed to specify `dist.sign-folder` in `config.toml`\n\n")
- });
- let addr = builder.config.dist_upload_addr.as_ref().unwrap_or_else(|| {
- panic!("\n\nfailed to specify `dist.upload-addr` in `config.toml`\n\n")
- });
- let file = builder.config.dist_gpg_password_file.as_ref().unwrap_or_else(|| {
- panic!("\n\nfailed to specify `dist.gpg-password-file` in `config.toml`\n\n")
- });
- let pass = t!(fs::read_to_string(&file));
-
- let today = output(Command::new("date").arg("+%Y-%m-%d"));
-
- cmd.arg(sign);
- cmd.arg(distdir(builder));
- cmd.arg(today.trim());
- cmd.arg(builder.rust_package_vers());
- cmd.arg(addr);
- cmd.arg(builder.package_vers(&builder.release_num("cargo")));
- cmd.arg(builder.package_vers(&builder.release_num("rls")));
- cmd.arg(builder.package_vers(&builder.release_num("clippy")));
- cmd.arg(builder.package_vers(&builder.release_num("miri")));
- cmd.arg(builder.package_vers(&builder.release_num("rustfmt")));
- cmd.arg(builder.llvm_tools_package_vers());
- cmd.arg(builder.lldb_package_vers());
-
- builder.create_dir(&distdir(builder));
-
- let mut child = t!(cmd.stdin(Stdio::piped()).spawn());
- t!(child.stdin.take().unwrap().write_all(pass.as_bytes()));
- let status = t!(child.wait());
- assert!(status.success());
}
-}
-// Maybe add libLLVM.so to the lib-dir. It will only have been built if
-// LLVM tools are linked dynamically.
-// Note: This function does no yet support Windows but we also don't support
-// linking LLVM tools dynamically on Windows yet.
-pub fn maybe_install_llvm_dylib(builder: &Builder<'_>,
- target: Interned<String>,
- sysroot: &Path) {
- let src_libdir = builder
- .llvm_out(target)
- .join("lib");
- let dst_libdir = sysroot.join("lib/rustlib").join(&*target).join("lib");
- t!(fs::create_dir_all(&dst_libdir));
-
- if target.contains("apple-darwin") {
+ // On macOS, rustc (and LLVM tools) link to an unversioned libLLVM.dylib
+ // instead of libLLVM-11-rust-....dylib, as on linux. It's not entirely
+ // clear why this is the case, though. llvm-config will emit the versioned
+ // paths and we don't want those in the sysroot (as we're expecting
+ // unversioned paths).
+ if target.contains("apple-darwin") && builder.config.llvm_link_shared {
+ let src_libdir = builder.llvm_out(target).join("lib");
let llvm_dylib_path = src_libdir.join("libLLVM.dylib");
if llvm_dylib_path.exists() {
- builder.install(&llvm_dylib_path, &dst_libdir, 0o644);
+ builder.install(&llvm_dylib_path, dst_libdir, 0o644);
}
- return
+ !builder.config.dry_run
+ } else if let Ok(llvm_config) = crate::native::prebuilt_llvm_config(builder, target) {
+ let mut cmd = Command::new(llvm_config);
+ cmd.arg("--libfiles");
+ builder.verbose(&format!("running {:?}", cmd));
+ let files = output(&mut cmd);
+ let build_llvm_out = &builder.llvm_out(builder.config.build);
+ let target_llvm_out = &builder.llvm_out(target);
+ for file in files.trim_end().split(' ') {
+ // If we're not using a custom LLVM, make sure we package for the target.
+ let file = if let Ok(relative_path) = Path::new(file).strip_prefix(build_llvm_out) {
+ target_llvm_out.join(relative_path)
+ } else {
+ PathBuf::from(file)
+ };
+ builder.install(&file, dst_libdir, 0o644);
+ }
+ !builder.config.dry_run
+ } else {
+ false
}
+}
- // Usually libLLVM.so is a symlink to something like libLLVM-6.0.so.
- // Since tools link to the latter rather than the former, we have to
- // follow the symlink to find out what to distribute.
- let llvm_dylib_path = src_libdir.join("libLLVM.so");
- if llvm_dylib_path.exists() {
- let llvm_dylib_path = llvm_dylib_path.canonicalize().unwrap_or_else(|e| {
- panic!("dist: Error calling canonicalize path `{}`: {}",
- llvm_dylib_path.display(), e);
- });
-
+/// Maybe add libLLVM.so to the target lib-dir for linking.
+pub fn maybe_install_llvm_target(builder: &Builder<'_>, target: TargetSelection, sysroot: &Path) {
+ let dst_libdir = sysroot.join("lib/rustlib").join(&*target.triple).join("lib");
+ // We do not need to copy LLVM files into the sysroot if it is not
+ // dynamically linked; it is already included into librustc_llvm
+ // statically.
+ if builder.config.llvm_link_shared {
+ maybe_install_llvm(builder, target, &dst_libdir);
+ }
+}
- builder.install(&llvm_dylib_path, &dst_libdir, 0o644);
+/// Maybe add libLLVM.so to the runtime lib-dir for rustc itself.
+pub fn maybe_install_llvm_runtime(builder: &Builder<'_>, target: TargetSelection, sysroot: &Path) {
+ let dst_libdir =
+ sysroot.join(builder.sysroot_libdir_relative(Compiler { stage: 1, host: target }));
+ // We do not need to copy LLVM files into the sysroot if it is not
+ // dynamically linked; it is already included into librustc_llvm
+ // statically.
+ if builder.config.llvm_link_shared {
+ maybe_install_llvm(builder, target, &dst_libdir);
}
}
#[derive(Clone, Debug, Eq, Hash, PartialEq)]
pub struct LlvmTools {
- pub stage: u32,
- pub target: Interned<String>,
+ pub target: TargetSelection,
}
impl Step for LlvmTools {
- type Output = Option<PathBuf>;
+ type Output = Option<GeneratedTarball>;
const ONLY_HOSTS: bool = true;
+ const DEFAULT: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
- run.path("llvm-tools")
+ let default = should_build_extended_tool(&run.builder, "llvm-tools");
+ run.path("llvm-tools").default_condition(default)
}
fn make_run(run: RunConfig<'_>) {
- run.builder.ensure(LlvmTools {
- stage: run.builder.top_stage,
- target: run.target,
- });
+ run.builder.ensure(LlvmTools { target: run.target });
}
- fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
- let stage = self.stage;
+ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
let target = self.target;
- assert!(builder.config.extended);
/* run only if llvm-config isn't used */
if let Some(config) = builder.config.target_config.get(&target) {
if let Some(ref _s) = config.llvm_config {
- builder.info(&format!("Skipping LlvmTools stage{} ({}): external LLVM",
- stage, target));
+ builder.info(&format!("Skipping LlvmTools ({}): external LLVM", target));
return None;
}
}
- builder.info(&format!("Dist LlvmTools stage{} ({})", stage, target));
- let src = builder.src.join("src/llvm-project/llvm");
- let name = pkgname(builder, "llvm-tools");
-
- let tmp = tmpdir(builder);
- let image = tmp.join("llvm-tools-image");
- drop(fs::remove_dir_all(&image));
+ let mut tarball = Tarball::new(builder, "llvm-tools", &target.triple);
+ tarball.set_overlay(OverlayKind::LLVM);
+ tarball.is_preview(true);
// Prepare the image directory
- let src_bindir = builder
- .llvm_out(target)
- .join("bin");
- let dst_bindir = image.join("lib/rustlib")
- .join(&*target)
- .join("bin");
- t!(fs::create_dir_all(&dst_bindir));
+ let src_bindir = builder.llvm_out(target).join("bin");
+ let dst_bindir = format!("lib/rustlib/{}/bin", target.triple);
for tool in LLVM_TOOLS {
- let exe = src_bindir.join(exe(tool, &target));
- builder.install(&exe, &dst_bindir, 0o755);
+ let exe = src_bindir.join(exe(tool, target));
+ tarball.add_file(&exe, &dst_bindir, 0o755);
}
- // Prepare the overlay
- let overlay = tmp.join("llvm-tools-overlay");
- drop(fs::remove_dir_all(&overlay));
- builder.create_dir(&overlay);
- builder.install(&src.join("README.txt"), &overlay, 0o644);
- builder.install(&src.join("LICENSE.TXT"), &overlay, 0o644);
- builder.create(&overlay.join("version"), &builder.llvm_tools_vers());
-
- // Generate the installer tarball
- let mut cmd = rust_installer(builder);
- cmd.arg("generate")
- .arg("--product-name=Rust")
- .arg("--rel-manifest-dir=rustlib")
- .arg("--success-message=llvm-tools-installed.")
- .arg("--image-dir").arg(&image)
- .arg("--work-dir").arg(&tmpdir(builder))
- .arg("--output-dir").arg(&distdir(builder))
- .arg("--non-installed-overlay").arg(&overlay)
- .arg(format!("--package-name={}-{}", name, target))
- .arg("--legacy-manifest-dirs=rustlib,cargo")
- .arg("--component-name=llvm-tools-preview");
-
-
- builder.run(&mut cmd);
- Some(distdir(builder).join(format!("{}-{}.tar.gz", name, target)))
+ // Copy libLLVM.so to the target lib dir as well, so the RPATH like
+ // `$ORIGIN/../lib` can find it. It may also be used as a dependency
+ // of `rustc-dev` to support the inherited `-lLLVM` when using the
+ // compiler libraries.
+ maybe_install_llvm_target(builder, target, tarball.image_dir());
+
+ Some(tarball.generate())
}
}
+// Tarball intended for internal consumption to ease rustc/std development.
+//
+// Should not be considered stable by end users.
#[derive(Clone, Debug, Eq, Hash, PartialEq)]
-pub struct Lldb {
- pub target: Interned<String>,
+pub struct RustDev {
+ pub target: TargetSelection,
}
-impl Step for Lldb {
- type Output = Option<PathBuf>;
- const ONLY_HOSTS: bool = true;
+impl Step for RustDev {
+ type Output = Option<GeneratedTarball>;
const DEFAULT: bool = true;
+ const ONLY_HOSTS: bool = true;
fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
- run.path("src/llvm-project/lldb").path("src/tools/lldb")
+ run.path("rust-dev")
}
fn make_run(run: RunConfig<'_>) {
- run.builder.ensure(Lldb {
- target: run.target,
- });
+ run.builder.ensure(RustDev { target: run.target });
}
- fn run(self, builder: &Builder<'_>) -> Option<PathBuf> {
+ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
let target = self.target;
- if builder.config.dry_run {
- return None;
+ /* run only if llvm-config isn't used */
+ if let Some(config) = builder.config.target_config.get(&target) {
+ if let Some(ref _s) = config.llvm_config {
+ builder.info(&format!("Skipping RustDev ({}): external LLVM", target));
+ return None;
+ }
}
- let bindir = builder
- .llvm_out(target)
- .join("bin");
- let lldb_exe = bindir.join(exe("lldb", &target));
- if !lldb_exe.exists() {
- return None;
+ let mut tarball = Tarball::new(builder, "rust-dev", &target.triple);
+ tarball.set_overlay(OverlayKind::LLVM);
+
+ let src_bindir = builder.llvm_out(target).join("bin");
+ for bin in &[
+ "llvm-config",
+ "llvm-ar",
+ "llvm-objdump",
+ "llvm-profdata",
+ "llvm-bcanalyzer",
+ "llvm-cov",
+ "llvm-dwp",
+ ] {
+ tarball.add_file(src_bindir.join(exe(bin, target)), "bin", 0o755);
}
+ tarball.add_file(&builder.llvm_filecheck(target), "bin", 0o755);
- builder.info(&format!("Dist Lldb ({})", target));
- let src = builder.src.join("src/llvm-project/lldb");
- let name = pkgname(builder, "lldb");
+ // Copy the include directory as well; needed mostly to build
+ // librustc_llvm properly (e.g., llvm-config.h is in here). But also
+ // just broadly useful to be able to link against the bundled LLVM.
+ tarball.add_dir(&builder.llvm_out(target).join("include"), "include");
- let tmp = tmpdir(builder);
- let image = tmp.join("lldb-image");
- drop(fs::remove_dir_all(&image));
+ // Copy libLLVM.so to the target lib dir as well, so the RPATH like
+ // `$ORIGIN/../lib` can find it. It may also be used as a dependency
+ // of `rustc-dev` to support the inherited `-lLLVM` when using the
+ // compiler libraries.
+ let dst_libdir = tarball.image_dir().join("lib");
+ maybe_install_llvm(builder, target, &dst_libdir);
+ let link_type = if builder.config.llvm_link_shared { "dynamic" } else { "static" };
+ t!(std::fs::write(tarball.image_dir().join("link-type.txt"), link_type), dst_libdir);
- // Prepare the image directory
- let root = image.join("lib/rustlib").join(&*target);
- let dst = root.join("bin");
- t!(fs::create_dir_all(&dst));
- for program in &["lldb", "lldb-argdumper", "lldb-mi", "lldb-server"] {
- let exe = bindir.join(exe(program, &target));
- builder.install(&exe, &dst, 0o755);
- }
+ Some(tarball.generate())
+ }
+}
- // The libraries.
- let libdir = builder.llvm_out(target).join("lib");
- let dst = root.join("lib");
- t!(fs::create_dir_all(&dst));
- for entry in t!(fs::read_dir(&libdir)) {
- let entry = entry.unwrap();
- if let Ok(name) = entry.file_name().into_string() {
- if name.starts_with("liblldb.") && !name.ends_with(".a") {
- if t!(entry.file_type()).is_symlink() {
- builder.copy_to_folder(&entry.path(), &dst);
- } else {
- builder.install(&entry.path(), &dst, 0o755);
- }
- }
- }
- }
+/// Tarball containing a prebuilt version of the build-manifest tool, intented to be used by the
+/// release process to avoid cloning the monorepo and building stuff.
+///
+/// Should not be considered stable by end users.
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+pub struct BuildManifest {
+ pub target: TargetSelection,
+}
- // The lldb scripts might be installed in lib/python$version
- // or in lib64/python$version. If lib64 exists, use it;
- // otherwise lib.
- let libdir = builder.llvm_out(target).join("lib64");
- let (libdir, libdir_name) = if libdir.exists() {
- (libdir, "lib64")
- } else {
- (builder.llvm_out(target).join("lib"), "lib")
- };
- for entry in t!(fs::read_dir(&libdir)) {
- let entry = t!(entry);
- if let Ok(name) = entry.file_name().into_string() {
- if name.starts_with("python") {
- let dst = root.join(libdir_name)
- .join(entry.file_name());
- t!(fs::create_dir_all(&dst));
- builder.cp_r(&entry.path(), &dst);
- break;
- }
- }
- }
+impl Step for BuildManifest {
+ type Output = GeneratedTarball;
+ const DEFAULT: bool = false;
+ const ONLY_HOSTS: bool = true;
+
+ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+ run.path("src/tools/build-manifest")
+ }
- // Prepare the overlay
- let overlay = tmp.join("lldb-overlay");
- drop(fs::remove_dir_all(&overlay));
- builder.create_dir(&overlay);
- builder.install(&src.join("LICENSE.TXT"), &overlay, 0o644);
- builder.create(&overlay.join("version"), &builder.lldb_vers());
-
- // Generate the installer tarball
- let mut cmd = rust_installer(builder);
- cmd.arg("generate")
- .arg("--product-name=Rust")
- .arg("--rel-manifest-dir=rustlib")
- .arg("--success-message=lldb-installed.")
- .arg("--image-dir").arg(&image)
- .arg("--work-dir").arg(&tmpdir(builder))
- .arg("--output-dir").arg(&distdir(builder))
- .arg("--non-installed-overlay").arg(&overlay)
- .arg(format!("--package-name={}-{}", name, target))
- .arg("--legacy-manifest-dirs=rustlib,cargo")
- .arg("--component-name=lldb-preview");
-
-
- builder.run(&mut cmd);
- Some(distdir(builder).join(format!("{}-{}.tar.gz", name, target)))
+ fn make_run(run: RunConfig<'_>) {
+ run.builder.ensure(BuildManifest { target: run.target });
+ }
+
+ fn run(self, builder: &Builder<'_>) -> GeneratedTarball {
+ let build_manifest = builder.tool_exe(Tool::BuildManifest);
+
+ let tarball = Tarball::new(builder, "build-manifest", &self.target.triple);
+ tarball.add_file(&build_manifest, "bin", 0o755);
+ tarball.generate()
+ }
+}
+
+/// Tarball containing artifacts necessary to reproduce the build of rustc.
+///
+/// Currently this is the PGO profile data.
+///
+/// Should not be considered stable by end users.
+#[derive(Clone, Debug, Eq, Hash, PartialEq)]
+pub struct ReproducibleArtifacts {
+ pub target: TargetSelection,
+}
+
+impl Step for ReproducibleArtifacts {
+ type Output = Option<GeneratedTarball>;
+ const DEFAULT: bool = true;
+ const ONLY_HOSTS: bool = true;
+
+ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+ run.path("reproducible")
+ }
+
+ fn make_run(run: RunConfig<'_>) {
+ run.builder.ensure(ReproducibleArtifacts { target: run.target });
+ }
+
+ fn run(self, builder: &Builder<'_>) -> Self::Output {
+ let mut added_anything = false;
+ let tarball = Tarball::new(builder, "reproducible-artifacts", &self.target.triple);
+ if let Some(path) = builder.config.rust_profile_use.as_ref() {
+ tarball.add_file(path, ".", 0o644);
+ added_anything = true;
+ }
+ if let Some(path) = builder.config.llvm_profile_use.as_ref() {
+ tarball.add_file(path, ".", 0o644);
+ added_anything = true;
+ }
+ if added_anything { Some(tarball.generate()) } else { None }
}
}
projects / rustc.git / blobdiff