From 8be9a7192b00fb50cfc47dae1d3d6554c8b101be Mon Sep 17 00:00:00 2001 From: hem1t <31543841+hem1t@users.noreply.github.com> Date: Fri, 12 Jan 2024 01:20:23 +0530 Subject: [PATCH] using cargo.toml version (#1813) - Replaced `CFG_RELEASE` with `CARGO_PKG_VERSION` - No rerun on `CFG_RELEASE` --- packages/cli/build.rs | 5 ----- packages/cli/src/cli/version.rs | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/cli/build.rs b/packages/cli/build.rs index 15935e2da..050f38761 100644 --- a/packages/cli/build.rs +++ b/packages/cli/build.rs @@ -5,14 +5,9 @@ use std::{env, path::PathBuf, process::Command}; fn main() { set_rerun(); set_commit_info(); - if option_env!("CFG_RELEASE").is_none() { - println!("cargo:rustc-env=POKE_RA_DEVS=1"); - } } fn set_rerun() { - println!("cargo:rerun-if-env-changed=CFG_RELEASE"); - let mut manifest_dir = PathBuf::from( env::var("CARGO_MANIFEST_DIR").expect("`CARGO_MANIFEST_DIR` is always set by cargo."), ); diff --git a/packages/cli/src/cli/version.rs b/packages/cli/src/cli/version.rs index c015a73a2..47ace1be3 100644 --- a/packages/cli/src/cli/version.rs +++ b/packages/cli/src/cli/version.rs @@ -49,7 +49,7 @@ impl fmt::Display for VersionInfo { /// Returns information about cargo's version. pub const fn version() -> VersionInfo { - let version = match option_env!("CFG_RELEASE") { + let version = match option_env!("CARGO_PKG_VERSION") { Some(x) => x, None => "0.0.0", };