Skip to content

Commit 3d66a2e

Browse files
HywanHywan
committed
feat: Rename wasmer-engine-native to wasmer-engine-dylib.
1 parent e11fc26 commit 3d66a2e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+486
-519
lines changed

‎Cargo.lock

+11-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+11-11
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ wasmer-compiler-llvm = { version = "1.0.2", path = "lib/compiler-llvm", optional
1818
wasmer-emscripten = { version = "1.0.2", path = "lib/emscripten", optional = true }
1919
wasmer-engine = { version = "1.0.2", path = "lib/engine" }
2020
wasmer-engine-universal = { version = "1.0.2", path = "lib/engine-universal", optional = true }
21-
wasmer-engine-shared-object = { version = "1.0.2", path = "lib/engine-shared-object", optional = true }
21+
wasmer-engine-dylib = { version = "1.0.2", path = "lib/engine-dylib", optional = true }
2222
wasmer-engine-object-file = { version = "1.0.2", path = "lib/engine-object-file", optional = true }
2323
wasmer-wasi = { version = "1.0.2", path = "lib/wasi", optional = true }
2424
wasmer-wast = { version = "1.0.2", path = "tests/lib/wast", optional = true }
@@ -41,7 +41,7 @@ members = [
4141
"lib/emscripten",
4242
"lib/engine",
4343
"lib/engine-universal",
44-
"lib/engine-shared-object",
44+
"lib/engine-dylib",
4545
"lib/engine-object-file",
4646
"lib/object",
4747
"lib/vm",
@@ -82,7 +82,7 @@ default = [
8282
"wat",
8383
"wast",
8484
"universal",
85-
"shared-object",
85+
"dylib",
8686
"object-file",
8787
"cache",
8888
"wasi",
@@ -94,8 +94,8 @@ universal = [
9494
"wasmer-engine-universal",
9595
"engine",
9696
]
97-
shared-object = [
98-
"wasmer-engine-shared-object",
97+
dylib = [
98+
"wasmer-engine-dylib",
9999
"engine",
100100
]
101101
object-file = [
@@ -111,7 +111,7 @@ compiler = [
111111
"wasmer/compiler",
112112
"wasmer-compiler/translator",
113113
"wasmer-engine-universal/compiler",
114-
"wasmer-engine-shared-object/compiler",
114+
"wasmer-engine-dylib/compiler",
115115
"wasmer-engine-object-file/compiler",
116116
]
117117
singlepass = [
@@ -139,9 +139,9 @@ test-llvm = [
139139
"llvm",
140140
]
141141

142-
test-shared-object = [
143-
"shared-object",
144-
"test-generator/test-shared-object",
142+
test-dylib = [
143+
"dylib",
144+
"test-generator/test-dylib",
145145
]
146146
test-universal = [
147147
"universal",
@@ -170,8 +170,8 @@ path = "examples/engine_universal.rs"
170170
required-features = ["cranelift"]
171171

172172
[[example]]
173-
name = "engine-shared-object"
174-
path = "examples/engine_shared_object.rs"
173+
name = "engine-dylib"
174+
path = "examples/engine_dylib.rs"
175175
required-features = ["cranelift"]
176176

177177
[[example]]

‎Makefile

+40-41
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,32 @@ SHELL=/bin/bash
99

1010
# The matrix is the product of the following columns:
1111
#
12-
# |------------|---------------|----------|--------------|-------|
13-
# | Compiler ⨯ Engine ⨯ Platform ⨯ Architecture ⨯ libc |
14-
# |------------|---------------|----------|--------------|-------|
15-
# | Cranelift | Universal | Linux | amd64 | glibc |
16-
# | LLVM | Shared Object | Darwin | aarch64 | musl |
17-
# | Singlepass | | Windows | | |
18-
# |------------|---------------|----------|--------------|-------|
12+
# |------------|-----------|----------|--------------|-------|
13+
# | Compiler ⨯ Engine ⨯ Platform ⨯ Architecture ⨯ libc |
14+
# |------------|-----------|----------|--------------|-------|
15+
# | Cranelift | Universal | Linux | amd64 | glibc |
16+
# | LLVM | Dylib | Darwin | aarch64 | musl |
17+
# | Singlepass | | Windows | | |
18+
# |------------|-----------|----------|--------------|-------|
1919
#
2020
# Here is what works and what doesn't:
2121
#
2222
# * Cranelift with the Universal engine works everywhere,
2323
#
24-
# * Cranelift with the Shared Object engine works on
25-
# Linux+Darwin/`amd64`, but it doesn't work on */`aarch64` or
26-
# Windows/*.
24+
# * Cranelift with the Dylib engine works on Linux+Darwin/`amd64`, but
25+
# it doesn't work on */`aarch64` or Windows/*.
2726
#
2827
# * LLVM with the Universal engine works on Linux+Darwin/`amd64`,
2928
# but it doesn't work on */`aarch64` or Windows/*.
3029
#
31-
# * LLVM with the Shared Object engine works on
30+
# * LLVM with the Dylib engine works on
3231
# Linux+Darwin/`amd64`+`aarch64`, but it doesn't work on Windows/*.
3332
#
3433
# * Singlepass with the Universal engine works on Linux+Darwin/`amd64`, but
3534
# it doesn't work on */`aarch64` or Windows/*.
3635
#
37-
# * Singlepass with the Shared Object engine doesn't work because it
38-
# doesn't know how to output object files for the moment.
36+
# * Singlepass with the Dylib engine doesn't work because it doesn't
37+
# know how to output object files for the moment.
3938
#
4039
# * Windows isn't tested on `aarch64`, that's why we consider it's not
4140
# working, but it might possibly be.
@@ -211,12 +210,12 @@ ifeq ($(ENABLE_CRANELIFT), 1)
211210
ifneq (, $(filter 1, $(IS_DARWIN) $(IS_LINUX)))
212211
ifeq ($(IS_AMD64), 1)
213212
ifneq ($(LIBC), musl)
214-
compilers_engines += cranelift-shared-object
213+
compilers_engines += cranelift-dylib
215214
endif
216215
else ifeq ($(IS_AARCH64), 1)
217216
# The object crate doesn't support yet Darwin + Aarch64 relocations
218217
ifneq ($(IS_DARWIN), 1)
219-
compilers_engines += cranelift-shared-object
218+
compilers_engines += cranelift-dylib
220219
endif
221220
endif
222221
endif
@@ -230,9 +229,9 @@ ifeq ($(ENABLE_LLVM), 1)
230229
ifneq (, $(filter 1, $(IS_DARWIN) $(IS_LINUX)))
231230
ifeq ($(IS_AMD64), 1)
232231
compilers_engines += llvm-universal
233-
compilers_engines += llvm-shared-object
232+
compilers_engines += llvm-dylib
234233
else ifeq ($(IS_AARCH64), 1)
235-
compilers_engines += llvm-shared-object
234+
compilers_engines += llvm-dylib
236235
endif
237236
endif
238237
endif
@@ -301,7 +300,7 @@ capi_compilers_engines_exclude :=
301300
# LLVM for the moment because it causes the linker to fail since LLVM is not statically linked.
302301
# TODO: Reenable LLVM in C-API
303302
capi_compiler_features := --features $(subst $(space),$(comma),$(filter-out llvm, $(compilers)))
304-
capi_compilers_engines_exclude += llvm-universal llvm-shared-object
303+
capi_compilers_engines_exclude += llvm-universal llvm-dylib
305304

306305
# We exclude singlepass-universal because it doesn't support multivalue (required in wasm-c-api tests)
307306
capi_compilers_engines_exclude += singlepass-universal
@@ -424,59 +423,59 @@ endif
424423

425424
build-docs-capi: capi-setup
426425
cd lib/c-api/doc/deprecated/ && doxygen doxyfile
427-
RUSTFLAGS="${RUSTFLAGS}" cargo doc --manifest-path lib/c-api/Cargo.toml --no-deps --features wat,universal,object-file,shared-object,cranelift,wasi $(capi_default_features)
426+
RUSTFLAGS="${RUSTFLAGS}" cargo doc --manifest-path lib/c-api/Cargo.toml --no-deps --features wat,universal,object-file,dylib,cranelift,wasi $(capi_default_features)
428427

429428
build-capi: capi-setup
430429
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
431-
--no-default-features --features deprecated,wat,universal,shared-object,object-file,wasi,middlewares $(capi_default_features) $(capi_compiler_features)
430+
--no-default-features --features deprecated,wat,universal,dylib,object-file,wasi,middlewares $(capi_default_features) $(capi_compiler_features)
432431

433432
build-capi-singlepass: capi-setup
434433
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
435-
--no-default-features --features deprecated,wat,universal,shared-object,object-file,singlepass,wasi,middlewares $(capi_default_features)
434+
--no-default-features --features deprecated,wat,universal,dylib,object-file,singlepass,wasi,middlewares $(capi_default_features)
436435

437436
build-capi-singlepass-universal: capi-setup
438437
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
439438
--no-default-features --features deprecated,wat,universal,singlepass,wasi,middlewares $(capi_default_features)
440439

441-
build-capi-singlepass-shared-object: capi-setup
440+
build-capi-singlepass-dylib: capi-setup
442441
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
443-
--no-default-features --features deprecated,wat,shared-object,singlepass,wasi,middlewares $(capi_default_features)
442+
--no-default-features --features deprecated,wat,dylib,singlepass,wasi,middlewares $(capi_default_features)
444443

445444
build-capi-singlepass-object-file: capi-setup
446445
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
447446
--no-default-features --features deprecated,wat,object-file,singlepass,wasi,middlewares $(capi_default_features)
448447

449448
build-capi-cranelift: capi-setup
450449
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
451-
--no-default-features --features deprecated,wat,universal,shared-object,object-file,cranelift,wasi,middlewares $(capi_default_features)
450+
--no-default-features --features deprecated,wat,universal,dylib,object-file,cranelift,wasi,middlewares $(capi_default_features)
452451

453452
build-capi-cranelift-system-libffi: capi-setup
454453
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
455-
--no-default-features --features deprecated,wat,universal,shared-object,object-file,cranelift,wasi,middlewares,system-libffi $(capi_default_features)
454+
--no-default-features --features deprecated,wat,universal,dylib,object-file,cranelift,wasi,middlewares,system-libffi $(capi_default_features)
456455

457456
build-capi-cranelift-universal: capi-setup
458457
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
459458
--no-default-features --features deprecated,wat,universal,cranelift,wasi,middlewares $(capi_default_features)
460459

461-
build-capi-cranelift-shared-object: capi-setup
460+
build-capi-cranelift-dylib: capi-setup
462461
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
463-
--no-default-features --features deprecated,wat,shared-object,cranelift,wasi,middlewares $(capi_default_features)
462+
--no-default-features --features deprecated,wat,dylib,cranelift,wasi,middlewares $(capi_default_features)
464463

465464
build-capi-cranelift-object-file: capi-setup
466465
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
467-
--no-default-features --features deprecated,wat,shared-object,object-file,cranelift,wasi,middlewares $(capi_default_features)
466+
--no-default-features --features deprecated,wat,dylib,object-file,cranelift,wasi,middlewares $(capi_default_features)
468467

469468
build-capi-llvm: capi-setup
470469
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
471-
--no-default-features --features deprecated,wat,universal,shared-object,object-file,llvm,wasi,middlewares $(capi_default_features)
470+
--no-default-features --features deprecated,wat,universal,dylib,object-file,llvm,wasi,middlewares $(capi_default_features)
472471

473472
build-capi-llvm-universal: capi-setup
474473
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
475474
--no-default-features --features deprecated,wat,universal,llvm,wasi,middlewares $(capi_default_features)
476475

477-
build-capi-llvm-shared-object: capi-setup
476+
build-capi-llvm-dylib: capi-setup
478477
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
479-
--no-default-features --features deprecated,wat,shared-object,llvm,wasi,middlewares $(capi_default_features)
478+
--no-default-features --features deprecated,wat,dylib,llvm,wasi,middlewares $(capi_default_features)
480479

481480
build-capi-llvm-object-file: capi-setup
482481
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
@@ -488,17 +487,17 @@ build-capi-headless-universal: capi-setup
488487
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
489488
--no-default-features --features universal,wasi
490489

491-
build-capi-headless-shared-object: capi-setup
490+
build-capi-headless-dylib: capi-setup
492491
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
493-
--no-default-features --features shared-object,wasi
492+
--no-default-features --features dylib,wasi
494493

495494
build-capi-headless-object-file: capi-setup
496495
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
497496
--no-default-features --features object-file,wasi
498497

499498
build-capi-headless-all: capi-setup
500499
RUSTFLAGS="${RUSTFLAGS}" cargo build --manifest-path lib/c-api/Cargo.toml --release \
501-
--no-default-features --features universal,shared-object,object-file,wasi
500+
--no-default-features --features universal,dylib,object-file,wasi
502501

503502
###########
504503
# Testing #
@@ -521,20 +520,20 @@ test-packages:
521520

522521
test-compilers-compat: $(foreach compiler,$(compilers),test-$(compiler))
523522

524-
test-singlepass-shared-object:
525-
cargo test --release --tests $(compiler_features) -- singlepass::shared-object
523+
test-singlepass-dylib:
524+
cargo test --release --tests $(compiler_features) -- singlepass::dylib
526525

527526
test-singlepass-universal:
528527
cargo test --release --tests $(compiler_features) -- singlepass::universal
529528

530-
test-cranelift-shared-object:
531-
cargo test --release --tests $(compiler_features) -- cranelift::shared-object
529+
test-cranelift-dylib:
530+
cargo test --release --tests $(compiler_features) -- cranelift::dylib
532531

533532
test-cranelift-universal:
534533
cargo test --release --tests $(compiler_features) -- cranelift::universal
535534

536-
test-llvm-shared-object:
537-
cargo test --release --tests $(compiler_features) -- llvm::shared-object
535+
test-llvm-dylib:
536+
cargo test --release --tests $(compiler_features) -- llvm::dylib
538537

539538
test-llvm-universal:
540539
cargo test --release --tests $(compiler_features) -- llvm::universal
@@ -551,7 +550,7 @@ test-capi: build-capi package-capi $(foreach compiler_engine,$(capi_compilers_en
551550

552551
test-capi-crate-%:
553552
WASMER_CAPI_CONFIG=$(shell echo $@ | sed -e s/test-capi-crate-//) cargo test --manifest-path lib/c-api/Cargo.toml --release \
554-
--no-default-features --features deprecated,wat,universal,shared-object,object-file,wasi,middlewares $(capi_default_features) $(capi_compiler_features) -- --nocapture
553+
--no-default-features --features deprecated,wat,universal,dylib,object-file,wasi,middlewares $(capi_default_features) $(capi_compiler_features) -- --nocapture
555554

556555
test-capi-integration-%:
557556
# Test the Wasmer C API tests for C

0 commit comments

Comments
 (0)