Skip to content

Commit c682e9c

Browse files
GuillaumeGomezGuillaumeGomez
committed
Correctly set path
1 parent 18d22d5 commit c682e9c

File tree

2 files changed

+92
-45
lines changed

2 files changed

+92
-45
lines changed

‎build_system/src/prepare.rs

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::utils::{cargo_install, git_clone, run_command, run_command_with_outpu
44
use std::fs;
55
use std::path::Path;
66

7-
fn prepare_libcore() -> Result<(), String> {
7+
fn prepare_libcore(sysroot_path: &Path) -> Result<(), String> {
88
let rustc_path = match get_rustc_path() {
99
Some(path) => path,
1010
None => return Err("`rustc` path not found".to_owned()),
@@ -15,14 +15,18 @@ fn prepare_libcore() -> Result<(), String> {
1515
None => return Err(format!("No parent for `{}`", rustc_path.display())),
1616
};
1717

18-
let rustlib_dir = parent.join("../lib/rustlib/src/rust");
18+
let rustlib_dir =
19+
parent
20+
.join("../lib/rustlib/src/rust")
21+
.canonicalize()
22+
.map_err(|e| format!("Failed to canonicalize path: {e:?}"))?;
1923
if !rustlib_dir.is_dir() {
2024
return Err("Please install `rust-src` component".to_owned());
2125
}
2226

23-
let sysroot_dir = Path::new("build_sysroot/sysroot_src");
27+
let sysroot_dir = sysroot_path.join("sysroot_src");
2428
if sysroot_dir.is_dir() {
25-
if let Err(e) = fs::remove_dir_all(sysroot_dir) {
29+
if let Err(e) = fs::remove_dir_all(&sysroot_dir) {
2630
return Err(format!("Failed to remove `{}`: {:?}", sysroot_dir.display(), e));
2731
}
2832
}
@@ -34,24 +38,30 @@ fn prepare_libcore() -> Result<(), String> {
3438
sysroot_library_dir.display(),
3539
))?;
3640

37-
run_command(&[&"cp", &"-r", &rustlib_dir, &sysroot_library_dir], None)?;
41+
run_command(&[&"cp", &"-r", &rustlib_dir.join("library"), &sysroot_dir], None)?;
3842

3943
println!("[GIT] init (cwd): `{}`", sysroot_dir.display());
40-
run_command_with_output(&[&"git", &"init"], Some(&sysroot_dir))?;
44+
run_command(&[&"git", &"init"], Some(&sysroot_dir))?;
4145
println!("[GIT] add (cwd): `{}`", sysroot_dir.display());
42-
run_command_with_output(&[&"git", &"add", &"."], Some(&sysroot_dir))?;
46+
run_command(&[&"git", &"add", &"."], Some(&sysroot_dir))?;
4347
println!("[GIT] commit (cwd): `{}`", sysroot_dir.display());
4448

4549
// This is needed on systems where nothing is configured.
4650
// git really needs something here, or it will fail.
4751
// Even using --author is not enough.
4852
run_command(&[&"git", &"config", &"user.email", &"[email protected]"], Some(&sysroot_dir))?;
4953
run_command(&[&"git", &"config", &"user.name", &"None"], Some(&sysroot_dir))?;
50-
run_command(&[&"git", &"config", &"core.autocrlf=false"], Some(&sysroot_dir))?;
51-
run_command(&[&"git", &"config", &"commit.gpgSign=false"], Some(&sysroot_dir))?;
54+
run_command(&[&"git", &"config", &"core.autocrlf", &"false"], Some(&sysroot_dir))?;
55+
run_command(&[&"git", &"config", &"commit.gpgSign", &"false"], Some(&sysroot_dir))?;
5256
run_command(&[&"git", &"commit", &"-m", &"Initial commit", &"-q"], Some(&sysroot_dir))?;
5357

58+
let mut patches = Vec::new();
5459
walk_dir("patches", |_| Ok(()), |file_path: &Path| {
60+
patches.push(file_path.to_path_buf());
61+
Ok(())
62+
})?;
63+
patches.sort();
64+
for file_path in patches {
5565
println!("[GIT] apply `{}`", file_path.display());
5666
let path = Path::new("../..").join(file_path);
5767
run_command_with_output(&[&"git", &"apply", &path], Some(&sysroot_dir))?;
@@ -60,15 +70,19 @@ fn prepare_libcore() -> Result<(), String> {
6070
&[&"git", &"commit", &"--no-gpg-sign", &"-m", &format!("Patch {}", path.display())],
6171
Some(&sysroot_dir),
6272
)?;
63-
Ok(())
64-
})?;
73+
}
6574
println!("Successfully prepared libcore for building");
6675
Ok(())
6776
}
6877

6978
// build with cg_llvm for perf comparison
7079
fn build_raytracer(repo_dir: &Path) -> Result<(), String> {
7180
run_command(&[&"cargo", &"build"], Some(repo_dir))?;
81+
let mv_target = repo_dir.join("raytracer_cg_llvm");
82+
if mv_target.is_file() {
83+
std::fs::remove_file(&mv_target)
84+
.map_err(|e| format!("Failed to remove file `{}`: {e:?}", mv_target.display()))?;
85+
}
7286
run_command(&[&"mv", &"target/debug/main", &"raytracer_cg_llvm"], Some(repo_dir))?;
7387
Ok(())
7488
}
@@ -82,18 +96,21 @@ where
8296
println!("`{}` has already been cloned", clone_result.repo_name);
8397
}
8498
let repo_path = Path::new(&clone_result.repo_name);
85-
run_command(&[&"git", &"checkout", &"--", &"."], Some(repo_path))?;
86-
run_command(&[&"git", &"checkout", &checkout_commit], Some(repo_path))?;
99+
run_command(&[&"git", &"checkout", &"--", &"."], Some(&repo_path))?;
100+
run_command(&[&"git", &"checkout", &checkout_commit], Some(&repo_path))?;
87101
let filter = format!("-{}-", clone_result.repo_name);
88102
walk_dir("crate_patches", |_| Ok(()), |file_path| {
89103
let s = file_path.as_os_str().to_str().unwrap();
90104
if s.contains(&filter) && s.ends_with(".patch") {
91-
run_command(&[&"git", &"am", &s], Some(repo_path))?;
105+
run_command_with_output(
106+
&[&"git", &"am", &file_path.canonicalize().unwrap()],
107+
Some(&repo_path),
108+
)?;
92109
}
93110
Ok(())
94111
})?;
95112
if let Some(extra) = extra {
96-
extra(repo_path)?;
113+
extra(&repo_path)?;
97114
}
98115
Ok(())
99116
}
@@ -136,7 +153,8 @@ pub fn run() -> Result<(), String> {
136153
Some(a) => a,
137154
None => return Ok(()),
138155
};
139-
prepare_libcore()?;
156+
let sysroot_path = Path::new("build_sysroot");
157+
prepare_libcore(sysroot_path)?;
140158

