Feature/headless wasmer revamp

Makefile

@@ -54,7 +54,6 @@ endif
 # Using filter as a logical OR
 # https://stackoverflow.com/questions/7656425/makefile-ifeq-logical-or
 use_system_ffi =
-cross_compiling_to_mac_aarch64 =
 ifneq (,$(filter $(ARCH),aarch64 arm64))
 	test_compilers_engines += cranelift-jit
 	ifneq (, $(findstring llvm,$(compilers)))
@@ -63,7 +62,6 @@ ifneq (,$(filter $(ARCH),aarch64 arm64))
 	# if we are in macos arm64, we use the system libffi for the capi
 	ifeq ($(UNAME_S), Darwin)
 		use_system_ffi = yes
-		cross_compiling_to_mac_aarch64 = yes
 	endif
 endif
 
@@ -90,6 +88,9 @@ endif
 compiler_features_spaced := $(foreach compiler,$(compilers),$(compiler))
 compiler_features := --features "$(compiler_features_spaced)"
 
+HOST_TARGET=$(shell rustup show | grep 'Default host: ' | cut -d':' -f2 | tr -d ' ')
+
+$(info Host target: $(bold)$(green)$(HOST_TARGET)$(reset))
 $(info Available compilers: $(bold)$(green)${compilers}$(reset))
 $(info Compilers features: $(bold)$(green)${compiler_features}$(reset))
 $(info Available compilers + engines for test: $(bold)$(green)${test_compilers_engines}$(reset))
@@ -103,10 +104,10 @@ bench:
 	cargo bench $(compiler_features)
 
 build-wasmer:
-	cargo build --release --manifest-path lib/cli/Cargo.toml $(compiler_features)
+	cargo build --release --manifest-path lib/cli/Cargo.toml $(compiler_features) --bin wasmer
 
 build-wasmer-debug:
-	cargo build --manifest-path lib/cli/Cargo.toml $(compiler_features)
+	cargo build --manifest-path lib/cli/Cargo.toml $(compiler_features) --bin wasmer
 
 # For best results ensure the release profile looks like the following
 # in Cargo.toml:
@@ -121,10 +122,12 @@ build-wasmer-debug:
 # codegen-units = 1
 # rpath = false
 build-wasmer-headless-minimal:
-	HOST_TARGET=$$(rustup show | grep 'Default host: ' | cut -d':' -f2 | tr -d ' ') ;\
-  echo $$HOST_TARGET ;\
-	RUSTFLAGS="-C panic=abort" xargo build -v --target $$HOST_TARGET --release --manifest-path=lib/cli/Cargo.toml --no-default-features --features headless-minimal ;\
-	strip target/$$HOST_TARGET/release/wasmer
+	RUSTFLAGS="-C panic=abort" xargo build -v --target $(HOST_TARGET) --release --manifest-path=lib/cli/Cargo.toml --no-default-features --features headless --bin wasmer-headless
+ifeq ($(UNAME_S), Darwin)
+	strip -u target/$(HOST_TARGET)/release/wasmer-headless
+else
+	strip --strip-unneeded target/$(HOST_TARGET)/release/wasmer-headless
+endif
 
 WAPM_VERSION = master # v0.5.0
 get-wapm:
@@ -329,16 +332,9 @@ endif
 endif
 
 package-minimal-headless-wasmer:
-ifdef cross_compiling_to_mac_aarch64
-	if [ -f "target/aarch64-apple-darwin/release/wasmer" ]; then \
-		cp target/aarch64-apple-darwin/release/wasmer package/bin/wasmer-headless ;\
+	if [ -f "target/$(HOST_TARGET)/release/wasmer-headless" ]; then \
+		cp target/$(HOST_TARGET)/release/wasmer-headless package/bin ;\
 	fi
