feat: allow si module implementation linking to be configurable (#82)

Author: zaucy

BUILD.bazel

@@ -22,45 +22,65 @@ filegroup(
 
 cc_library(
     name = "ecsact_si_wasm",
-    copts = copts,
-    defines = [
-        "ECSACTSI_WASM_API=",
-        "ECSACT_DYNAMIC_API=",
-    ],
     hdrs = [":headers"],
-    srcs = [":sources"],
+    copts = copts,
     deps = [
-        "@wasmer",
         "@ecsact_runtime//:common",
         "@ecsact_runtime//:dynamic",
+        "@wasmer",
     ],
 )
 
+"""
+It is expected that users of this target are to set ECSACTSI_WASM_API* and ECSACT_DYNAMIC_API* macros for their configuration
+Example 1:
+```
 cc_library(
-    name = "ecsact_si_wasm_dynamic_lat",
-    copts = copts,
+    name = "my_si_wasm_impl",
+    deps = ["@ecsact_si_wasm//:implementation"],
     defines = [
+        # Statically link the si_wasm api
         "ECSACTSI_WASM_API=",
+        # Load the dynamic module at runtime
         "ECSACT_DYNAMIC_API_LOAD_AT_RUNTIME",
     ],
-    hdrs = [":headers"],
+)
+```
+
+```
+Example 2:
+cc_library(
+    name = "my_si_wasm_impl",
+    deps = ["@ecsact_si_wasm//:implementation"],
+    defines = [
+        # Statically link the si_wasm api
+        "ECSACTSI_WASM_API=",
+        # Statically link dynamic module
+        "ECSACT_DYNAMIC_API=",
+    ],
+)
+```
+"""
+
+cc_library(
+    name = "implementation",
     srcs = [":sources"],
+    hdrs = [":headers"],
+    copts = copts,
     deps = [
-        "@wasmer",
-        "@ecsact_runtime//:common",
-        "@ecsact_runtime//:dynamic",
+        ":ecsact_si_wasm",
     ],
 )
 
 cc_library(
     name = "minst",
-    copts = copts,
-    hdrs = [
-        "ecsact/wasm/detail/minst/minst.hh",
-    ],
     srcs = [
         "ecsact/wasm/detail/minst/minst.cc",
     ],
+    hdrs = [
+        "ecsact/wasm/detail/minst/minst.hh",
+    ],
+    copts = copts,
     deps = [
         ":cpp_util",
         "@ecsact_runtime//:common",
@@ -70,6 +90,6 @@ cc_library(
 
 cc_library(
     name = "cpp_util",
-    copts = copts,
     hdrs = ["ecsact/wasm/detail/cpp_util.hh"],
+    copts = copts,
 )

test/BUILD.bazel

@@ -9,27 +9,47 @@ package(default_visibility = [":__subpackages__"])
 
 exports_files(["test.cc"])
 
+cc_library(
+    name = "impl",
+    srcs = [
+        "@ecsact_si_wasm//:sources",
+    ],
+    copts = copts,
+    defines = [
+        # Statically link the si_wasm api
+        "ECSACTSI_WASM_API=",
+        # Statically link dynamic module
+        "ECSACT_DYNAMIC_API=",
+    ],
+    deps = [
+        "@ecsact_si_wasm",
+    ],
+)
+
 cc_test(
     name = "minst_test",
     srcs = ["minst_test.cc"],
     args = ["ecsact_si_wasm_test/minst_test.wasm"],
     copts = copts,
-    linkopts = linkopts,
-    deps = ["@ecsact_si_wasm//:minst", "@bazel_tools//tools/cpp/runfiles"],
     data = [":minst_test_wasm"],
+    linkopts = linkopts,
+    deps = [
+        "@bazel_tools//tools/cpp/runfiles",
+        "@ecsact_si_wasm//:minst",
+    ],
 )
 
 cc_binary(
     name = "minst_test_wasm_cc",
     srcs = ["minst_test_wasm.cc"],
+    features = [
+        "-exceptions",
+    ],
     # copts = copts,
     linkopts = [
         "-sERROR_ON_UNDEFINED_SYMBOLS=0",
         "--no-entry",
     ],
-    features = [
-        "-exceptions",
-    ],
     linkshared = True,
     tags = ["manual"],
     deps = [
@@ -67,16 +87,16 @@ ecsact_entt_runtime(
     name = "{}__system_impl".format(wasi_test),
     srcs = ["wasi_test_{}.cc".format(wasi_test)],
     copts = copts,
-    linkopts = [
-        "-sERROR_ON_UNDEFINED_SYMBOLS=0",
-        "--no-entry",
-    ],
     features = [
         "wasm_no_entry",
         "-wasm_warnings_as_errors",
         "-wasm_error_on_undefined_symbols",
         "-exceptions",
     ],
+    linkopts = [
+        "-sERROR_ON_UNDEFINED_SYMBOLS=0",
+        "--no-entry",
+    ],
     linkshared = True,
     tags = ["manual"],
     deps = [
@@ -103,20 +123,20 @@ ecsact_entt_runtime(
         "wasi_test.cc",
     ],
     copts = copts,
-    linkopts = linkopts,
     data = [
         ":{}__system_impl.wasm".format(wasi_test),
         "wasi_test_file.txt",
     ],
     defines = ["ECSACTSI_WASM_API="],
+    linkopts = linkopts,
     deps = [
+        ":impl",
         ":wasi_test_runtime",
         "@ecsact_runtime//:core",
         "@ecsact_runtime//:dynamic",
         "@ecsact_runtime//:meta",
         "@magic_enum",
         "@wasmer",
-        "@ecsact_si_wasm",
     ],
 ) for wasi_test in _WASI_TESTS]
 
@@ -128,12 +148,12 @@ ecsact_entt_runtime(
         "$(location :{}__system_impl.wasm)".format(wasi_test),
     ],
     copts = copts,
-    linkopts = linkopts,
     data = [
         ":{}__system_impl.wasm".format(wasi_test),
         ":{}__wasi".format(wasi_test),
         "wasi_test_file.txt",
     ],
+    linkopts = linkopts,
 ) for wasi_test in _WASI_TESTS]
 
 refresh_compile_commands(

test/example/BUILD.bazel

@@ -20,13 +20,13 @@ cc_binary(
         "system_impls.cc",
     ],
     copts = copts,
+    features = [
+        "-exceptions",
+    ],
     linkopts = [
         "-sERROR_ON_UNDEFINED_SYMBOLS=0",
         "--no-entry",
     ],
-    features = [
-        "-exceptions",
-    ],
     linkshared = True,
     tags = ["manual"],
     deps = [
@@ -64,27 +64,28 @@ cc_test(
     name = "wasmer_example",
     srcs = [
         "example.cc",
+        "@ecsact_si_wasm//:sources",
     ],
     args = [
         "$(location :system_impls.wasm)",
     ],
     copts = copts,
-    linkopts = linkopts,
+    data = [
+        ":system_impls.wasm",
+    ],
     defines = [
         "ECSACTSI_WASM_API=",
         "ECSACT_CORE_API=",
     ],
+    linkopts = linkopts,
     deps = [
         ":runtime",
-        "@ecsact_si_wasm//:minst",
         "@ecsact_runtime//:core",
         "@ecsact_runtime//:dynamic",
         "@ecsact_runtime//:meta",
+        "@ecsact_si_wasm",
+        "@ecsact_si_wasm//:minst",
         "@magic_enum",
         "@wasmer",
-        "@ecsact_si_wasm",
-    ],
-    data = [
-        ":system_impls.wasm",
     ],
 )