Skip to content

Commit

Permalink
chore(*) rename module to 'ngx_wasmx_module' (but in docs & paths)
Browse files Browse the repository at this point in the history
  • Loading branch information
thibaultcha committed Mar 6, 2024
1 parent bd9357a commit d5e4c69
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-large.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
hup: [hup, no_hup]
module_type: [static, dynamic]
include:
# OpenResty + static ngx_wasm_module
# OpenResty + static ngx_wasmx_module
- label: dynamic_module
os: ubuntu-latest
cc: gcc-12
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
ssl: ssl
debug: debug
hup: no_hup
# Nginx + dynamic ngx_wasm_module + HUP
# Nginx + dynamic ngx_wasmx_module + HUP
- label: dynamic_nginx
os: ubuntu-latest
cc: gcc-12
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
ssl: ssl
debug: debug
hup: no_hup
# OpenResty + dynamic ngx_wasm_module
# OpenResty + dynamic ngx_wasmx_module
- label: dynamic_openresty
os: ubuntu-latest
cc: gcc-12
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ NGX_BUILD_WASMER_RUSTFLAGS ?= -g -C opt-level=0 -C debuginfo=1
NGX_BUILD_WASMTIME_RUSTFLAGS ?= -g -C opt-level=0 -C debuginfo=1
NGX_BUILD_WASMTIME_PROFILE ?= debug

# Private - ngx_wasm_module development
# Private - ngx_wasmx_module development
export NGX_BUILD_DIR_SCR ?=
export NGX_BUILD_DIR_PATCHED ?=
export NGX_BUILD_DIR_BUILDROOT ?=
Expand Down
2 changes: 1 addition & 1 deletion config
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ fi
###############################################################################

if [ "$ngx_module_link" = DYNAMIC ]; then
# ngx_wasm_module.so (dynamic module)
# ngx_wasmx_module.so (dynamic module)
. auto/module

# add other modules into this bundled one
Expand Down
2 changes: 1 addition & 1 deletion docs/INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ Download any of the source code releases at
https://github.com/Kong/ngx_wasm_module/releases and extract the archive:

```
tar -xvf ngx_wasm_module-*.tar.gz
tar -xvf ngx_wasmx_module-*.tar.gz
```

[Back to TOC](#table-of-contents)
Expand Down
2 changes: 1 addition & 1 deletion src/common/debug/ngx_wasm_debug_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ ngx_wasm_debug_init(ngx_cycle_t *cycle)

/**
* ngx_wasm_phase_lookup NULL return branch is unreacheable in
* normal ngx_wasm_module usage.
* normal ngx_wasmx_module usage.
*/
ngx_wa_assert(
ngx_wasm_phase_lookup(&ngx_wasm_debug_subsystem, 3) == NULL
Expand Down
2 changes: 1 addition & 1 deletion src/common/lua/ngx_wasm_lua_resolver.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* DNS resolution for Proxy-Wasm filters running in Kong Gateway.
*
* ngx_wasm_module handles DNS resolution via Nginx's configured `resolver`
* ngx_wasmx_module handles DNS resolution via Nginx's configured `resolver`
* (http{}, wasm{}, or default from ngx_wasm.h). However, Kong Gateway's DNS
* resolution is handled by the Gateway's Lua-land resolver: resty.dns.client.
*
Expand Down
2 changes: 1 addition & 1 deletion src/wasm/wrt/ngx_wrt_wasmer.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <ngx_wasi.h>


#define NGX_WRT_WASMER_CONFIG_NAME "ngx_wasm_module"
#define NGX_WRT_WASMER_CONFIG_NAME "ngx_wasmx_module"


typedef void (*wasmer_feature_set_pt)(struct wasmer_features_t * features,
Expand Down
2 changes: 1 addition & 1 deletion util/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ source $NGX_WASM_DIR/util/_lib.sh

show_help() {
cat << EOF
Build Nginx or OpenResty with ngx_wasm_module.
Build Nginx or OpenResty with ngx_wasmx_module.
Lots of build options are supported through environment variables; consult
_lib.sh or DEVELOPER.md.
Expand Down
4 changes: 2 additions & 2 deletions util/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ if [ -z "$name" ]; then
fi
fi

DIST_SRC="ngx_wasm_module-$name"
DIST_SRC="$(get_addon_name)-$name"
DIR_BUILD_DOCKERFILES=$NGX_WASM_DIR/assets/release/Dockerfiles
DIR_BUILD=$DIR_DIST_WORK/build
DIR_DIST_SRC=$DIR_DIST_WORK/$DIST_SRC
Expand Down Expand Up @@ -333,7 +333,7 @@ build_with_runtime() {
LD_FLAGS="$save_LD_FLAGS"
}

# ngx_wasm_module-$name.tar.gz (sources)
# ngx_wasmx_module-$name.tar.gz (sources)

release_source() {
notice "Creating source archive..."
Expand Down

0 comments on commit d5e4c69

Please sign in to comment.