From 9c1e4a705ef7a06ddf798dcde1126f7940a834ce Mon Sep 17 00:00:00 2001 From: David Dal Busco Date: Thu, 9 May 2024 08:46:10 +0200 Subject: [PATCH] fix: revert custom build.rs script (#540) Signed-off-by: David Dal Busco --- src/build.rs | 42 ------------------------------- src/libs/satellite/Cargo.toml | 1 - src/libs/satellite/src/lib.rs | 4 ++- src/libs/satellite/src/version.rs | 1 + src/satellite/Cargo.toml | 1 - 5 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 src/build.rs create mode 100644 src/libs/satellite/src/version.rs diff --git a/src/build.rs b/src/build.rs deleted file mode 100644 index b3a81cf33..000000000 --- a/src/build.rs +++ /dev/null @@ -1,42 +0,0 @@ -use std::env; -use std::fs::File; -use std::io::{BufRead, BufReader}; -use std::path::PathBuf; - -fn main() { - let current_dir = env::current_dir().unwrap(); - - let project_root = if current_dir.ends_with("src/libs/satellite") { - current_dir.clone() - } else { - // Replace "src/libs/satellite" with "src/satellite" - we are building the Satellite, not the lib - let mut modified_path = current_dir.to_str().unwrap().to_string(); - modified_path = modified_path.replace("src/libs/satellite", "src/satellite"); - PathBuf::from(modified_path) - }; - - let cargo_toml = project_root.join("Cargo.toml"); - - if !cargo_toml.exists() || !cargo_toml.is_file() { - panic!("File does not exist: {:?}", cargo_toml); - } - - let file = File::open(cargo_toml.clone()).unwrap(); - let reader = BufReader::new(file); - - for line in reader.lines() { - let line = line.unwrap(); - - if line.starts_with("version =") { - let version_full = line.split('"').nth(1).unwrap(); - // Extract only version - no patch - let version_base = version_full - .split(|c| c == '.' || c == '-') - .take(3) - .collect::>() - .join("."); - println!("cargo:rustc-env=SATELLITE_VERSION={}", version_base); - break; - } - } -} diff --git a/src/libs/satellite/Cargo.toml b/src/libs/satellite/Cargo.toml index 9e2db0500..f03d92603 100644 --- a/src/libs/satellite/Cargo.toml +++ b/src/libs/satellite/Cargo.toml @@ -9,7 +9,6 @@ homepage.workspace = true documentation = "https://docs.rs/junobuild-satellite" readme = "README.md" license-file = "LICENSE.md" -build = "../../build.rs" [package.metadata.docs.rs] targets = ["wasm32-unknown-unknown"] diff --git a/src/libs/satellite/src/lib.rs b/src/libs/satellite/src/lib.rs index ef4eff2b6..a793e3638 100644 --- a/src/libs/satellite/src/lib.rs +++ b/src/libs/satellite/src/lib.rs @@ -17,6 +17,7 @@ mod satellite; mod storage; mod types; mod upgrade; +mod version; use crate::auth::types::state::AuthenticationConfig; use crate::guards::{caller_is_admin_controller, caller_is_controller}; @@ -28,6 +29,7 @@ use crate::storage::types::interface::{ }; use crate::types::interface::{Config, RulesType}; use crate::types::list::ListResults; +use crate::version::SATELLITE_VERSION; use ic_cdk::api::trap; use ic_cdk_macros::{init, post_upgrade, pre_upgrade, query, update}; use junobuild_shared::types::interface::{ @@ -337,7 +339,7 @@ pub async fn deposit_cycles(args: DepositCyclesArgs) { #[doc(hidden)] #[query] pub fn version() -> String { - env!("SATELLITE_VERSION").to_string() + SATELLITE_VERSION.to_string() } #[doc(hidden)] diff --git a/src/libs/satellite/src/version.rs b/src/libs/satellite/src/version.rs new file mode 100644 index 000000000..67cef1834 --- /dev/null +++ b/src/libs/satellite/src/version.rs @@ -0,0 +1 @@ +pub const SATELLITE_VERSION: &str = "0.0.17"; diff --git a/src/satellite/Cargo.toml b/src/satellite/Cargo.toml index 605ec2105..1f2ddde7b 100644 --- a/src/satellite/Cargo.toml +++ b/src/satellite/Cargo.toml @@ -3,7 +3,6 @@ name = "satellite" version = "0.0.17" edition = "2021" publish = false -build = "../build.rs" [lib] crate-type = ["cdylib"]