From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 9 Sep 2019 08:51:08 +0000 (+0200)
Subject: avoid injecting ENV vars from Makefile
X-Git-Tag: v0.1.3~612
X-Git-Url: https://git.proxmox.com/?p=proxmox-backup.git;a=commitdiff_plain;h=4a7de56e2fcc861b420658d01bcd1491627a9cce

avoid injecting ENV vars from Makefile

So that we can run "cargo build" without setting vars manually.
---

diff --git a/Makefile b/Makefile
index 27b33d04..7dfbb656 100644
--- a/Makefile
+++ b/Makefile
@@ -32,13 +32,6 @@ endif
 COMPILED_BINS := \
 	$(addprefix $(COMPILEDIR)/,$(USR_BIN) $(USR_SBIN) $(SERVICE_BIN))
 
-export PROXMOX_PKG_VERSION=${PKGVER}
-export PROXMOX_PKG_RELEASE=${PKGREL}
-export PROXMOX_PKG_REPOID=${GITVERSION}
-
-export PROXMOX_JSDIR := $(JSDIR)
-export PROXMOX_CONFIGDIR := $(SYSCONFDIR)/proxmox-backup
-
 DEB=${PACKAGE}_${PKGVER}-${PKGREL}_${ARCH}.deb
 DSC=${PACKAGE}_${PKGVER}-${PKGREL}.dsc
 
diff --git a/src/api2.rs b/src/api2.rs
index 046edfc9..c44fa616 100644
--- a/src/api2.rs
+++ b/src/api2.rs
@@ -4,7 +4,7 @@ pub mod admin;
 pub mod backup;
 pub mod reader;
 pub mod node;
-mod version;
+pub mod version;
 mod subscription;
 mod access;
 
diff --git a/src/api2/version.rs b/src/api2/version.rs
index 8c18debe..a000fe37 100644
--- a/src/api2/version.rs
+++ b/src/api2/version.rs
@@ -4,9 +4,14 @@ use crate::api_schema::*;
 use crate::api_schema::router::*;
 use serde_json::{json, Value};
 
-const PROXMOX_PKG_VERSION: &'static str = env!("PROXMOX_PKG_VERSION");
-const PROXMOX_PKG_RELEASE: &'static str = env!("PROXMOX_PKG_RELEASE");
-const PROXMOX_PKG_REPOID: &'static str = env!("PROXMOX_PKG_REPOID");
+pub const PROXMOX_PKG_VERSION: &'static str =
+    concat!(
+        env!("CARGO_PKG_VERSION_MAJOR"),
+        ".",
+        env!("CARGO_PKG_VERSION_MINOR"),
+    );
+pub const PROXMOX_PKG_RELEASE: &'static str = env!("CARGO_PKG_VERSION_PATCH");
+pub const PROXMOX_PKG_REPOID: &'static str = env!("CARGO_PKG_REPOSITORY");
 
 fn get_version(
     _param: Value,
diff --git a/src/bin/proxmox-backup-api.rs b/src/bin/proxmox-backup-api.rs
index 1537503f..ff6fe1b4 100644
--- a/src/bin/proxmox-backup-api.rs
+++ b/src/bin/proxmox-backup-api.rs
@@ -12,6 +12,7 @@ use proxmox_backup::server;
 use proxmox_backup::tools::daemon;
 use proxmox_backup::auth_helpers::*;
 use proxmox_backup::config;
+use proxmox_backup::buildcfg;
 
 #[tokio::main]
 async fn main() {
@@ -48,7 +49,7 @@ async fn run() -> Result<(), Error> {
     }
 
     let config = ApiConfig::new(
-        env!("PROXMOX_JSDIR"), &ROUTER, RpcEnvironmentType::PRIVILEGED);
+        buildcfg::JS_DIR, &ROUTER, RpcEnvironmentType::PRIVILEGED);
 
     let rest_server = RestServer::new(config);
 
diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
index 9c052f09..f7a8b740 100644
--- a/src/bin/proxmox-backup-proxy.rs
+++ b/src/bin/proxmox-backup-proxy.rs
@@ -1,4 +1,5 @@
 use proxmox_backup::configdir;
+use proxmox_backup::buildcfg;
 use proxmox_backup::server;
 use proxmox_backup::tools::daemon;
 use proxmox_backup::api_schema::router::*;
@@ -41,7 +42,7 @@ async fn run() -> Result<(), Error> {
     }
 
     let mut config = ApiConfig::new(
-        env!("PROXMOX_JSDIR"), &ROUTER, RpcEnvironmentType::PUBLIC);
+        buildcfg::JS_DIR, &ROUTER, RpcEnvironmentType::PUBLIC);
 
     // add default dirs which includes jquery and bootstrap
     // my $base = '/usr/share/libpve-http-server-perl';
diff --git a/src/buildcfg.rs b/src/buildcfg.rs
index 83ee0605..847e1d4c 100644
--- a/src/buildcfg.rs
+++ b/src/buildcfg.rs
@@ -1,7 +1,8 @@
 //! Exports configuration data from the build system
 
 /// The configured configuration directory
-pub const CONFIGDIR: &'static str = env!("PROXMOX_CONFIGDIR");
+pub const CONFIGDIR: &'static str = "/etc/proxmox-backup";
+pub const JS_DIR: &str = "/usr/share/javascript/proxmox-backup";
 
 /// Prepend configuration directory to a file name
 ///
@@ -13,5 +14,5 @@ pub const CONFIGDIR: &'static str = env!("PROXMOX_CONFIGDIR");
 /// ```
 #[macro_export]
 macro_rules! configdir {
-    ($subdir:expr) => (concat!(env!("PROXMOX_CONFIGDIR"), $subdir))
+    ($subdir:expr) => (concat!("/etc/proxmox-backup", $subdir))
 }