Implement wasmer config

Makefile

@@ -749,7 +749,7 @@ install-capi-pkgconfig:
 install-pkgconfig:
 	# Make sure WASMER_INSTALL_PREFIX is set during build
 	unset WASMER_DIR; \
-	if pc="$$(target/release/wasmer config --pkg-config 2>/dev/null)"; then \
+	if pc="$$(target/release/wasmer config get pkg-config 2>/dev/null)"; then \
 		echo "$$pc" | install -Dm644 /dev/stdin "$(DESTDIR)"/lib/pkgconfig/wasmer.pc; \
 	else \
 		echo 1>&2 "WASMER_INSTALL_PREFIX was not set during build, not installing wasmer.pc"; \

lib/c-api/README.md

@@ -148,48 +148,48 @@ $ make test-capi
 
 `wasmer config` output various configuration information needed to compile programs which use Wasmer.
 
-### `wasmer config --pkg-config`
+### `wasmer config get pkg-config`
 
 It outputs the necessary details for compiling and linking a program to Wasmer,
 using the `pkg-config` format:
 
 ```bash
-$ wasmer config --pkg-config > $PKG_CONFIG_PATH/wasmer.pc
+$ wasmer config get pkg-config > $PKG_CONFIG_PATH/wasmer.pc
 ```
 
-### `wasmer config --includedir`
+### `wasmer config get includedir`
 
 Directory containing Wasmer headers:
 
 ```bash
-$ wasmer config --includedir
+$ wasmer config get includedir
 /users/myuser/.wasmer/include
 ```
 
-### `wasmer config --libdir`
+### `wasmer config get libdir`
 
 Directory containing Wasmer libraries:
 
 ```bash
-$ wasmer config --libdir
+$ wasmer config get libdir
 /users/myuser/.wasmer/lib
 ```
 
-### `wasmer config --libs`
+### `wasmer config get libs`
 
 Libraries needed to link against Wasmer components:
 
 ```bash
-$ wasmer config --libs
+$ wasmer config get libs
 -L/Users/myuser/.wasmer/lib -lwasmer
 ```
 
-### `wasmer config --cflags`
+### `wasmer config get cflags`
 
 Headers needed to build against Wasmer components:
 
 ```bash
-$ wasmer config --cflags
+$ wasmer config get cflags
 -I/Users/myuser/.wasmer/include/wasmer
 ```
 

lib/c-api/examples/Makefile

@@ -18,13 +18,13 @@ ifeq (,$(wildcard $(WASMER_DIR)/bin/wasmer))
 	MSVC_LDFLAGS:= ""
 	MSVC_LDLIBS:= /LIBPATH:$(WASMER_DIR)/lib wasmer.dll.lib
 else
-	CFLAGS = -g -I $(ROOT_DIR)/ -I $(shell $(WASMER_DIR)/bin/wasmer config --includedir)
-	LDFLAGS = -Wl,-rpath,$(shell $(WASMER_DIR)/bin/wasmer config --libdir)
-	LDLIBS = $(shell $(WASMER_DIR)/bin/wasmer config --libs)
+	CFLAGS = -g -I $(ROOT_DIR)/ -I $(shell $(WASMER_DIR)/bin/wasmer config get includedir)
+	LDFLAGS = -Wl,-rpath,$(shell $(WASMER_DIR)/bin/wasmer config get libdir)
+	LDLIBS = $(shell $(WASMER_DIR)/bin/wasmer config get libs)
 
-	MSVC_CFLAGS:= /DEBUG /I $(ROOT_DIR)/ /I $(shell $(WASMER_DIR)/bin/wasmer config --includedir)
+	MSVC_CFLAGS:= /DEBUG /I $(ROOT_DIR)/ /I $(shell $(WASMER_DIR)/bin/wasmer config get includedir)
 	MSVC_LDFLAGS:= ""
-	MSVC_LDLIBS:= /LIBPATH:$(shell $(WASMER_DIR)/bin/wasmer config --libs) wasmer.dll.lib
+	MSVC_LDLIBS:= /LIBPATH:$(shell $(WASMER_DIR)/bin/wasmer config get libs) wasmer.dll.lib
 endif
 
 $(info * CFLAGS: $(CFLAGS))

lib/c-api/tests/Makefile

@@ -10,9 +10,9 @@ ifeq (,$(wildcard $(WASMER_DIR)/bin/wasmer))
 	LDFLAGS = -Wl,-rpath,$(WASMER_DIR)/lib
 	LDLIBS = -L $(WASMER_DIR)/lib -lwasmer
 else
-	CFLAGS = -g -I $(ROOT_DIR)/wasm-c-api/include/ -I $(shell $(WASMER_DIR)/bin/wasmer config --includedir)
-	LDFLAGS = -Wl,-rpath,$(shell $(WASMER_DIR)/bin/wasmer config --libdir)
-	LDLIBS = $(shell $(WASMER_DIR)/bin/wasmer config --libs)
+	CFLAGS = -g -I $(ROOT_DIR)/wasm-c-api/include/ -I $(shell $(WASMER_DIR)/bin/wasmer config get includedir)
+	LDFLAGS = -Wl,-rpath,$(shell $(WASMER_DIR)/bin/wasmer config get libdir)
+	LDLIBS = $(shell $(WASMER_DIR)/bin/wasmer config get libs)
 endif
 
 

lib/cli/src/cli.rs

@@ -126,6 +126,7 @@ enum WasmerCLIOptions {
 
     /// Get various configuration information needed
     /// to compile programs which use Wasmer
+    #[clap(subcommand)]
     Config(Config),
 
     /// Update wasmer to the latest version

lib/cli/src/commands/add.rs

@@ -2,7 +2,7 @@ use std::process::{Command, Stdio};
 
 use anyhow::{Context, Error};
 use clap::Parser;
-use wasmer_registry::{Bindings, PartialWapmConfig, ProgrammingLanguage};
+use wasmer_registry::{Bindings, ProgrammingLanguage, WasmerConfig};
 
 /// Add a WAPM package's bindings to your application.
 #[derive(Debug, Parser)]
@@ -76,7 +76,7 @@ impl Add {
         match &self.registry {
             Some(r) => Ok(r.clone()),
             None => {
-                let cfg = PartialWapmConfig::from_file()
+                let cfg = WasmerConfig::from_file()
                     .map_err(Error::msg)
                     .context("Unable to load WAPM's config file")?;
                 Ok(cfg.registry.get_current_registry())