langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix i18n build script not responding to env var changes

Browse Source 
Not much use declaring the cargo flag when we bake the env var into
the binary! Also treat an empty variable as missing.
This commit is contained in:
Damien Elmes 2023-07-04 17:17:41 +10:00
parent 32d6248ff1
commit e835922ded
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cargo/config.toml
View File

@ -1,5 +1,4 @@
[env] [env]
# STRINGS_JSON = { value = "out/rslib/i18n/strings.json", relative = true }
STRINGS_PY = { value = "out/pylib/anki/_fluent.py", relative = true } STRINGS_PY = { value = "out/pylib/anki/_fluent.py", relative = true }
STRINGS_JS = { value = "out/ts/lib/ftl.js", relative = true } STRINGS_JS = { value = "out/ts/lib/ftl.js", relative = true }
STRINGS_DTS = { value = "out/ts/lib/ftl.d.ts", relative = true } STRINGS_DTS = { value = "out/ts/lib/ftl.d.ts", relative = true }

14
rslib/i18n/build.rs
View File

@ -8,7 +8,8 @@ mod python;
mod typescript; mod typescript;
mod write_strings; mod write_strings;
use std::path::Path; use std::env;
use std::path::PathBuf;
use anki_io::create_dir_all; use anki_io::create_dir_all;
use anki_io::write_file_if_changed; use anki_io::write_file_if_changed;
@ -32,10 +33,13 @@ fn main() -> Result<()> {
// write strings.json file to requested path // write strings.json file to requested path
println!("cargo:rerun-if-env-changed=STRINGS_JSON"); println!("cargo:rerun-if-env-changed=STRINGS_JSON");
if let Some(path) = option_env!("STRINGS_JSON") { if let Ok(path) = env::var("STRINGS_JSON") {
let meta_json = serde_json::to_string_pretty(&modules).unwrap(); if !path.is_empty() {
create_dir_all(Path::new(path).parent().unwrap())?; let path = PathBuf::from(path);
write_file_if_changed(path, meta_json)?; let meta_json = serde_json::to_string_pretty(&modules).unwrap();
create_dir_all(path.parent().unwrap())?;
write_file_if_changed(path, meta_json)?;
}
} }
Ok(()) Ok(())
} }