From 6703b7cbca3ade84e534c121c63fb22c5f7abbfd Mon Sep 17 00:00:00 2001 From: scottpledger Date: Mon, 1 Apr 2024 08:43:52 -0600 Subject: [PATCH] fix: use $CARGO_MANIFEST_DIR to fully specify include_dir paths in tauri-cli (#9310) * Allow tauri-cli to work with Bazel. Signed-off-by: Scott Pledger * change file --------- Signed-off-by: Scott Pledger --- .changes/cli-include-dir-cargo-manifest-dir.md | 5 +++++ tooling/cli/src/init.rs | 2 +- tooling/cli/src/mobile/android/project.rs | 2 +- tooling/cli/src/mobile/ios/project.rs | 2 +- tooling/cli/src/plugin/init.rs | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 .changes/cli-include-dir-cargo-manifest-dir.md diff --git a/.changes/cli-include-dir-cargo-manifest-dir.md b/.changes/cli-include-dir-cargo-manifest-dir.md new file mode 100644 index 000000000..7b3679496 --- /dev/null +++ b/.changes/cli-include-dir-cargo-manifest-dir.md @@ -0,0 +1,5 @@ +--- +"tauri-cli": patch:enhance +--- + +Use `$CARGO_MANIFEST_DIR` when including templates at build-time. \ No newline at end of file diff --git a/tooling/cli/src/init.rs b/tooling/cli/src/init.rs index e8cb7907a..fc382c091 100644 --- a/tooling/cli/src/init.rs +++ b/tooling/cli/src/init.rs @@ -22,7 +22,7 @@ use clap::Parser; use handlebars::{to_json, Handlebars}; use include_dir::{include_dir, Dir}; -const TEMPLATE_DIR: Dir<'_> = include_dir!("templates/app"); +const TEMPLATE_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/templates/app"); const TAURI_CONF_TEMPLATE: &str = include_str!("../templates/tauri.conf.json"); #[derive(Debug, Parser)] diff --git a/tooling/cli/src/mobile/android/project.rs b/tooling/cli/src/mobile/android/project.rs index 71ebedb21..e14cad76e 100644 --- a/tooling/cli/src/mobile/android/project.rs +++ b/tooling/cli/src/mobile/android/project.rs @@ -27,7 +27,7 @@ use std::{ path::{Path, PathBuf}, }; -const TEMPLATE_DIR: Dir<'_> = include_dir!("templates/mobile/android"); +const TEMPLATE_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/templates/mobile/android"); pub fn gen( config: &Config, diff --git a/tooling/cli/src/mobile/ios/project.rs b/tooling/cli/src/mobile/ios/project.rs index e0e4d3eb0..3efafe33e 100644 --- a/tooling/cli/src/mobile/ios/project.rs +++ b/tooling/cli/src/mobile/ios/project.rs @@ -22,7 +22,7 @@ use std::{ path::{Component, PathBuf}, }; -const TEMPLATE_DIR: Dir<'_> = include_dir!("templates/mobile/ios"); +const TEMPLATE_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/templates/mobile/ios"); // unprefixed app_root seems pretty dangerous!! // TODO: figure out what cargo-mobile meant by that diff --git a/tooling/cli/src/plugin/init.rs b/tooling/cli/src/plugin/init.rs index 9b474b4b6..013cdd47a 100644 --- a/tooling/cli/src/plugin/init.rs +++ b/tooling/cli/src/plugin/init.rs @@ -20,7 +20,7 @@ use std::{ path::{Component, Path, PathBuf}, }; -pub const TEMPLATE_DIR: Dir<'_> = include_dir!("templates/plugin"); +pub const TEMPLATE_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/templates/plugin"); #[derive(Debug, Parser)] #[clap(about = "Initialize a Tauri plugin project on an existing directory")]