Release 0.4.4
This commit is contained in:
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -4574,7 +4574,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wlx-overlay-s"
|
name = "wlx-overlay-s"
|
||||||
version = "0.4.3"
|
version = "0.4.4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"ash",
|
"ash",
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ debug = true
|
|||||||
|
|
||||||
[package]
|
[package]
|
||||||
name = "wlx-overlay-s"
|
name = "wlx-overlay-s"
|
||||||
version = "0.4.3"
|
version = "0.4.4"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
@@ -70,6 +70,9 @@ image_dds = { version = "0.6.0", default-features = false, features = [
|
|||||||
] }
|
] }
|
||||||
mint = "0.5.9"
|
mint = "0.5.9"
|
||||||
|
|
||||||
|
[build-dependencies]
|
||||||
|
regex = { version = "*" }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = ["openvr", "openxr", "osc", "x11", "wayland"]
|
default = ["openvr", "openxr", "osc", "x11", "wayland"]
|
||||||
openvr = ["dep:ovr_overlay", "dep:json"]
|
openvr = ["dep:ovr_overlay", "dep:json"]
|
||||||
|
|||||||
23
build.rs
Normal file
23
build.rs
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
use regex::Regex;
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let mut wlx_build = get_version().unwrap_or(format!("{} (Cargo)", env!("CARGO_PKG_VERSION")));
|
||||||
|
|
||||||
|
if std::env::var("GITHUB_ACTIONS").is_ok() {
|
||||||
|
wlx_build = format!("{} (AppImage)", &wlx_build)
|
||||||
|
}
|
||||||
|
|
||||||
|
println!("cargo:rustc-env=WLX_BUILD={}", &wlx_build);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_version() -> Result<String, Box<dyn std::error::Error>> {
|
||||||
|
let re = Regex::new(r"v([0-9.]+)-([0-9]+)-g([a-f0-9]+)").unwrap(); // safe
|
||||||
|
let output = Command::new("git")
|
||||||
|
.args(["describe", "--tags", "--abbrev=7"])
|
||||||
|
.output()?;
|
||||||
|
|
||||||
|
let output_str = String::from_utf8(output.stdout)?;
|
||||||
|
|
||||||
|
Ok(re.replace_all(&output_str, "${1}.r${2}.${3}").into_owned())
|
||||||
|
}
|
||||||
@@ -79,7 +79,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
log::info!(
|
log::info!(
|
||||||
"Welcome to {} version {}!",
|
"Welcome to {} version {}!",
|
||||||
env!("CARGO_PKG_NAME"),
|
env!("CARGO_PKG_NAME"),
|
||||||
env!("CARGO_PKG_VERSION")
|
env!("WLX_BUILD"),
|
||||||
);
|
);
|
||||||
log::info!("It is {}.", chrono::Local::now().format("%c"));
|
log::info!("It is {}.", chrono::Local::now().format("%c"));
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user