141159
if !args.only_libcore {
142160
cargo_install("hyperfine")?;

‎build_system/src/utils.rs

Lines changed: 58 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
use std::ffi::OsStr;
2+
use std::fmt::Debug;
23
use std::fs;
34
use std::path::Path;
4-
use std::process::{Command, Output};
5+
use std::process::{Command, ExitStatus, Output};
56

6-
fn run_command_inner(input: &[&dyn AsRef<OsStr>], cwd: Option<&Path>) -> Command {
7+
fn get_command_inner(input: &[&dyn AsRef<OsStr>], cwd: Option<&Path>) -> Command {
78
let (cmd, args) = match input {
89
[] => panic!("empty command"),
910
[cmd, args @ ..] => (cmd, args),
@@ -16,44 +17,67 @@ fn run_command_inner(input: &[&dyn AsRef<OsStr>], cwd: Option<&Path>) -> Command
1617
command
1718
}
1819

19-
pub fn run_command(input: &[&dyn AsRef<OsStr>], cwd: Option<&Path>) -> Result<Output, String> {
20-
run_command_inner(input, cwd).output()
21-
.map_err(|e| format!(
22-
"Command `{}` failed to run: {e:?}",
20+
fn check_exit_status(
21+
input: &[&dyn AsRef<OsStr>],
22+
cwd: Option<&Path>,
23+
exit_status: ExitStatus,
24+
) -> Result<(), String> {
25+
if exit_status.success() {
26+
Ok(())
27+
} else {
28+
Err(format!(
29+
"Command `{}`{} exited with status {:?}",
2330
input.iter()
2431
.map(|s| s.as_ref().to_str().unwrap())
2532
.collect::<Vec<_>>()
2633
.join(" "),
34+
cwd.map(|cwd| format!(" (running in folder `{}`)", cwd.display()))
35+
.unwrap_or_default(),
36+
exit_status.code(),
2737
))
38+
}
39+
}
40+
41+
fn command_error<D: Debug>(input: &[&dyn AsRef<OsStr>], cwd: &Option<&Path>, error: D) -> String {
42+
format!(
43+
"Command `{}`{} failed to run: {error:?}",
44+
input.iter()
45+
.map(|s| s.as_ref().to_str().unwrap())
46+
.collect::<Vec<_>>()
47+
.join(" "),
48+
cwd.as_ref()
49+
.map(|cwd| format!(
50+
" (running in folder `{}`)",
51+
cwd.display(),
52+
))
53+
.unwrap_or_default(),
54+
)
55+
}
56+
57+
pub fn run_command(input: &[&dyn AsRef<OsStr>], cwd: Option<&Path>) -> Result<Output, String> {
58+
let output = get_command_inner(input, cwd)
59+
.output()
60+
.map_err(|e| command_error(input, &cwd, e))?;
61+
check_exit_status(input, cwd, output.status)?;
62+
Ok(output)
2863
}
2964

3065
pub fn run_command_with_output(
3166
input: &[&dyn AsRef<OsStr>],
3267
cwd: Option<&Path>,
3368
) -> Result<(), String> {
34-
run_command_inner(input, cwd).spawn()
35-
.map_err(|e| format!(
36-
"Command `{}` failed to run: {e:?}",
37-
input.iter()
38-
.map(|s| s.as_ref().to_str().unwrap())
39-
.collect::<Vec<_>>()
40-
.join(" "),
41-
))?
69+
let exit_status = get_command_inner(input, cwd).spawn()
70+
.map_err(|e| command_error(input, &cwd, e))?
4271
.wait()
43-
.map_err(|e| format!(
44-
"Failed to wait for command `{}` to run: {e:?}",
45-
input.iter()
46-
.map(|s| s.as_ref().to_str().unwrap())
47-
.collect::<Vec<_>>()
48-
.join(" "),
49-
))?;
72+
.map_err(|e| command_error(input, &cwd, e))?;
73+
check_exit_status(input, cwd, exit_status)?;
5074
Ok(())
5175
}
5276

5377
pub fn cargo_install(to_install: &str) -> Result<(), String> {
5478
let output = run_command(&[&"cargo", &"install", &"--list"], None)?;
5579

56-
let to_install = format!("{to_install} ");
80+
let to_install_needle = format!("{to_install} ");
5781
// cargo install --list returns something like this:
5882
//
5983
// mdbook-toc v0.8.0:
@@ -65,11 +89,14 @@ pub fn cargo_install(to_install: &str) -> Result<(), String> {
6589
if String::from_utf8(output.stdout)
6690
.unwrap()
6791
.lines()
68-
.any(|line| line.ends_with(':') && line.starts_with(&to_install))
92+
.any(|line| line.ends_with(':') && line.starts_with(&to_install_needle))
6993
{
7094
return Ok(());
7195
}
72-
run_command(&[&"cargo", &"install", &to_install], None)?;
96+
// We voluntarily ignore this error.
97+
if run_command_with_output(&[&"cargo", &"install", &to_install], None).is_err() {
98+
println!("Skipping installation of `{to_install}`");
99+
}
73100
Ok(())
74101
}
75102

@@ -85,20 +112,22 @@ pub fn git_clone(to_clone: &str, dest: Option<&Path>) -> Result<CloneResult, Str
85112
None => repo_name.to_owned(),
86113
};
87114

88-
let dest = dest.unwrap_or_else(|| Path::new(&repo_name));
115+
let dest = dest
116+
.map(|dest| dest.join(&repo_name))
117+
.unwrap_or_else(|| Path::new(&repo_name).into());
89118
if dest.is_dir() {
90119
return Ok(CloneResult { ran_clone: false, repo_name });
91120
}
92121

93-
run_command(&[&"git", &"clone", &to_clone, &dest], None)?;
122+
run_command_with_output(&[&"git", &"clone", &to_clone, &dest], None)?;
94123
Ok(CloneResult { ran_clone: true, repo_name })
95124
}
96125

97-
pub fn walk_dir<P, D, F>(dir: P, dir_cb: D, file_cb: F) -> Result<(), String>
126+
pub fn walk_dir<P, D, F>(dir: P, mut dir_cb: D, mut file_cb: F) -> Result<(), String>
98127
where
99128
P: AsRef<Path>,
100-
D: Fn(&Path) -> Result<(), String>,
101-
F: Fn(&Path) -> Result<(), String>,
129+
D: FnMut(&Path) -> Result<(), String>,
130+
F: FnMut(&Path) -> Result<(), String>,
102131
{
103132
let dir = dir.as_ref();
104133
for entry in fs::read_dir(dir).map_err(|e| format!("Failed to read dir `{}`: {e:?}", dir.display()))? {

0 commit comments

Comments
 (0)