Use tools to generate bindings for library crates (#3102)

.github/workflows/clippy.yml

@@ -258,22 +258,18 @@ jobs:
         run:  cargo clippy -p test_window_long
       - name: Clippy test_winrt
         run:  cargo clippy -p test_winrt
+      - name: Clippy tool_bindings
+        run:  cargo clippy -p tool_bindings
       - name: Clippy tool_gnu
         run:  cargo clippy -p tool_gnu
       - name: Clippy tool_lib
         run:  cargo clippy -p tool_lib
       - name: Clippy tool_license
         run:  cargo clippy -p tool_license
-      - name: Clippy tool_metadata
-        run:  cargo clippy -p tool_metadata
       - name: Clippy tool_msvc
         run:  cargo clippy -p tool_msvc
       - name: Clippy tool_standalone
         run:  cargo clippy -p tool_standalone
-      - name: Clippy tool_sys
-        run:  cargo clippy -p tool_sys
-      - name: Clippy tool_windows
-        run:  cargo clippy -p tool_windows
       - name: Clippy tool_yml
         run:  cargo clippy -p tool_yml
       - name: Clippy windows

.github/workflows/gen.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        tool: [windows, sys, yml, license, metadata, standalone]
+        tool: [bindings, yml, license, standalone]
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/test.yml

@@ -286,22 +286,18 @@ jobs:
         run:  cargo test -p test_window_long --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test test_winrt
         run:  cargo test -p test_winrt --target ${{ matrix.target }} ${{ matrix.etc }}
+      - name: Test tool_bindings
+        run:  cargo test -p tool_bindings --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test tool_gnu
         run:  cargo test -p tool_gnu --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test tool_lib
         run:  cargo test -p tool_lib --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test tool_license
         run:  cargo test -p tool_license --target ${{ matrix.target }} ${{ matrix.etc }}
-      - name: Test tool_metadata
-        run:  cargo test -p tool_metadata --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test tool_msvc
         run:  cargo test -p tool_msvc --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test tool_standalone
         run:  cargo test -p tool_standalone --target ${{ matrix.target }} ${{ matrix.etc }}
-      - name: Test tool_sys
-        run:  cargo test -p tool_sys --target ${{ matrix.target }} ${{ matrix.etc }}
-      - name: Test tool_windows
-        run:  cargo test -p tool_windows --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test tool_yml
         run:  cargo test -p tool_yml --target ${{ matrix.target }} ${{ matrix.etc }}
       - name: Test windows

crates/libs/version/Cargo.toml

@@ -20,7 +20,3 @@ targets = []
 [dependencies.windows-targets]
 version = "0.52.5"
 path = "../targets"
-
-[dev-dependencies.windows-bindgen]
-version = "0.57.0"
-path = "../bindgen"

crates/libs/version/src/lib.rs

@@ -116,22 +116,4 @@ mod test {
         assert!(OsVersion::current() >= OsVersion::new(10, 100, 1_000, 10_000));
         assert!(!(OsVersion::current() >= OsVersion::new(10, 100, 1_000, 10_001)));
     }
-
-    #[test]
-    fn bindgen() {
-        let args = [
-            "--out",
-            "src/bindings.rs",
-            "--config",
-            "flatten",
-            "sys",
-            "no-bindgen-comment",
-            "--filter",
-            "Windows.Wdk.System.SystemServices.RtlGetVersion",
-            "Windows.Win32.System.SystemInformation.OSVERSIONINFOEXW",
-            "Windows.Win32.System.SystemServices.VER_NT_WORKSTATION",
-        ];
-
-        windows_bindgen::bindgen(args).unwrap();
-    }
 }

crates/tools/bindings/Cargo.toml

@@ -0,0 +1,8 @@
+[package]
+name = "tool_bindings"
+version = "0.0.0"
+edition = "2021"
+publish = false
+
+[dependencies]
+windows-bindgen = { path = "../../libs/bindgen" }

crates/libs/core/tests/bindings.txt → crates/tools/bindings/src/core.txt

@@ -1,6 +1,6 @@
 // These will use `windows-sys` style bindings.
 
---out src/imp/bindings.rs
+--out crates/libs/core/src/imp/bindings.rs
 --config flatten sys minimal no-bindgen-comment
 
 --filter

crates/libs/core/tests/com_bindings.txt → crates/tools/bindings/src/core_com.txt

@@ -1,6 +1,6 @@
 // These will use `windows` style bindings and include COM APIs.
 
---out src/imp/com_bindings.rs
+--out crates/libs/core/src/imp/com_bindings.rs
 --config flatten minimal no-bindgen-comment
 
 --filter

crates/tools/bindings/src/main.rs

@@ -0,0 +1,19 @@
+use windows_bindgen::*;
+
+fn main() -> Result<()> {
+    run("crates/tools/bindings/src/core_com.txt")?;
+    run("crates/tools/bindings/src/core.txt")?;
+    run("crates/tools/bindings/src/metadata.txt")?;
+    run("crates/tools/bindings/src/registry.txt")?;
+    run("crates/tools/bindings/src/result.txt")?;
+    run("crates/tools/bindings/src/sys.txt")?;
+    run("crates/tools/bindings/src/version.txt")?;
+    run("crates/tools/bindings/src/windows.txt")?;
+    Ok(())
+}
+
+fn run(path: &str) -> Result<()> {
+    println!("{path}");
+    bindgen(["--etc", path])?;
+    Ok(())
+}

crates/tools/metadata/bindings.txt → crates/tools/bindings/src/metadata.txt

@@ -1,4 +1,3 @@
---in crates/libs/bindgen/default
 --out crates/libs/metadata/src/bindings.rs
 --config flatten sys minimal no-bindgen-comment
 

crates/libs/registry/tests/bindings.txt → crates/tools/bindings/src/registry.txt

@@ -1,4 +1,4 @@
---out src/bindings.rs
+--out crates/libs/registry/src/bindings.rs
 --config flatten sys minimal no-bindgen-comment
 
 --filter

crates/libs/result/tests/bindings.txt → crates/tools/bindings/src/result.txt

@@ -1,4 +1,4 @@
---out src/bindings.rs
+--out crates/libs/result/src/bindings.rs
 --config flatten sys minimal vtbl no-bindgen-comment
 
 --filter

crates/tools/sys/bindings.txt → crates/tools/bindings/src/sys.txt

@@ -1,4 +1,3 @@
---in crates/libs/bindgen/default
 --out crates/libs/sys/src/lib.rs
 --config package sys no-bindgen-comment
 --config rustfmt-config=max_width=800,newline_style=Unix

crates/tools/bindings/src/version.txt

@@ -0,0 +1,7 @@
+--out crates/libs/version/src/bindings.rs
+--config flatten sys no-bindgen-comment
+
+--filter
+    Windows.Wdk.System.SystemServices.RtlGetVersion
+    Windows.Win32.System.SystemInformation.OSVERSIONINFOEXW
+    Windows.Win32.System.SystemServices.VER_NT_WORKSTATION

crates/tools/windows/bindings.txt → crates/tools/bindings/src/windows.txt

@@ -1,4 +1,3 @@
---in crates/libs/bindgen/default
 --out crates/libs/windows/src/lib.rs
 --config package no-bindgen-comment
 --config prepend:Windows.Win32.Foundation.WIN32_ERROR=#[must_use]