Skip to content

Commit

Permalink
fix(tauri-build): use ::tauri as root for the CodegenContext (#4894)
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasfernog committed Aug 8, 2022
1 parent f957cbb commit ed58195
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .changes/fix-build-codegen.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri-build": patch
---

Fix root of codegen output when using the `CodegenContext` API.
6 changes: 3 additions & 3 deletions core/tauri-build/src/codegen/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions examples/api/src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion examples/api/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions examples/api/src-tauri/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
2 changes: 1 addition & 1 deletion examples/api/src-tauri/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
Expand Down

0 comments on commit ed58195

Please sign in to comment.