Get tests passing locally

Signed-off-by: Keith Mattix II <[email protected]>

Author: keithmattix

.gitignore

@@ -1 +1,2 @@
 /bazel-*
+.vscode

.vscode/settings.json

@@ -36,7 +36,7 @@ def proxy_wasm_cpp_host_dependencies():
         extra_target_triples = [
             "aarch64-unknown-linux-gnu",
             "wasm32-unknown-unknown",
-            "wasm32-wasi", # TODO: Change to wasm32-wasip1 once https://github.com/bazelbuild/rules_rust/issues/2782 is fixed
+            "wasm32-wasi",  # TODO: Change to wasm32-wasip1 once https://github.com/bazelbuild/rules_rust/issues/2782 is fixed
         ],
         version = "1.79.0",
     )

bazel/dependencies.bzl

@@ -1,15 +1,78 @@
 load("@rules_rust//rust:defs.bzl", "rust_static_library")
+load("@rules_cc//cc:defs.bzl", "cc_library")
 
 licenses(["notice"])  # Apache 2
 
 package(default_visibility = ["//visibility:public"])
 
+genrule(
+    name = "wasm-c-api-gen",
+    srcs = ["crates/c-api/include/wasm.h"],
+    outs = ["include/wasm.h"],
+    cmd = "cp $< $@",
+)
+
+cc_library(
+    name = "wasmtime_lib",
+    hdrs = [
+        "include/wasm.h",
+    ],
+    deps = [
+        ":rust_c_api",
+    ],
+)
+
+genrule(
+    name = "prefixed_wasmtime_c_api_headers",
+    srcs = [
+        "crates/c-api/include/wasm.h",
+    ],
+    outs = [
+        "include/prefixed_wasm.h",
+    ],
+    cmd = """
+        sed -e 's/\\ wasm_/\\ wasmtime_wasm_/g' \
+            -e 's/\\*wasm_/\\*wasmtime_wasm_/g' \
+            -e 's/(wasm_/(wasmtime_wasm_/g'     \
+        $(<) >$@
+        """,
+)
+
+genrule(
+    name = "prefixed_wasmtime_c_api_lib",
+    srcs = [
+        ":rust_c_api",
+    ],
+    outs = [
+        "prefixed_wasmtime_c_api.a",
+    ],
+    cmd = """
+        for symbol in $$(nm -P $(<) 2>/dev/null | grep -E ^_?wasm_ | cut -d" " -f1); do
+            echo $$symbol | sed -r 's/^(_?)(wasm_[a-z_]+)$$/\\1\\2 \\1wasmtime_\\2/' >>prefixed
+        done
+        # This should be OBJCOPY, but bazel-zig-cc doesn't define it.
+        objcopy --redefine-syms=prefixed $(<) $@
+        """,
+    toolchains = ["@bazel_tools//tools/cpp:current_cc_toolchain"],
+)
+
+cc_library(
+    name = "prefixed_wasmtime_lib",
+    srcs = [
+        ":prefixed_wasmtime_c_api_lib",
+    ],
+    hdrs = [
+        ":prefixed_wasmtime_c_api_headers",
+    ],
+    linkstatic = 1,
+)
+
 rust_static_library(
     name = "rust_c_api",
     srcs = glob(["crates/c-api/src/**/*.rs"]),
-    crate_features = [],
+    crate_features = ["cranelift"],
     crate_root = "crates/c-api/src/lib.rs",
-    edition = "2018",
+    edition = "2021",
     proc_macro_deps = [
         "@proxy_wasm_cpp_host//bazel/cargo/wasmtime/remote:wasmtime-c-api-macros",
     ],

bazel/external/wasm-c-api.BUILD

@@ -245,23 +245,14 @@ def proxy_wasm_cpp_host_repositories():
         url = "https://github.com/bytecodealliance/wasmtime/archive/v23.0.1.tar.gz",
     )
 
-    maybe(
-        http_archive,
-        name = "com_github_webassembly_wasm_c_api",
-        build_file = "@proxy_wasm_cpp_host//bazel/external:wasm-c-api.BUILD",
-        sha256 = "c774044f51431429e878bd1b9e2a4e38932f861f9211df72f75e9427eb6b8d32",
-        strip_prefix = "wasm-c-api-c9d31284651b975f05ac27cee0bab1377560b87e",
-        url = "https://github.com/WebAssembly/wasm-c-api/archive/c9d31284651b975f05ac27cee0bab1377560b87e.tar.gz",
-    )
-
     native.bind(
         name = "wasmtime",
-        actual = "@com_github_webassembly_wasm_c_api//:wasmtime_lib",
+        actual = "@com_github_bytecodealliance_wasmtime//:wasmtime_lib",
     )
 
     native.bind(
         name = "prefixed_wasmtime",
-        actual = "@com_github_webassembly_wasm_c_api//:prefixed_wasmtime_lib",
+        actual = "@com_github_bytecodealliance_wasmtime//:prefixed_wasmtime_lib",
     )
 
     # WAVM with dependencies.