mirror of
https://github.com/tauri-apps/tauri.git
synced 2025-01-01 23:42:33 +03:00
fix(tauri-build): use ::tauri
as root for the CodegenContext (#4894)
This commit is contained in:
parent
f957cbb56c
commit
ed581950ea
5
.changes/fix-build-codegen.md
Normal file
5
.changes/fix-build-codegen.md
Normal file
@ -0,0 +1,5 @@
|
||||
---
|
||||
"tauri-build": patch
|
||||
---
|
||||
|
||||
Fix root of codegen output when using the `CodegenContext` API.
|
@ -52,13 +52,13 @@ impl CodegenContext {
|
||||
///
|
||||
/// **Note:** This path should be relative to the `OUT_DIR`.
|
||||
///
|
||||
/// Don't set this if you are using [`tauri::include_codegen_context!`] as that helper macro
|
||||
/// Don't set this if you are using [`tauri::tauri_build_context!`] as that helper macro
|
||||
/// expects the default value. This option can be useful if you are not using the helper and
|
||||
/// instead using [`std::include!`] on the generated code yourself.
|
||||
///
|
||||
/// Defaults to `tauri-build-context.rs`.
|
||||
///
|
||||
/// [`tauri::include_codegen_context!`]: https://docs.rs/tauri/0.12/tauri/macro.include_codegen_context.html
|
||||
/// [`tauri::tauri_build_context!`]: https://docs.rs/tauri/latest/tauri/macro.tauri_build_context.html
|
||||
#[must_use]
|
||||
pub fn out_file(mut self, filename: PathBuf) -> Self {
|
||||
self.out_file = filename;
|
||||
@ -98,7 +98,7 @@ impl CodegenContext {
|
||||
config_parent,
|
||||
// it's very hard to have a build script for unit tests, so assume this is always called from
|
||||
// outside the tauri crate, making the ::tauri root valid.
|
||||
root: quote::quote!(::tauri::Context),
|
||||
root: quote::quote!(::tauri),
|
||||
})?;
|
||||
|
||||
// get the full output file path
|
||||
|
1
examples/api/src-tauri/Cargo.lock
generated
1
examples/api/src-tauri/Cargo.lock
generated
@ -3165,6 +3165,7 @@ dependencies = [
|
||||
"cargo_toml",
|
||||
"heck 0.4.0",
|
||||
"json-patch",
|
||||
"quote",
|
||||
"semver 1.0.12",
|
||||
"serde_json",
|
||||
"tauri-codegen",
|
||||
|
@ -7,7 +7,7 @@ rust-version = "1.57"
|
||||
license = "Apache-2.0 OR MIT"
|
||||
|
||||
[build-dependencies]
|
||||
tauri-build = { path = "../../../core/tauri-build", features = ["isolation"] }
|
||||
tauri-build = { path = "../../../core/tauri-build", features = ["isolation", "codegen"] }
|
||||
|
||||
[dependencies]
|
||||
serde_json = "1.0"
|
||||
|
@ -3,5 +3,10 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
fn main() {
|
||||
let mut codegen = tauri_build::CodegenContext::new();
|
||||
if !cfg!(feature = "custom-protocol") {
|
||||
codegen = codegen.dev();
|
||||
}
|
||||
codegen.build();
|
||||
tauri_build::build()
|
||||
}
|
||||
|
@ -199,7 +199,7 @@ fn main() {
|
||||
cmd::log_operation,
|
||||
cmd::perform_request,
|
||||
])
|
||||
.build(tauri::generate_context!())
|
||||
.build(tauri::tauri_build_context!())
|
||||
.expect("error while building tauri application");
|
||||
|
||||
#[cfg(target_os = "macos")]
|
||||
|
Loading…
Reference in New Issue
Block a user