-
Notifications
You must be signed in to change notification settings - Fork 824
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2010 from wasmerio/feature/headless-wasmer
Add packaging of headless wasmer to CI
- Loading branch information
Showing
10 changed files
with
181 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| [dependencies] | ||
| std = {default-features=false, features=["panic_immediate_abort"]} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,101 +1,5 @@ | ||
| use anyhow::Result; | ||
| #[cfg(all(feature = "object-file", feature = "compiler"))] | ||
| use wasmer_cli::commands::CreateExe; | ||
| #[cfg(feature = "wast")] | ||
| use wasmer_cli::commands::Wast; | ||
| use wasmer_cli::commands::{Cache, Compile, Config, Inspect, Run, SelfUpdate, Validate}; | ||
| use wasmer_cli::error::PrettyError; | ||
|
|
||
| use structopt::{clap::ErrorKind, StructOpt}; | ||
|
|
||
| #[derive(Debug, StructOpt)] | ||
| #[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 | ||
| #[structopt(name = "run")] | ||
| Run(Run), | ||
|
|
||
| /// Wasmer cache | ||
| #[structopt(name = "cache")] | ||
| Cache(Cache), | ||
|
|
||
| /// Validate a WebAssembly binary | ||
| #[structopt(name = "validate")] | ||
| Validate(Validate), | ||
|
|
||
| /// Compile a WebAssembly binary | ||
| #[structopt(name = "compile")] | ||
| Compile(Compile), | ||
|
|
||
| /// Compile a WebAssembly binary into a native executable | ||
| #[cfg(all(feature = "object-file", feature = "compiler"))] | ||
| #[structopt(name = "create-exe")] | ||
| CreateExe(CreateExe), | ||
|
|
||
| /// Get various configuration information needed | ||
| /// to compile programs which use Wasmer | ||
| #[structopt(name = "config")] | ||
| Config(Config), | ||
|
|
||
| /// Update wasmer to the latest version | ||
| #[structopt(name = "self-update")] | ||
| SelfUpdate(SelfUpdate), | ||
|
|
||
| /// Inspect a WebAssembly file | ||
| #[structopt(name = "inspect")] | ||
| Inspect(Inspect), | ||
|
|
||
| /// Run spec testsuite | ||
| #[cfg(feature = "wast")] | ||
| #[structopt(name = "wast")] | ||
| Wast(Wast), | ||
| } | ||
|
|
||
| impl WasmerCLIOptions { | ||
| fn execute(&self) -> Result<()> { | ||
| match self { | ||
| Self::Run(options) => options.execute(), | ||
| Self::SelfUpdate(options) => options.execute(), | ||
| Self::Cache(cache) => cache.execute(), | ||
| Self::Validate(validate) => validate.execute(), | ||
| Self::Compile(compile) => compile.execute(), | ||
| #[cfg(all(feature = "object-file", feature = "compiler"))] | ||
| Self::CreateExe(create_exe) => create_exe.execute(), | ||
| Self::Config(config) => config.execute(), | ||
| Self::Inspect(inspect) => inspect.execute(), | ||
| #[cfg(feature = "wast")] | ||
| Self::Wast(wast) => wast.execute(), | ||
| } | ||
| } | ||
| } | ||
| use wasmer_cli::cli::wasmer_main; | ||
|
|
||
| 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() { | ||
| "cache" | "compile" | "config" | "create-exe" | "help" | "inspect" | "run" | ||
| | "self-update" | "validate" | "wast" => 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()); | ||
| wasmer_main(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| use wasmer_cli::cli::wasmer_main; | ||
|
|
||
| fn main() { | ||
| wasmer_main(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| //! The logic for the Wasmer CLI tool. | ||
| #[cfg(feature = "compiler")] | ||
| use crate::commands::Compile; | ||
| #[cfg(all(feature = "object-file", feature = "compiler"))] | ||
| use crate::commands::CreateExe; | ||
| #[cfg(feature = "wast")] | ||
| use crate::commands::Wast; | ||
| use crate::commands::{Cache, Config, Inspect, Run, SelfUpdate, Validate}; | ||
| use crate::error::PrettyError; | ||
| use anyhow::Result; | ||
|
|
||
| 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 | ||
| ) | ||
| )] | ||
| /// The options for the wasmer Command Line Interface | ||
| enum WasmerCLIOptions { | ||
| /// Run a WebAssembly file. Formats accepted: wasm, wat | ||
| #[structopt(name = "run")] | ||
| Run(Run), | ||
|
|
||
| /// Wasmer cache | ||
| #[structopt(name = "cache")] | ||
| Cache(Cache), | ||
|
|
||
| /// Validate a WebAssembly binary | ||
| #[structopt(name = "validate")] | ||
| Validate(Validate), | ||
|
|
||
| /// Compile a WebAssembly binary | ||
| #[cfg(feature = "compiler")] | ||
| #[structopt(name = "compile")] | ||
| Compile(Compile), | ||
|
|
||
| /// Compile a WebAssembly binary into a native executable | ||
| #[cfg(all(feature = "object-file", feature = "compiler"))] | ||
| #[structopt(name = "create-exe")] | ||
| CreateExe(CreateExe), | ||
|
|
||
| /// Get various configuration information needed | ||
| /// to compile programs which use Wasmer | ||
| #[structopt(name = "config")] | ||
| Config(Config), | ||
|
|
||
| /// Update wasmer to the latest version | ||
| #[structopt(name = "self-update")] | ||
| SelfUpdate(SelfUpdate), | ||
|
|
||
| /// Inspect a WebAssembly file | ||
| #[structopt(name = "inspect")] | ||
| Inspect(Inspect), | ||
|
|
||
| /// Run spec testsuite | ||
| #[cfg(feature = "wast")] | ||
| #[structopt(name = "wast")] | ||
| Wast(Wast), | ||
| } | ||
|
|
||
| impl WasmerCLIOptions { | ||
| fn execute(&self) -> Result<()> { | ||
| match self { | ||
| Self::Run(options) => options.execute(), | ||
| Self::SelfUpdate(options) => options.execute(), | ||
| Self::Cache(cache) => cache.execute(), | ||
| Self::Validate(validate) => validate.execute(), | ||
| #[cfg(feature = "compiler")] | ||
| Self::Compile(compile) => compile.execute(), | ||
| #[cfg(all(feature = "object-file", feature = "compiler"))] | ||
| Self::CreateExe(create_exe) => create_exe.execute(), | ||
| Self::Config(config) => config.execute(), | ||
| Self::Inspect(inspect) => inspect.execute(), | ||
| #[cfg(feature = "wast")] | ||
| Self::Wast(wast) => wast.execute(), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// The main function for the Wasmer CLI tool. | ||
| pub fn wasmer_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() { | ||
| "cache" | "compile" | "config" | "create-exe" | "help" | "inspect" | "run" | ||
| | "self-update" | "validate" | "wast" => 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()); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters