tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avoid injecting ENV vars from Makefile

Browse Source 
So that we can run "cargo build" without setting vars manually.
This commit is contained in:
Dietmar Maurer 2019-09-09 10:51:08 +02:00
parent d21ae955a6
commit 4a7de56e2f
6 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -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

2
src/api2.rs
View File

@ -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;

11
src/api2/version.rs
View File

@ -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,

3
src/bin/proxmox-backup-api.rs
View File

@ -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);

3
src/bin/proxmox-backup-proxy.rs
View File

@ -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';

5
src/buildcfg.rs
View File

@ -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))
}