OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up install

Browse Source
This commit is contained in:
Mark Simulacrum 2017-07-13 06:25:40 -06:00
parent 5984e70af2
commit 6a85193149
1 changed files with 83 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

197
src/bootstrap/install.rs
View File

@ -20,121 +20,90 @@ use std::process::Command;
use dist::{self, pkgname, sanitize_sh, tmpdir};
use Build;
use builder::{Builder, Step};
pub struct Installer<'a> {
build: &'a Build,
prefix: PathBuf,
sysconfdir: PathBuf,
docdir: PathBuf,
bindir: PathBuf,
libdir: PathBuf,
mandir: PathBuf,
empty_dir: PathBuf,
pub fn install_docs(builder: &Builder, stage: u32, host: &str) {
install_sh(builder, "docs", "rust-docs", stage, Some(host));
}
impl<'a> Drop for Installer<'a> {
fn drop(&mut self) {
t!(fs::remove_dir_all(&self.empty_dir));
pub fn install_std(builder: &Builder, stage: u32) {
for target in builder.build.config.target.iter() {
install_sh(builder, "std", "rust-std", stage, Some(target));
}
}
impl<'a> Installer<'a> {
pub fn new(build: &'a Build) -> Installer<'a> {
let prefix_default = PathBuf::from("/usr/local");
let sysconfdir_default = PathBuf::from("/etc");
let docdir_default = PathBuf::from("share/doc/rust");
let bindir_default = PathBuf::from("bin");
let libdir_default = PathBuf::from("lib");
let mandir_default = PathBuf::from("share/man");
let prefix = build.config.prefix.as_ref().unwrap_or(&prefix_default);
let sysconfdir = build.config.sysconfdir.as_ref().unwrap_or(&sysconfdir_default);
let docdir = build.config.docdir.as_ref().unwrap_or(&docdir_default);
let bindir = build.config.bindir.as_ref().unwrap_or(&bindir_default);
let libdir = build.config.libdir.as_ref().unwrap_or(&libdir_default);
let mandir = build.config.mandir.as_ref().unwrap_or(&mandir_default);
pub fn install_cargo(builder: &Builder, stage: u32, host: &str) {
install_sh(builder, "cargo", "cargo", stage, Some(host));
}
let sysconfdir = prefix.join(sysconfdir);
let docdir = prefix.join(docdir);
let bindir = prefix.join(bindir);
let libdir = prefix.join(libdir);
let mandir = prefix.join(mandir);
pub fn install_rls(builder: &Builder, stage: u32, host: &str) {
install_sh(builder, "rls", "rls", stage, Some(host));
}
let destdir = env::var_os("DESTDIR").map(PathBuf::from);
pub fn install_analysis(builder: &Builder, stage: u32, host: &str) {
install_sh(builder, "analysis", "rust-analysis", stage, Some(host));
}
let prefix = add_destdir(&prefix, &destdir);
let sysconfdir = add_destdir(&sysconfdir, &destdir);
let docdir = add_destdir(&docdir, &destdir);
let bindir = add_destdir(&bindir, &destdir);
let libdir = add_destdir(&libdir, &destdir);
let mandir = add_destdir(&mandir, &destdir);
pub fn install_src(builder: &Builder, stage: u32) {
install_sh(builder, "src", "rust-src", stage, None);
}
pub fn install_rustc(builder: &Builder, stage: u32, host: &str) {
install_sh(builder, "rustc", "rustc", stage, Some(host));
}
let empty_dir = build.out.join("tmp/empty_dir");
fn install_sh(builder: &Builder, package: &str, name: &str, stage: u32, host: Option<&str>) {
let build = builder.build;
println!("Install {} stage{} ({:?})", package, stage, host);
t!(fs::create_dir_all(&empty_dir));
let prefix_default = PathBuf::from("/usr/local");
let sysconfdir_default = PathBuf::from("/etc");
let docdir_default = PathBuf::from("share/doc/rust");
let bindir_default = PathBuf::from("bin");
let libdir_default = PathBuf::from("lib");
let mandir_default = PathBuf::from("share/man");
let prefix = build.config.prefix.as_ref().unwrap_or(&prefix_default);
let sysconfdir = build.config.sysconfdir.as_ref().unwrap_or(&sysconfdir_default);
let docdir = build.config.docdir.as_ref().unwrap_or(&docdir_default);
let bindir = build.config.bindir.as_ref().unwrap_or(&bindir_default);
let libdir = build.config.libdir.as_ref().unwrap_or(&libdir_default);
let mandir = build.config.mandir.as_ref().unwrap_or(&mandir_default);
Installer {
build,
prefix,
sysconfdir,
docdir,
bindir,
libdir,
mandir,
empty_dir,
}
}
let sysconfdir = prefix.join(sysconfdir);
let docdir = prefix.join(docdir);
let bindir = prefix.join(bindir);
let libdir = prefix.join(libdir);
let mandir = prefix.join(mandir);
pub fn install_docs(&self, stage: u32, host: &str) {
self.install_sh("docs", "rust-docs", stage, Some(host));
}
let destdir = env::var_os("DESTDIR").map(PathBuf::from);
pub fn install_std(&self, stage: u32) {
for target in self.build.config.target.iter() {
self.install_sh("std", "rust-std", stage, Some(target));
}
}
let prefix = add_destdir(&prefix, &destdir);
let sysconfdir = add_destdir(&sysconfdir, &destdir);
let docdir = add_destdir(&docdir, &destdir);
let bindir = add_destdir(&bindir, &destdir);
let libdir = add_destdir(&libdir, &destdir);
let mandir = add_destdir(&mandir, &destdir);
pub fn install_cargo(&self, stage: u32, host: &str) {
self.install_sh("cargo", "cargo", stage, Some(host));
}
let empty_dir = build.out.join("tmp/empty_dir");
pub fn install_rls(&self, stage: u32, host: &str) {
self.install_sh("rls", "rls", stage, Some(host));
}
t!(fs::create_dir_all(&empty_dir));
let package_name = if let Some(host) = host {
format!("{}-{}", pkgname(build, name), host)
} else {
pkgname(build, name)
};
pub fn install_analysis(&self, stage: u32, host: &str) {
self.install_sh("analysis", "rust-analysis", stage, Some(host));
}
pub fn install_src(&self, stage: u32) {
self.install_sh("src", "rust-src", stage, None);
}
pub fn install_rustc(&self, stage: u32, host: &str) {
self.install_sh("rustc", "rustc", stage, Some(host));
}
fn install_sh(&self, package: &str, name: &str, stage: u32, host: Option<&str>) {
println!("Install {} stage{} ({:?})", package, stage, host);
let package_name = if let Some(host) = host {
format!("{}-{}", pkgname(self.build, name), host)
} else {
pkgname(self.build, name)
};
let mut cmd = Command::new("sh");
cmd.current_dir(&self.empty_dir)
.arg(sanitize_sh(&tmpdir(self.build).join(&package_name).join("install.sh")))
.arg(format!("--prefix={}", sanitize_sh(&self.prefix)))
.arg(format!("--sysconfdir={}", sanitize_sh(&self.sysconfdir)))
.arg(format!("--docdir={}", sanitize_sh(&self.docdir)))
.arg(format!("--bindir={}", sanitize_sh(&self.bindir)))
.arg(format!("--libdir={}", sanitize_sh(&self.libdir)))
.arg(format!("--mandir={}", sanitize_sh(&self.mandir)))
.arg("--disable-ldconfig");
self.build.run(&mut cmd);
}
let mut cmd = Command::new("sh");
cmd.current_dir(&empty_dir)
.arg(sanitize_sh(&tmpdir(build).join(&package_name).join("install.sh")))
.arg(format!("--prefix={}", sanitize_sh(&prefix)))
.arg(format!("--sysconfdir={}", sanitize_sh(&sysconfdir)))
.arg(format!("--docdir={}", sanitize_sh(&docdir)))
.arg(format!("--bindir={}", sanitize_sh(&bindir)))
.arg(format!("--libdir={}", sanitize_sh(&libdir)))
.arg(format!("--mandir={}", sanitize_sh(&mandir)))
.arg("--disable-ldconfig");
build.run(&mut cmd);
t!(fs::remove_dir_all(&empty_dir));
}
fn add_destdir(path: &Path, destdir: &Option<PathBuf>) -> PathBuf {
@ -152,11 +121,11 @@ fn add_destdir(path: &Path, destdir: &Option<PathBuf>) -> PathBuf {
}
macro_rules! install {
($($name:ident,
(($sel:ident, $builder:ident),
$($name:ident,
$path:expr,
$default_cond:expr,
only_hosts: $only_hosts:expr,
($sel:ident, $builder:ident),
$run_item:block $(, $c:ident)*;)+) => {
$(#[derive(Serialize)]
pub struct $name<'a> {
@ -194,27 +163,27 @@ macro_rules! install {
}
}
install!(
install!((self, builder),
// rules.install("install-docs", "src/doc")
// .default(build.config.docs)
// .only_host_build(true)
// .dep(|s| s.name("dist-docs"))
// .run(move |s| install::Installer::new(build).install_docs(s.stage, s.target));
Docs, "src/doc", builder.build.config.docs, only_hosts: false, (self, builder), {
Docs, "src/doc", builder.build.config.docs, only_hosts: false, {
builder.ensure(dist::Docs { stage: self.stage, target: self.target });
Installer::new(builder.build).install_docs(self.stage, self.target);
install_docs(builder, self.stage, self.target);
};
// rules.install("install-std", "src/libstd")
// .default(true)
// .only_host_build(true)
// .dep(|s| s.name("dist-std"))
// .run(move |s| install::Installer::new(build).install_std(s.stage));
Std, "src/libstd", true, only_hosts: true, (self, builder), {
Std, "src/libstd", true, only_hosts: true, {
builder.ensure(dist::Std {
compiler: builder.compiler(self.stage, self.host),
target: self.target
});
Installer::new(builder.build).install_std(self.stage);
install_std(builder, self.stage);
};
// rules.install("install-cargo", "cargo")
// .default(build.config.extended)
@ -222,9 +191,9 @@ install!(
// .only_host_build(true)
// .dep(|s| s.name("dist-cargo"))
// .run(move |s| install::Installer::new(build).install_cargo(s.stage, s.target));
Cargo, "cargo", builder.build.config.extended, only_hosts: true, (self, builder), {
Cargo, "cargo", builder.build.config.extended, only_hosts: true, {
builder.ensure(dist::Cargo { stage: self.stage, target: self.target });
Installer::new(builder.build).install_cargo(self.stage, self.target);
install_cargo(builder, self.stage, self.target);
};
// rules.install("install-rls", "rls")
// .default(build.config.extended)
@ -232,21 +201,21 @@ install!(
// .only_host_build(true)
// .dep(|s| s.name("dist-rls"))
// .run(move |s| install::Installer::new(build).install_rls(s.stage, s.target));
Rls, "rls", builder.build.config.extended, only_hosts: true, (self, builder), {
Rls, "rls", builder.build.config.extended, only_hosts: true, {
builder.ensure(dist::Rls { stage: self.stage, target: self.target });
Installer::new(builder.build).install_rls(self.stage, self.target);
install_rls(builder, self.stage, self.target);
};
// rules.install("install-analysis", "analysis")
// .default(build.config.extended)
// .only_host_build(true)
// .dep(|s| s.name("dist-analysis"))
// .run(move |s| install::Installer::new(build).install_analysis(s.stage, s.target));
Analysis, "analysis", builder.build.config.extended, only_hosts: false, (self, builder), {
Analysis, "analysis", builder.build.config.extended, only_hosts: false, {
builder.ensure(dist::Analysis {
compiler: builder.compiler(self.stage, self.host),
target: self.target
});
Installer::new(builder.build).install_analysis(self.stage, self.target);
install_analysis(builder, self.stage, self.target);
};
// rules.install("install-src", "src")
// .default(build.config.extended)
@ -255,9 +224,9 @@ install!(
// .only_host_build(true)
// .dep(|s| s.name("dist-src"))
// .run(move |s| install::Installer::new(build).install_src(s.stage));
Src, "src", builder.build.config.extended, only_hosts: true, (self, builder), {
Src, "src", builder.build.config.extended, only_hosts: true, {
builder.ensure(dist::Src);
Installer::new(builder.build).install_src(self.stage);
install_src(builder, self.stage);
}, ONLY_BUILD;
// rules.install("install-rustc", "src/librustc")
// .default(true)
@ -265,8 +234,8 @@ install!(
// .only_host_build(true)
// .dep(|s| s.name("dist-rustc"))
// .run(move |s| install::Installer::new(build).install_rustc(s.stage, s.target));
Rustc, "src/librustc", builder.build.config.extended, only_hosts: true, (self, builder), {
Rustc, "src/librustc", builder.build.config.extended, only_hosts: true, {
builder.ensure(dist::Rustc { stage: self.stage, target: self.target });
Installer::new(builder.build).install_rustc(self.stage, self.target);
install_rustc(builder, self.stage, self.target);
};
);