From 39b31ad3b73bb5c8c4fec4b38c06ce60f3edfd3c Mon Sep 17 00:00:00 2001 From: shivaraj-bh Date: Fri, 27 Oct 2023 13:46:58 +0530 Subject: [PATCH 1/2] use XWIN_CACHE_DIR to create cmake cache dir --- src/common.rs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/common.rs b/src/common.rs index 459bf44..f799f88 100644 --- a/src/common.rs +++ b/src/common.rs @@ -80,8 +80,7 @@ impl XWinOptions { // If the really is no cache dir, cwd will also do .unwrap_or_else(|| env::current_dir().expect("Failed to get current dir")) .join(env!("CARGO_PKG_NAME")) - .join("xwin") - }); + }).join("xwin"); fs::create_dir_all(&xwin_cache_dir)?; let xwin_cache_dir = xwin_cache_dir.canonicalize()?; @@ -396,16 +395,18 @@ impl XWinOptions { } fn setup_cmake_toolchain(&self, target: &str, xwin_cache_dir: &Path) -> Result { - let cache_dir = dirs::cache_dir() - .unwrap_or_else(|| env::current_dir().expect("Failed to get current dir")) - .join(env!("CARGO_PKG_NAME")); - let cmake = cache_dir.join("cmake"); - fs::create_dir_all(&cmake)?; + let cmake_cache_dir = self.xwin_cache_dir.clone().unwrap_or_else(|| { + dirs::cache_dir() + // If the really is no cache dir, cwd will also do + .unwrap_or_else(|| env::current_dir().expect("Failed to get current dir")) + .join(env!("CARGO_PKG_NAME")) + }).join("cmake"); + fs::create_dir_all(&cmake_cache_dir)?; - let override_file = cmake.join("override.cmake"); + let override_file = cmake_cache_dir.join("override.cmake"); fs::write(override_file, include_bytes!("override.cmake"))?; - let toolchain_file = cmake.join(format!("{}-toolchain.cmake", target)); + let toolchain_file = cmake_cache_dir.join(format!("{}-toolchain.cmake", target)); let target_arch = target .split_once('-') .map(|(x, _)| x) From e3fccbd340877a896382283e6da0df6436ae5619 Mon Sep 17 00:00:00 2001 From: shivaraj-bh Date: Fri, 27 Oct 2023 14:00:06 +0530 Subject: [PATCH 2/2] fmt --- src/common.rs | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/common.rs b/src/common.rs index f799f88..8e554b2 100644 --- a/src/common.rs +++ b/src/common.rs @@ -75,12 +75,16 @@ impl XWinOptions { cargo: &cargo_options::CommonOptions, cmd: &mut Command, ) -> Result<()> { - let xwin_cache_dir = self.xwin_cache_dir.clone().unwrap_or_else(|| { - dirs::cache_dir() - // If the really is no cache dir, cwd will also do - .unwrap_or_else(|| env::current_dir().expect("Failed to get current dir")) - .join(env!("CARGO_PKG_NAME")) - }).join("xwin"); + let xwin_cache_dir = self + .xwin_cache_dir + .clone() + .unwrap_or_else(|| { + dirs::cache_dir() + // If the really is no cache dir, cwd will also do + .unwrap_or_else(|| env::current_dir().expect("Failed to get current dir")) + .join(env!("CARGO_PKG_NAME")) + }) + .join("xwin"); fs::create_dir_all(&xwin_cache_dir)?; let xwin_cache_dir = xwin_cache_dir.canonicalize()?; @@ -395,12 +399,16 @@ impl XWinOptions { } fn setup_cmake_toolchain(&self, target: &str, xwin_cache_dir: &Path) -> Result { - let cmake_cache_dir = self.xwin_cache_dir.clone().unwrap_or_else(|| { - dirs::cache_dir() - // If the really is no cache dir, cwd will also do - .unwrap_or_else(|| env::current_dir().expect("Failed to get current dir")) - .join(env!("CARGO_PKG_NAME")) - }).join("cmake"); + let cmake_cache_dir = self + .xwin_cache_dir + .clone() + .unwrap_or_else(|| { + dirs::cache_dir() + // If the really is no cache dir, cwd will also do + .unwrap_or_else(|| env::current_dir().expect("Failed to get current dir")) + .join(env!("CARGO_PKG_NAME")) + }) + .join("cmake"); fs::create_dir_all(&cmake_cache_dir)?; let override_file = cmake_cache_dir.join("override.cmake");