Skip to content

Commit

Permalink
bootstrap: convert rustc-src to use Tarball
Browse files Browse the repository at this point in the history
  • Loading branch information
@pietroalbini
pietroalbini committed Dec 23, 2020
1 parent 48924ab commit f18335e
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 62 deletions.
34 changes: 3 additions & 31 deletions src/bootstrap/dist.rs
View file
Expand Up @@ -37,10 +37,6 @@ pub fn tmpdir(builder: &Builder<'_>) -> PathBuf {
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)
Expand Down Expand Up @@ -867,11 +863,8 @@ impl Step for PlainSourceTarball {

/// Creates the plain source tarball
fn run(self, builder: &Builder<'_>) -> PathBuf {
// 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));
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 = [
Expand Down Expand Up @@ -914,28 +907,7 @@ impl Step for PlainSourceTarball {
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.info("Create plain source tarball");
let _time = timeit(builder);
builder.run(&mut cmd);
distdir(builder).join(&format!("{}.tar.gz", plain_name))
tarball.bare()
}
}

Expand Down
73 changes: 42 additions & 31 deletions src/bootstrap/tarball.rs
View file
Expand Up @@ -94,7 +94,6 @@ pub(crate) struct Tarball<'a> {
temp_dir: PathBuf,
image_dir: PathBuf,
overlay_dir: PathBuf,
work_dir: PathBuf,

include_target_in_component_name: bool,
is_preview: bool,
Expand All @@ -113,12 +112,14 @@ impl<'a> Tarball<'a> {
fn new_inner(builder: &'a Builder<'a>, component: &str, target: Option<String>) -> Self {
let pkgname = crate::dist::pkgname(builder, component);

let temp_dir = builder.out.join("tmp").join("tarball").join(component);
let mut temp_dir = builder.out.join("tmp").join("tarball");
if let Some(target) = &target {
temp_dir = temp_dir.join(target);
}
let _ = std::fs::remove_dir_all(&temp_dir);

let image_dir = temp_dir.join("image");
let overlay_dir = temp_dir.join("overlay");
let work_dir = temp_dir.join("work");

Self {
builder,
Expand All @@ -132,7 +133,6 @@ impl<'a> Tarball<'a> {
temp_dir,
image_dir,
overlay_dir,
work_dir,

include_target_in_component_name: false,
is_preview: false,
Expand Down Expand Up @@ -200,7 +200,7 @@ impl<'a> Tarball<'a> {

pub(crate) fn persist_work_dir(&mut self) -> PathBuf {
self.delete_temp_dir = false;
self.work_dir.clone()
self.temp_dir.clone()
}

pub(crate) fn generate(self) -> PathBuf {
Expand All @@ -222,9 +222,8 @@ impl<'a> Tarball<'a> {
cmd.arg("generate")
.arg("--image-dir")
.arg(&this.image_dir)
.arg("--non-installed-overlay")
.arg(&this.overlay_dir)
.arg(format!("--component-name={}", &component_name));
this.non_bare_args(cmd);
})
}

Expand All @@ -236,14 +235,41 @@ impl<'a> Tarball<'a> {
}

self.run(|this, cmd| {
cmd.arg("combine")
.arg("--input-tarballs")
.arg(input_tarballs)
.arg("--non-installed-overlay")
.arg(&this.overlay_dir);
cmd.arg("combine").arg("--input-tarballs").arg(input_tarballs);
this.non_bare_args(cmd);
});
}

pub(crate) fn bare(self) -> PathBuf {
self.run(|this, cmd| {
cmd.arg("tarball")
.arg("--input")
.arg(&this.image_dir)
.arg("--output")
.arg(crate::dist::distdir(this.builder).join(this.package_name()));
})
}

fn package_name(&self) -> String {
if let Some(target) = &self.target {
format!("{}-{}", self.pkgname, target)
} else {
self.pkgname.clone()
}
}

fn non_bare_args(&self, cmd: &mut Command) {
cmd.arg("--rel-manifest-dir=rustlib")
.arg("--legacy-manifest-dirs=rustlib,cargo")
.arg(format!("--product-name={}", self.product_name))
.arg(format!("--success-message={} installed.", self.component))
.arg(format!("--package-name={}", self.package_name()))
.arg("--non-installed-overlay")
.arg(&self.overlay_dir)
.arg("--output-dir")
.arg(crate::dist::distdir(self.builder));
}

fn run(self, build_cli: impl FnOnce(&Tarball<'a>, &mut Command)) -> PathBuf {
t!(std::fs::create_dir_all(&self.overlay_dir));
self.builder.create(&self.overlay_dir.join("version"), &self.overlay.version(self.builder));
Expand All @@ -256,32 +282,17 @@ impl<'a> Tarball<'a> {

let mut cmd = self.builder.tool_cmd(crate::tool::Tool::RustInstaller);

let package_name = if let Some(target) = &self.target {
self.builder.info(&format!("Dist {} ({})", self.component, target));
format!("{}-{}", self.pkgname, target)
} else {
self.builder.info(&format!("Dist {}", self.component));
self.pkgname.clone()
};

let package_name = self.package_name();
self.builder.info(&format!("Dist {}", package_name));
let _time = crate::util::timeit(self.builder);

let distdir = crate::dist::distdir(self.builder);
build_cli(&self, &mut cmd);
cmd.arg("--rel-manifest-dir=rustlib")
.arg("--legacy-manifest-dirs=rustlib,cargo")
.arg(format!("--product-name={}", self.product_name))
.arg(format!("--success-message={} installed.", self.component))
.arg(format!("--package-name={}", package_name))
.arg("--work-dir")
.arg(self.work_dir)
.arg("--output-dir")
.arg(&distdir);
cmd.arg("--work-dir").arg(&self.temp_dir);
self.builder.run(&mut cmd);
if self.delete_temp_dir {
t!(std::fs::remove_dir_all(&self.temp_dir));
}

distdir.join(format!("{}.tar.gz", package_name))
crate::dist::distdir(self.builder).join(format!("{}.tar.gz", package_name))
}
}

0 comments on commit f18335e

Please sign in to comment.