You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
68 lines
1.9 KiB
68 lines
1.9 KiB
From 136a745c5de804ee9cf0ec601302e17cef6334a3 Mon Sep 17 00:00:00 2001
|
|
From: Igor Raits <i.gnatenko.brain@gmail.com>
|
|
Date: Sun, 22 Mar 2020 16:27:35 +0100
|
|
Subject: [PATCH] chore: Update liquid to 0.20
|
|
|
|
Signed-off-by: Igor Raits <i.gnatenko.brain@gmail.com>
|
|
---
|
|
build.rs | 31 +++++++------------------------
|
|
1 file changed, 7 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/build.rs b/build.rs
|
|
index 1c5872e..bff88e9 100644
|
|
--- a/build.rs
|
|
+++ b/build.rs
|
|
@@ -18,34 +18,13 @@ lazy_static! {
|
|
.unwrap_or("bat");
|
|
}
|
|
|
|
-fn init_template() -> liquid::value::Object {
|
|
- let mut globals = liquid::value::Object::new();
|
|
-
|
|
- globals.insert(
|
|
- "PROJECT_NAME".into(),
|
|
- liquid::value::Value::scalar(PROJECT_NAME.to_owned()),
|
|
- );
|
|
-
|
|
- globals.insert(
|
|
- "PROJECT_EXECUTABLE".into(),
|
|
- liquid::value::Value::scalar(EXECUTABLE_NAME.to_owned()),
|
|
- );
|
|
-
|
|
- globals.insert(
|
|
- "PROJECT_VERSION".into(),
|
|
- liquid::value::Value::scalar(PROJECT_VERSION.to_owned()),
|
|
- );
|
|
-
|
|
- globals
|
|
-}
|
|
-
|
|
/// Generates a file from a liquid template.
|
|
fn template(
|
|
- variables: &liquid::value::Object,
|
|
+ variables: &liquid::Object,
|
|
in_file: &str,
|
|
out_file: impl AsRef<Path>,
|
|
) -> Result<(), Box<dyn Error>> {
|
|
- let template = liquid::ParserBuilder::with_liquid()
|
|
+ let template = liquid::ParserBuilder::with_stdlib()
|
|
.build()?
|
|
.parse(&fs::read_to_string(in_file)?)?;
|
|
|
|
@@ -54,7 +33,11 @@ fn template(
|
|
}
|
|
|
|
fn main() -> Result<(), Box<dyn Error>> {
|
|
- let variables = init_template();
|
|
+ let variables = liquid::object!({
|
|
+ "PROJECT_NAME": PROJECT_NAME.to_owned(),
|
|
+ "PROJECT_EXECUTABLE": EXECUTABLE_NAME.to_owned(),
|
|
+ "PROJECT_VERSION": PROJECT_VERSION.to_owned(),
|
|
+ });
|
|
|
|
let out_dir_env = std::env::var_os("OUT_DIR").expect("OUT_DIR to be set in build.rs");
|
|
let out_dir = Path::new(&out_dir_env);
|
|
--
|
|
2.26.0.rc2
|
|
|