From 0e3c95304541b725f3b814b7d8857d48caa688b3 Mon Sep 17 00:00:00 2001
From: luofucong <luofc@foxmail.com>
Date: Fri, 2 Aug 2024 19:08:48 +0800
Subject: [PATCH] chore: bump `shadow-rs` version to set the path to find the
 correct git repo

---
 Cargo.lock                    |  4 ++--
 Cargo.toml                    |  1 +
 src/common/version/Cargo.toml |  4 ++--
 src/common/version/build.rs   | 11 ++++++++++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3afe95509cac..76898ff5411f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10376,9 +10376,9 @@ dependencies = [
 
 [[package]]
 name = "shadow-rs"
-version = "0.29.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a600f795d0894cda22235b44eea4b85c2a35b405f65523645ac8e35b306817a"
+checksum = "66caf2de9b7e61293c00006cd2807d6c4e4b31018c5ea21d008f44f4852b93c3"
 dependencies = [
  "const_format",
  "git2",
diff --git a/Cargo.toml b/Cargo.toml
index 77713ce00f76..cedd92dfbc2d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -159,6 +159,7 @@ schemars = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["float_roundtrip"] }
 serde_with = "3"
+shadow-rs = "0.31"
 smallvec = { version = "1", features = ["serde"] }
 snafu = "0.8"
 sysinfo = "0.30"
diff --git a/src/common/version/Cargo.toml b/src/common/version/Cargo.toml
index 6d602cabfe0b..830f5a757f39 100644
--- a/src/common/version/Cargo.toml
+++ b/src/common/version/Cargo.toml
@@ -14,8 +14,8 @@ codec = ["dep:serde", "dep:schemars"]
 const_format = "0.2"
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
-shadow-rs = "0.29"
+shadow-rs.workspace = true
 
 [build-dependencies]
 build-data = "0.2"
-shadow-rs = "0.29"
+shadow-rs.workspace = true
diff --git a/src/common/version/build.rs b/src/common/version/build.rs
index eeb383771864..6bf44d026ca5 100644
--- a/src/common/version/build.rs
+++ b/src/common/version/build.rs
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::env;
+
 use build_data::{format_timestamp, get_source_time};
 
 fn main() -> shadow_rs::SdResult<()> {
@@ -25,5 +27,12 @@ fn main() -> shadow_rs::SdResult<()> {
         }
     );
     build_data::set_BUILD_TIMESTAMP();
-    shadow_rs::new()
+
+    // The "CARGO_WORKSPACE_DIR" is set manually (not by Rust itself) in Cargo config file, to
+    // solve the problem where the "CARGO_MANIFEST_DIR" is not what we want when this repo is
+    // made as a submodule in another repo.
+    let src_path = env::var("CARGO_WORKSPACE_DIR").or_else(|_| env::var("CARGO_MANIFEST_DIR"))?;
+    let out_path = env::var("OUT_DIR")?;
+    let _ = shadow_rs::Shadow::build_with(src_path, out_path, Default::default())?;
+    Ok(())
 }