-else
-	HOST_TARGET=$$(rustup show | grep 'Default host: ' | cut -d':' -f2 | tr -d ' ') ;\
-	if [ -f "target/$$HOST_TARGET/release/wasmer" ]; then \
-		cp target/$$HOST_TARGET/release/wasmer package/bin/wasmer-headless ;\
-	fi
-endif
 
 package-wasmer:
 	mkdir -p "package/bin"

lib/cli/Cargo.toml

@@ -107,5 +107,4 @@ llvm = [
 ]
 debug = ["fern", "log", "wasmer-wasi/logging"]
 disable-all-logging = ["wasmer-wasi/disable-all-logging"]
-headless = []
-headless-minimal = ["headless", "disable-all-logging", "wasi", "native", "jit"]
+headless = ["disable-all-logging", "wasi", "native", "jit"]

lib/cli/src/bin/wasmer-headless.rs

@@ -0,0 +1,61 @@
+use anyhow::Result;
+use wasmer_cli::commands::{Config, Run};
+use wasmer_cli::error::PrettyError;
+
+use structopt::{clap::ErrorKind, StructOpt};
+
+#[derive(Debug, StructOpt)]
+#[structopt(
+    name = "wasmer-headless",
+    about = "Headless WebAssembly standalone runtime.",
+    author
+)]
+/// The options for the wasmer Command Line Interface
+enum WasmerCLIOptions {
+    /// Run a WebAssembly file. Formats accepted: wasm, wat
+    #[structopt(name = "run")]
+    Run(Run),
+
+    /// Get various configuration information needed
+    /// to compile programs which use Wasmer
+    #[structopt(name = "config")]
+    Config(Config),
+}
+
+impl WasmerCLIOptions {
+    fn execute(&self) -> Result<()> {
+        match self {
+            Self::Run(options) => options.execute(),
+            Self::Config(config) => config.execute(),
+        }
+    }
+}
+
+fn main() {
+    // We allow windows to print properly colors
+    #[cfg(windows)]
+    colored::control::set_virtual_terminal(true).unwrap();
+
+    // We try to run wasmer with the normal arguments.
+    // Eg. `wasmer <SUBCOMMAND>`
+    // In case that fails, we fallback trying the Run subcommand directly.
+    // Eg. `wasmer myfile.wasm --dir=.`
+    let args = std::env::args().collect::<Vec<_>>();
+    let command = args.get(1);
+    let options = match command.unwrap_or(&"".to_string()).as_ref() {
+        "config" | "run" => WasmerCLIOptions::from_args(),
+        _ => {
+            WasmerCLIOptions::from_iter_safe(args.iter()).unwrap_or_else(|e| {
+                match e.kind {
+                    // This fixes a issue that:
+                    // 1. Shows the version twice when doing `wasmer -V`
+                    // 2. Shows the run help (instead of normal help) when doing `wasmer --help`
+                    ErrorKind::VersionDisplayed | ErrorKind::HelpDisplayed => e.exit(),
+                    _ => WasmerCLIOptions::Run(Run::from_args()),
+                }
+            })
+        }
+    };
+
+    PrettyError::report(options.execute());
+}

lib/cli/src/bin/wasmer.rs

@@ -11,18 +11,7 @@ use wasmer_cli::error::PrettyError;
 use structopt::{clap::ErrorKind, StructOpt};
 
 #[derive(Debug, StructOpt)]
-#[cfg_attr(
-    not(feature = "headless"),
-    structopt(name = "wasmer", about = "WebAssembly standalone runtime.", author)
-)]
-#[cfg_attr(
-    feature = "headless",
-    structopt(
-        name = "wasmer-headless",
-        about = "Headless WebAssembly standalone runtime.",
-        author
-    )
-)]
+#[structopt(name = "wasmer", about = "WebAssembly standalone runtime.", author)]
 /// The options for the wasmer Command Line Interface
 enum WasmerCLIOptions {
     /// Run a WebAssembly file. Formats accepted: wasm, wat