From: Dietmar Maurer <dietmar@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup] use build.rs to pass REPOID to rustc-env
Date: Fri, 7 May 2021 10:41:13 +0200 [thread overview]
Message-ID: <20210507084113.7712-1-dietmar@proxmox.com> (raw)
---
Cargo.toml | 1 +
build.rs | 24 ++++++++++++++++++++++++
src/api2/version.rs | 2 +-
3 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 build.rs
diff --git a/Cargo.toml b/Cargo.toml
index be6c7da9..246b8e07 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,6 +15,7 @@ edition = "2018"
license = "AGPL-3"
description = "Proxmox Backup"
homepage = "https://www.proxmox.com"
+build = "build.rs"
exclude = [ "build", "debian", "tests/catar_data/test_symlink/symlink1"]
diff --git a/build.rs b/build.rs
new file mode 100644
index 00000000..754966b6
--- /dev/null
+++ b/build.rs
@@ -0,0 +1,24 @@
+// build.rs
+use std::env;
+use std::process::Command;
+
+fn main() {
+ let repoid = match env::var("REPOID") {
+ Ok(repoid) => repoid,
+ Err(_) => {
+ match Command::new("git")
+ .args(&["rev-parse", "HEAD"])
+ .output()
+ {
+ Ok(output) => {
+ String::from_utf8(output.stdout).unwrap()
+ }
+ Err(err) => {
+ panic!("git rev-parse failed: {}", err);
+ }
+ }
+ }
+ };
+
+ println!("cargo:rustc-env=REPOID={}", repoid);
+}
diff --git a/src/api2/version.rs b/src/api2/version.rs
index ca156402..d18d0cf4 100644
--- a/src/api2/version.rs
+++ b/src/api2/version.rs
@@ -13,7 +13,7 @@ pub const PROXMOX_PKG_VERSION: &str =
env!("CARGO_PKG_VERSION_MINOR"),
);
pub const PROXMOX_PKG_RELEASE: &str = env!("CARGO_PKG_VERSION_PATCH");
-pub const PROXMOX_PKG_REPOID: &str = env!("CARGO_PKG_REPOSITORY");
+pub const PROXMOX_PKG_REPOID: &str = env!("REPOID");
fn get_version(
_param: Value,
--
2.20.1
reply other threads:[~2021-05-07 8:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210507084113.7712-1-dietmar@proxmox.com \
--to=dietmar@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox