Consider paths passed to x.py to be root-relative.
We'd previously assumed that these paths would be relative to the src dir, and that for example our various CI scripts would, when calling x.py, use `../x.py build ../src/tools/...` but this isn't the case -- they use `../x.py` without using the relevant source-relative path. We eventually may want to make this (actually somewhat logical) change, but this is not that time.
This commit is contained in:
parent
e78ecd2e70
commit
366a65665a
2 changed files with 6 additions and 6 deletions
|
@ -385,6 +385,10 @@ impl<'a> Builder<'a> {
|
|||
Subcommand::Clean { .. } => panic!(),
|
||||
};
|
||||
|
||||
if paths[0] == Path::new("nonexistent/path/to/trigger/cargo/metadata") {
|
||||
return;
|
||||
}
|
||||
|
||||
let builder = Builder {
|
||||
build,
|
||||
top_stage: build.config.stage.unwrap_or(2),
|
||||
|
|
|
@ -278,9 +278,7 @@ Arguments:
|
|||
let src = matches.opt_str("src").map(PathBuf::from)
|
||||
.or_else(|| env::var_os("SRC").map(PathBuf::from))
|
||||
.unwrap_or(cwd.clone());
|
||||
let paths = matches.free[1..].iter().map(|p| {
|
||||
cwd.join(p).strip_prefix(&src).expect("paths passed to be inside checkout").into()
|
||||
}).collect::<Vec<PathBuf>>();
|
||||
let paths = matches.free[1..].iter().map(|p| p.into()).collect::<Vec<PathBuf>>();
|
||||
|
||||
let cfg_file = matches.opt_str("config").map(PathBuf::from).or_else(|| {
|
||||
if fs::metadata("config.toml").is_ok() {
|
||||
|
@ -380,9 +378,7 @@ Arguments:
|
|||
cmd,
|
||||
incremental: matches.opt_present("incremental"),
|
||||
exclude: split(matches.opt_strs("exclude"))
|
||||
.into_iter().map(|p| {
|
||||
cwd.join(p).strip_prefix(&src).expect("paths to be inside checkout").into()
|
||||
}).collect::<Vec<_>>(),
|
||||
.into_iter().map(|p| p.into()).collect::<Vec<_>>(),
|
||||
src,
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue