Merge #3057

3057: wasmer-cli: create-obj command r=epilys a=epilys



Co-authored-by: Manos Pitsidianakis <[email protected]>

Cargo.toml

@@ -106,6 +106,10 @@ singlepass = ["wasmer-compiler-singlepass", "compiler"]
 cranelift = ["wasmer-compiler-cranelift", "compiler"]
 llvm = ["wasmer-compiler-llvm", "compiler"]
 middlewares = ["wasmer-middlewares"]
+wasmer-artifact-load = ["wasmer-compiler/wasmer-artifact-load"]
+wasmer-artifact-create = ["wasmer-compiler/wasmer-artifact-create"]
+static-artifact-load = ["wasmer-compiler/static-artifact-load"]
+static-artifact-create = ["wasmer-compiler/static-artifact-create"]
 
 # Testing features
 test-singlepass = ["singlepass"]

Makefile

@@ -254,13 +254,13 @@ space := $() $()
 comma := ,
 
 # Define the compiler Cargo features for all crates.
-compiler_features := --features $(subst $(space),$(comma),$(compilers))
+compiler_features := --features $(subst $(space),$(comma),$(compilers)),wasmer-artifact-create,static-artifact-create,wasmer-artifact-load,static-artifact-load
 capi_compilers_engines_exclude := 
 
 # Define the compiler Cargo features for the C API. It always excludes
 # LLVM for the moment because it causes the linker to fail since LLVM is not statically linked.
 # TODO: Reenable LLVM in C-API
-capi_compiler_features := --features $(subst $(space),$(comma),$(filter-out llvm, $(compilers)))
+capi_compiler_features := --features $(subst $(space),$(comma),$(filter-out llvm, $(compilers))),wasmer-artifact-create,static-artifact-create,wasmer-artifact-load,static-artifact-load
 capi_compilers_engines_exclude += llvm-universal
 
 # We exclude singlepass-universal because it doesn't support multivalue (required in wasm-c-api tests)

fuzz/Cargo.toml

@@ -25,6 +25,10 @@ cranelift = [ "wasmer-compiler-cranelift" ]
 llvm = [ "wasmer-compiler-llvm" ]
 singlepass = [ "wasmer-compiler-singlepass" ]
 universal = [ "wasmer-compiler" ]
+wasmer-artifact-load = ["wasmer-compiler/wasmer-artifact-load"]
+wasmer-artifact-create = ["wasmer-compiler/wasmer-artifact-create"]
+static-artifact-load = ["wasmer-compiler/static-artifact-load"]
+static-artifact-create = ["wasmer-compiler/static-artifact-create"]
 
 [[bin]]
 name = "equivalence_universal"

lib/api/Cargo.toml

@@ -22,7 +22,7 @@ edition = "2018"
 # Shared dependencies.
 [dependencies]
 # - Mandatory shared dependencies.
-indexmap = { version = "1.6", features = ["serde-1"] }
+indexmap = { version = "1.6" }
 cfg-if = "1.0"
 thiserror = "1.0"
 more-asserts = "0.2"
@@ -113,5 +113,17 @@ wasm-types-polyfill = ["js", "wasmparser"]
 
 js-serializable-module = []
 
+# Optional
+enable-serde = [
+  "wasmer-vm/enable-serde",
+  "wasmer-compiler/enable-serde",
+  "wasmer-types/enable-serde",
+]
+
+wasmer-artifact-load = ["wasmer-compiler/wasmer-artifact-load"]
+wasmer-artifact-create = ["wasmer-compiler/wasmer-artifact-create"]
+static-artifact-load = ["wasmer-compiler/static-artifact-load"]
+static-artifact-create = ["wasmer-compiler/static-artifact-create"]
+
 [package.metadata.docs.rs]
 features = ["compiler", "core", "cranelift", "engine", "jit", "native", "singlepass", "sys", "sys-default" ]

lib/c-api/Cargo.toml

@@ -35,7 +35,6 @@ enumset = "1.0.2"
 cfg-if = "1.0"
 lazy_static = "1.4"
 libc = { version = "^0.2", default-features = false }
-serde = { version = "1", optional = true, features = ["derive"] }
 thiserror = "1"
 typetag = { version = "0.1", optional = true }
 paste = "1.0"
@@ -80,6 +79,10 @@ llvm = [
     "wasmer-compiler-llvm",
     "compiler",
 ]
+wasmer-artifact-load = ["wasmer-compiler/wasmer-artifact-load"]
+wasmer-artifact-create = ["wasmer-compiler/wasmer-artifact-create"]
+static-artifact-load = ["wasmer-compiler/static-artifact-load"]
+static-artifact-create = ["wasmer-compiler/static-artifact-create"]
 
 # Deprecated features.
 jit = ["compiler"]

lib/cli/Cargo.toml

@@ -37,7 +37,7 @@ wasmer-wasi-experimental-io-devices = { version = "=3.0.0-alpha.4", path = "../w
 wasmer-wast = { version = "=3.0.0-alpha.4", path = "../../tests/lib/wast", optional = true }
 wasmer-cache = { version = "=3.0.0-alpha.4", path = "../cache", optional = true }
 wasmer-types = { version = "=3.0.0-alpha.4", path = "../types" }
-wasmer-object = { version = "=3.0.0-alpha.4", path = "../object" }
+wasmer-object = { version = "=3.0.0-alpha.4", path = "../object", optional = true }
 wasmer-vfs  = { version = "=3.0.0-alpha.4", path = "../vfs", default-features = false, features = ["host-fs"] }
 atty = "0.2"
 colored = "2.0"
@@ -66,6 +66,8 @@ default = [
     "wasi",
     "emscripten",
     "compiler",
+    "wasmer-artifact-create",
+    "static-artifact-create",
 ]
 cache = ["wasmer-cache"]
 cache-blake3-pure = ["wasmer-cache/blake3-pure"]
@@ -77,6 +79,29 @@ compiler = [
     "wasmer-compiler/translator",
     "wasmer-compiler/compiler",
 ]
+wasmer-artifact-create = ["compiler",
+ "wasmer/wasmer-artifact-load",
+ "wasmer/wasmer-artifact-create",
+ "wasmer-compiler/wasmer-artifact-load",
+ "wasmer-compiler/wasmer-artifact-create",
+ "wasmer-object",
+ ]
+static-artifact-create = ["compiler",
+ "wasmer/static-artifact-load",
+ "wasmer/static-artifact-create",
+ "wasmer-compiler/static-artifact-load",
+ "wasmer-compiler/static-artifact-create",
+ "wasmer-object",
+ ]
+wasmer-artifact-load = ["compiler",
+ "wasmer/wasmer-artifact-load",
+ "wasmer-compiler/wasmer-artifact-load",
+ ]
+static-artifact-load = ["compiler",
+ "wasmer/static-artifact-load",
+ "wasmer-compiler/static-artifact-load",
+ ]
+
 experimental-io-devices = [
     "wasmer-wasi-experimental-io-devices",
     "wasi"
@@ -97,3 +122,12 @@ debug = ["fern", "log", "wasmer-wasi/logging"]
 disable-all-logging = ["wasmer-wasi/disable-all-logging"]
 headless = []
 headless-minimal = ["headless", "disable-all-logging", "wasi"]
+
+# Optional
+enable-serde = [
+  "wasmer/enable-serde",
+  "wasmer-vm/enable-serde",
+  "wasmer-compiler/enable-serde",
+  "wasmer-types/enable-serde",
+  "wasmer-wasi/enable-serde",
+]