Skip to content

Commit

Permalink
Update windows-core to generate its own bindings (#2941)
Browse files Browse the repository at this point in the history
  • Loading branch information
kennykerr authored Mar 19, 2024
1 parent 27d87b7 commit 4e14f1a
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 21 deletions.
1 change: 0 additions & 1 deletion .github/workflows/clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ jobs:
cargo clippy -p test_win32_arrays &&
cargo clippy -p test_window_long &&
cargo clippy -p test_winrt &&
cargo clippy -p tool_core &&
cargo clippy -p tool_gnu &&
cargo clippy -p tool_lib &&
cargo clippy -p tool_license &&
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
tool: [windows, sys, yml, license, core, metadata]
tool: [windows, sys, yml, license, metadata]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ jobs:
cargo test -p test_dispatch &&
cargo test -p test_does_not_return &&
cargo test -p test_enums &&
cargo test -p test_error &&
cargo clean &&
cargo test -p test_error &&
cargo test -p test_event &&
cargo test -p test_extensions &&
cargo test -p test_handles &&
Expand Down Expand Up @@ -149,7 +149,6 @@ jobs:
cargo test -p test_win32_arrays &&
cargo test -p test_window_long &&
cargo test -p test_winrt &&
cargo test -p tool_core &&
cargo test -p tool_gnu &&
cargo test -p tool_lib &&
cargo test -p tool_license &&
Expand Down
4 changes: 4 additions & 0 deletions crates/libs/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@ path = "../result"
[dependencies]
windows-implement = { path = "../implement", version = "0.53" }
windows-interface = { path = "../interface", version = "0.53" }

[dev-dependencies.windows-bindgen]
version = "0.55"
path = "../bindgen"
8 changes: 8 additions & 0 deletions crates/libs/core/tests/bindings.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
use windows_bindgen::*;

#[test]
fn bindings() -> Result<()> {
bindgen(["--etc", "tests/bindings.txt"])?;
bindgen(["--etc", "tests/com_bindings.txt"])?;
Ok(())
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// These will use `windows-sys` style bindings.

--out crates/libs/core/src/imp/bindings.rs
--out src/imp/bindings.rs
--config flatten sys minimal no-bindgen-comment

--filter
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// These will use `windows` style bindings and include COM APIs.

--out crates/libs/core/src/imp/com_bindings.rs
--out src/imp/com_bindings.rs
--config flatten minimal no-bindgen-comment

--filter
Expand Down
8 changes: 0 additions & 8 deletions crates/tools/core/Cargo.toml

This file was deleted.

7 changes: 0 additions & 7 deletions crates/tools/core/src/main.rs

This file was deleted.

0 comments on commit 4e14f1a

Please sign in to comment.