Skip to content

Commit

Permalink
fix(build): use wasmx flag instead of duplicating code
Browse files Browse the repository at this point in the history
  • Loading branch information
locao authored and gszr committed Jul 10, 2023
1 parent a6ce3ad commit a0b771b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
8 changes: 8 additions & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,14 @@ string_flag(
],
)

config_setting(
name = "wasmx_flag",
flag_values = {
":wasmx": "true",
},
visibility = ["//visibility:public"],
)

config_setting(
name = "wasmx_static_mod_flag",
flag_values = {
Expand Down
17 changes: 6 additions & 11 deletions build/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -50,27 +50,21 @@ wasmx_vm_deps = select({
})

wasmx_deps = select({
"@kong//:wasmx_static_mod_flag": [
"@ngx_wasm_module//:lua_libs",
],
"@kong//:wasmx_dynamic_mod_flag": [
"@kong//:wasmx_flag": [
"@ngx_wasm_module//:lua_libs",
],
"//conditions:default": [],
}) + wasmx_vm_deps

wasm_libs_install = """
wasm_libs_install = select({
"@kong//:wasmx_flag": """
for fname in $(locations @ngx_wasm_module//:lua_libs); do
base=${fname##*/ngx_wasm_module/lib/}
dest="${BUILD_DESTDIR}/openresty/lualib/$base"
mkdir -p "$(dirname "$dest")"
cp -v "$fname" "$dest"
done
"""

wasm_libs_cmd = select({
"@kong//:wasmx_static_mod_flag": wasm_libs_install,
"@kong//:wasmx_dynamic_mod_flag": wasm_libs_install,
""",
"//conditions:default": "\n",
})

Expand Down Expand Up @@ -150,9 +144,10 @@ kong_directory_genrule(
ATC_ROUTER=${WORKSPACE_PATH}/$(location @atc_router)
cp $ATC_ROUTER ${BUILD_DESTDIR}/openresty/lualib/.
cp -r $(locations @protoc//:all_srcs) ${BUILD_DESTDIR}/kong/.
""" + install_lib_deps_cmd + install_lualib_deps_cmd + wasm_libs_cmd + wasmx_vm_cmd +
""" + install_lib_deps_cmd + install_lualib_deps_cmd + wasm_libs_install + wasmx_vm_cmd +
"""
mkdir -p ${BUILD_DESTDIR}/etc/kong
cp kong.conf.default ${BUILD_DESTDIR}/etc/kong/kong.conf.default
Expand Down

0 comments on commit a0b771b

Please sign in to comment.