do a few cbindgen things

Author: rtldg

Cargo.lock

@@ -63,19 +63,19 @@ You'll probably need to copy/look-at some code from the extensions in *this* rep
 
 
 ### Why doesn't this use C++ helper crates?
-I just didn't... I could say it's simpler or easier to keep the C++ separate, which might be true. There's obvious value in using bindgen/cbindgen so you don't mess up FFI function declarations. The inline C++ with the `cpp` crate looks very useful. The original srcwrtimer extensions mainly keep the SourceMod interfacing on the C++ side which calls to Rust functions to natives, so there's not a lot of fancy `Rust <-> C++` FFI going on.
+It's a bit simpler to just make headers with extern functions in both Rust & C++, but things will be investigated more eventually. Using cbindgen and bindgen is planned too.
 
-Helper crates (which aren't used):
-- [cpp](https://crates.io/crates/cpp)
+Helper crates:
+- [cpp](https://crates.io/crates/cpp) (Unused)
   - Allows you to embed C++ code in a Rust file.
-- [cxx](https://crates.io/crates/cxx)
+- [cxx](https://crates.io/crates/cxx) (Unused)
   - A `Rust <-> C++` binding/bridging crate.
-- [autocxx](https://crates.io/crates/autocxx)
+- [autocxx](https://crates.io/crates/autocxx) (Unused)
   - A more magical cxx.
-- [bindgen](https://crates.io/crates/bindgen)
+- [bindgen](https://crates.io/crates/bindgen) (TODO)
   - Generate Rust bindings to C/C++ libraries...
-- [cbindgen](https://crates.io/crates/cbindgen)
-  - Generate C/C++ bindings to Rust libraries... TODO
+- [cbindgen](https://crates.io/crates/cbindgen) (WIP usage)
+  - Generate C/C++ bindings to Rust libraries...
 
 ### Why does this use C++ at all?
 Interfacing with SourceMod through Rust can be tedious. You *can* do it in pure Rust thanks to the [sm-ext-rs](https://github.com/srcwr/sm-ext-rs) (srcwr fork) crate that [asherkin](https://github.com/asherkin) made, but lacking hl2sdk support makes it impractical for many things.

README.md

@@ -7,9 +7,10 @@ use std::io::Seek;
 use std::io::SeekFrom;
 use std::io::Write;
 
+/// cbindgen:no-export
 #[repr(transparent)]
 pub struct IFileObject {
-	pub vtable: usize,
+	pub vtable: usize
 }
 
 unsafe extern "C" {

extshared/src/IFileObject.rs

@@ -9,7 +9,7 @@ homepage.workspace = true
 repository.workspace = true
 
 [dependencies]
-#cbindgen = { version = "0.28", default-features = false } # we don't want a dep on clap so 'default-features = false'
+cbindgen = { version = "0.28", default-features = false } # we don't want a dep on clap so 'default-features = false'
 cc = { version = "1.0", features = ["parallel"] }
 regex = "1"
 vergen-gitcl = { version = "1.0", features = ["build"] }

extshared_build_helper/Cargo.toml

@@ -19,3 +19,7 @@ parse_deps = true
 # Otherwise the serde_json::Value & extshared::{IFileObject, ICellArray} can't be reached...
 # Probably slows down bindgen...
 include = ["extshared", "serde_json"]
+
+[export]
+# Some things that are done from extshared/src/rust_exports.h but want to be pulled in anyway...
+exclude = ["rust_sdk_on_unload", "rust_sdk_on_all_loaded", "rust_on_core_map_start", "rust_on_core_map_end"]

extshared_build_helper/cbindgen.toml

@@ -382,7 +382,10 @@ pub fn smext_build() -> cc::Build {
 	// slurps the extension's src dir (not the src dir build_template.rs is in)
 	slurp_folder(&mut build, "src");
 
-	/*
+	build
+}
+
+pub fn do_cbindgen() {
 	println!("cargo:rerun-if-changed=../extshared_build_helper/cbindgen.toml");
 	cbindgen::generate_with_config(
 		".",
@@ -394,7 +397,4 @@ pub fn smext_build() -> cc::Build {
 		"src/rust_exports_{}.h",
 		std::env::var("CARGO_PKG_NAME").unwrap()
 	));
-	*/
-
-	build
 }

extshared_build_helper/src/lib.rs

@@ -8,6 +8,8 @@ fn main() {
 	let outdir = std::env::var("OUT_DIR").unwrap();
 	generate_inc_defines_and_enums(&outdir, "../srcwrtimer/addons/sourcemod/scripting/include/bzip2.inc", "BZIP2");
 
+	do_cbindgen();
+
 	let build = smext_build();
 	compile_lib(build, "smext");
 }

smbz2/build.rs

@@ -5,7 +5,7 @@
 
 #include "../../extshared/src/extension.h"
 #include "../../extshared/src/coreident.hpp"
-#include "rust_exports_bzip2.h"
+#include "rust_exports_smbz2.h"
 
 
 extern const sp_nativeinfo_t BZ2Natives[];

smbz2/src/natives_bzip2.cpp

@@ -0,0 +1,12 @@
+#pragma once
+
+/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */
+
+#include <stdint.h>
+#include <stddef.h>
+
+extern "C" {
+
+uint32_t rust_BZ2_XompressFile(const char *infile, const char *outfile, const char *infilefull, const char *outfilefull, int32_t compressionLevel, void *forward, int32_t data);
+
+}  // extern "C"