GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Revert "Pull in latest upstream n2 fixes"

Browse source 
This reverts commit e07e60495b.

Latest update has an issue on macOS.
This commit is contained in:
Damien Elmes 2023-08-31 08:00:34 +10:00
parent e86cebd45e
commit 1100bb6fe8
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build/ninja_gen/src/render.rs
View file

@ -22,17 +22,12 @@ impl Build {
) )
.unwrap(); .unwrap();
writeln!(&mut buf, "builddir = {}", self.buildroot.as_str()).unwrap();
writeln!( writeln!(
&mut buf, &mut buf,
"runner = $builddir/rust/release/{}", "runner = $builddir/rust/release/{}",
with_exe("runner") with_exe("runner")
) )
.unwrap(); .unwrap();
for (key, value) in &self.variables {
writeln!(&mut buf, "{} = {}", key, value).unwrap();
}
buf.push('\n');
for (key, value) in &self.pools { for (key, value) in &self.pools {
writeln!(&mut buf, "pool {}\n depth = {}", key, value).unwrap(); writeln!(&mut buf, "pool {}\n depth = {}", key, value).unwrap();
@ -54,6 +49,14 @@ impl Build {
buf.push_str(&self.trailing_text); buf.push_str(&self.trailing_text);
buf = buf.replace("$builddir", self.buildroot.as_str());
for (key, value) in &self.variables {
buf = buf.replace(
&format!("${key}"),
&value.replace("$builddir", self.buildroot.as_str()),
);
}
buf buf
} }

2
tools/install-n2
View file

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
cargo install --git https://github.com/ankitects/n2.git --rev 3eca2545a8f4c8cbdd8ed697936bd2ae929b55dd cargo install --git https://github.com/ankitects/n2.git --rev 56202604d4c541524b82381162eafae4290fdd22