Просмотр исходного кода

fix(cli): iOS Xcode script using incorrect library path (#6699)

Lucas Fernandes Nogueira 2 лет назад
Родитель
Сommit
abc5f91fa3
2 измененных файлов с 13 добавлено и 5 удалено
  1. 6 0
      .changes/fix-xcodescript-lib-path.md
  2. 7 5
      tooling/cli/src/mobile/ios/xcode_script.rs

+ 6 - 0
.changes/fix-xcodescript-lib-path.md

@@ -0,0 +1,6 @@
+---
+"cli.rs": patch
+"cli.js": patch
+---
+
+Fixes iOS build script using the wrong path for the app library file.

+ 7 - 5
tooling/cli/src/mobile/ios/xcode_script.rs

@@ -4,7 +4,7 @@
 
 use super::{env, with_config};
 use crate::{
-  helpers::config::get as get_config,
+  helpers::{app_paths::tauri_dir, config::get as get_config},
   interface::{AppInterface, AppSettings, Interface, Options as InterfaceOptions},
   Result,
 };
@@ -200,17 +200,19 @@ pub fn command(options: Options) -> Result<()> {
       if !lib_path.exists() {
         return Err(anyhow::anyhow!("Library not found at {}. Make sure your Cargo.toml file has a [lib] block with `crate-type = [\"staticlib\", \"cdylib\", \"rlib\"]`", lib_path.display()));
       }
-      std::fs::create_dir_all(format!(
+
+      let tauri_path = tauri_dir();
+      std::fs::create_dir_all(tauri_path.join(format!(
         "gen/apple/Externals/{}",
         profile.as_str()
-      ))?;
+      )))?;
       std::fs::copy(
         lib_path,
-        format!(
+        tauri_path.join(format!(
           "gen/apple/Externals/{}/lib{}.a",
           profile.as_str(),
           config.app().lib_name()
-        ),
+        ))
       )?;
     }
     Ok(())