update ssvmc to wasmedgec 0.8.0

Author: wangshishuo

src/command/build.rs

@@ -1,7 +1,7 @@
 //! Implementation of the `rustwasmc build` command.
 
 use crate::wasm_opt;
-use crate::ssvmc;
+use crate::wasmedgec;
 use binary_install::{Cache, Download};
 use bindgen;
 use build;
@@ -243,7 +243,7 @@ impl Build {
             step_install_wasm_bindgen,
             step_run_wasm_bindgen,
             step_run_wasm_opt,
-            step_run_ssvmc,
+            step_run_wasmedgec,
             step_create_json,
         ]);
         steps
@@ -431,11 +431,11 @@ impl Build {
         })
     }
 
-    fn step_run_ssvmc(&mut self) -> Result<(), Error> {
+    fn step_run_wasmedgec(&mut self) -> Result<(), Error> {
         if !self.enable_aot {
             return Ok(())
         }
-        ssvmc::run(
+        wasmedgec::run(
             &self.cache,
             &self.out_dir,
             self.mode.install_permitted(),

src/lib.rs

@@ -40,7 +40,7 @@ pub mod progressbar;
 pub mod readme;
 pub mod target;
 pub mod wasm_opt;
-pub mod ssvmc;
+pub mod wasmedgec;
 
 use progressbar::{LogLevel, ProgressOutput};
 

src/ssvmc.rs src/wasmedgec.rssrc/ssvmc.rs renamed to src/wasmedgec.rs

@@ -1,4 +1,4 @@
-//! Support for downloading and executing `ssvmc`
+//! Support for downloading and executing `wasmedgec`
 
 use crate::child;
 use crate::emoji;
@@ -9,17 +9,17 @@ use log::debug;
 use std::path::{Path, PathBuf};
 use std::process::Command;
 
-/// Execute `ssvmc` over wasm binaries found in `out_dir`, downloading if
-/// necessary into `cache`. Passes `args` to each invocation of `ssvmc`.
+/// Execute `wasmedgec` over wasm binaries found in `out_dir`, downloading if
+/// necessary into `cache`. Passes `args` to each invocation of `wasmedgec`.
 pub fn run(
     cache: &Cache,
     out_dir: &Path,
     install_permitted: bool,
 ) -> Result<(), failure::Error> {
-    let ssvmc = match find_ssvmc(cache, install_permitted)? {
+    let wasmedgec = match find_wasmedgec(cache, install_permitted)? {
         SsvmcOpt::Found(path) => path,
         SsvmcOpt::CannotInstall => {
-            PBAR.info("Skipping ssvmc as no downloading was requested");
+            PBAR.info("Skipping wasmedgec as no downloading was requested");
             return Ok(());
         }
         SsvmcOpt::PlatformNotSupported => {
@@ -28,7 +28,7 @@ pub fn run(
         }
     };
 
-    PBAR.info("Compiling AOT binaries with `ssvmc`...");
+    PBAR.info("Compiling AOT binaries with `wasmedgec`...");
 
     for file in out_dir.read_dir()? {
         let file = file?;
@@ -38,9 +38,9 @@ pub fn run(
         }
 
         let tmp = path.with_extension("so");
-        let mut cmd = Command::new(&ssvmc);
+        let mut cmd = Command::new(&wasmedgec);
         cmd.arg(&path).arg(&tmp);
-        if let Err(e) = child::run(cmd, "ssvmc") {
+        if let Err(e) = child::run(cmd, "wasmedgec") {
             PBAR.info("You need Ubuntu 20.04 to compile the AOT binary. Please see https://www.secondstate.io/articles/setup-rust-nodejs/");
             return Err(e)
         }
@@ -49,27 +49,27 @@ pub fn run(
     Ok(())
 }
 
-/// Possible results of `find_ssvmc`
+/// Possible results of `find_wasmedgec`
 pub enum SsvmcOpt {
-    /// Couldn't install ssvmc because downloads are forbidden
+    /// Couldn't install wasmedgec because downloads are forbidden
     CannotInstall,
     /// The current platform doesn't support precompiled binaries
     PlatformNotSupported,
-    /// We found `ssvmc` at the specified path
+    /// We found `wasmedgec` at the specified path
     Found(PathBuf),
 }
 
-/// Attempts to find `ssvmc` in `PATH` locally, or failing that downloads a
+/// Attempts to find `wasmedgec` in `PATH` locally, or failing that downloads a
 /// precompiled binary.
 ///
 /// Returns `Some` if a binary was found or it was successfully downloaded.
 /// Returns `None` if a binary wasn't found in `PATH` and this platform doesn't
 /// have precompiled binaries. Returns an error if we failed to download the
 /// binary.
-pub fn find_ssvmc(cache: &Cache, install_permitted: bool) -> Result<SsvmcOpt, failure::Error> {
+pub fn find_wasmedgec(cache: &Cache, install_permitted: bool) -> Result<SsvmcOpt, failure::Error> {
     // First attempt to look up in PATH. If found assume it works.
-    if let Ok(path) = which::which("ssvmc") {
-        debug!("found ssvmc at {:?}", path);
+    if let Ok(path) = which::which("wasmedgec") {
+        debug!("found wasmedgec at {:?}", path);
         return Ok(SsvmcOpt::Found(path));
     }
 
@@ -80,17 +80,17 @@ pub fn find_ssvmc(cache: &Cache, install_permitted: bool) -> Result<SsvmcOpt, fa
         return Ok(SsvmcOpt::PlatformNotSupported);
     };
     let url = format!(
-        "https://github.com/second-state/SSVM/releases/download/{vers}/ssvm-{vers}-linux-x64.tar.gz",
-        vers = "0.7.0",
+        "https://github.com/WasmEdge/WasmEdge/releases/download/{vers}/WasmEdge-{vers}-manylinux2014_x86_64.tar.gz",
+        vers = "0.8.0",
     );
 
-    let download = |permit_install| cache.download(permit_install, "ssvmc", &["ssvmc"], &url);
+    let download = |permit_install| cache.download(permit_install, "wasmedgec", &["wasmedgec"], &url);
 
     let dl = match download(false)? {
         Some(dl) => dl,
         None if !install_permitted => return Ok(SsvmcOpt::CannotInstall),
         None => {
-            let msg = format!("{}Installing ssvmc...", emoji::DOWN_ARROW);
+            let msg = format!("{}Installing wasmedgec...", emoji::DOWN_ARROW);
             PBAR.info(&msg);
 
             match download(install_permitted)? {
@@ -100,5 +100,5 @@ pub fn find_ssvmc(cache: &Cache, install_permitted: bool) -> Result<SsvmcOpt, fa
         }
     };
 
-    Ok(SsvmcOpt::Found(dl.binary("ssvmc")?))
+    Ok(SsvmcOpt::Found(dl.binary("wasmedgec")?))
 }