default skip analysis (#23)

.gitignore

@@ -10,4 +10,5 @@
 **/*.rs.bk
 
 # Generated by VS Code
-.vscode/
+.vscode/
+.DS_Store

Cargo.toml

@@ -7,7 +7,7 @@ edition = "2018"
 
 [dependencies]
 anyhow = "1.0.32"
-structopt = "0.3.16"
+structopt = "0.3.26"
 heck = "0.3.1"
 colored = "2.0.0"
 zip = "0.5.6"
@@ -43,6 +43,6 @@ walkdir = "2.3.1"
 name = "cargo-liquid"
 path = "src/main/main.rs"
 
-#[[bin]]
-#name = "liquid-analy"
-#path = "src/analyzer/main.rs"
+# [[bin]]
+# name = "liquid-analy"
+# path = "src/analyzer/main.rs"

src/main/cmd/build.rs

@@ -146,6 +146,9 @@ fn run_xargo_build(
             memcpy: false,
             panic_immediate_abort: true,
         };
+        if let VerbosityBehavior::Verbose = verbosity_behavior {
+            println!("manifest_path: {:#?}", manifest_path);
+        }
         let exit_status = xargo_lib::build(args, "build", Some(config))
             .map_err(|e| anyhow::anyhow!("{}", e))
             .context("Building with xargo")?;

src/main/main.rs

@@ -59,7 +59,7 @@ enum VerbosityBehavior {
 #[derive(StructOpt)]
 struct AnalysisFlags {
     /// If this flag is set, the analysis process will be skipped unconditionally.
-    #[structopt(long)]
+    #[structopt(long, parse(try_from_str), default_value = "true")]
     skip_analysis: bool,
 }
 

src/main/utils.rs

@@ -17,10 +17,10 @@ use rustc_version::Channel;
 
 pub fn get_cargo_metadata(manifest_path: &ManifestPath) -> Result<(CargoMetadata, PackageId)> {
     let mut cmd = MetadataCommand::new();
-    let metadata = cmd
-        .manifest_path(manifest_path)
-        .exec()
-        .context("Error invoking `cargo metadata`")?;
+    let metadata = cmd.manifest_path(manifest_path).exec().context(format!(
+        "Error invoking `cargo metadata` on {:#?}",
+        manifest_path
+    ))?;
     let root_packaged_id = metadata
         .resolve
         .as_ref()

template/contract/.liquid/abi_gen/_Cargo.toml

@@ -17,7 +17,7 @@ features = ["liquid-abi-gen"]
 
 [dependencies.liquid_lang]
 git = "https://github.com/WeBankBlockchain/liquid"
-tag = "v1.0.0-rc2"
+rev = "c678d9586b4335fc302a4c02a564d8ee6964be1d"
 package = "liquid_lang"
 default-features = false
 features = ["contract-abi-gen"]

template/contract/_Cargo.toml

@@ -9,11 +9,11 @@ edition = "2018"
 [dependencies]
 scale = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive", "full"] }
 
-liquid_lang = { version = "1.0.0-rc2", git = "https://github.com/WeBankBlockchain/liquid", tag = "v1.0.0-rc2", package = "liquid_lang", default-features = false, features = ["contract"] }
-liquid_primitives = { version = "1.0.0-rc2", git = "https://github.com/WeBankBlockchain/liquid", tag = "v1.0.0-rc2", package = "liquid_primitives", default-features = false }
-liquid_prelude = { version = "1.0.0-rc2", git = "https://github.com/WeBankBlockchain/liquid", tag = "v1.0.0-rc2", package = "liquid_prelude", default-features = false }
-liquid_macro = { version = "1.0.0-rc2", git = "https://github.com/WeBankBlockchain/liquid", tag = "v1.0.0-rc2", package = "liquid_macro", default-features = false }
-liquid_abi_gen = { version = "1.0.0-rc2", git = "https://github.com/WeBankBlockchain/liquid", tag = "v1.0.0-rc2", package = "liquid_abi_gen", default-features = false, optional = true }
+liquid_lang = { git = "https://github.com/WeBankBlockchain/liquid", rev = "c678d9586b4335fc302a4c02a564d8ee6964be1d", package = "liquid_lang", default-features = false, features = ["contract"] }
+liquid_primitives = { git = "https://github.com/WeBankBlockchain/liquid", rev = "c678d9586b4335fc302a4c02a564d8ee6964be1d", package = "liquid_primitives", default-features = false }
+liquid_prelude = { git = "https://github.com/WeBankBlockchain/liquid", rev = "c678d9586b4335fc302a4c02a564d8ee6964be1d", package = "liquid_prelude", default-features = false }
+liquid_macro = { git = "https://github.com/WeBankBlockchain/liquid", rev = "c678d9586b4335fc302a4c02a564d8ee6964be1d", package = "liquid_macro", default-features = false }
+liquid_abi_gen = { git = "https://github.com/WeBankBlockchain/liquid", rev = "c678d9586b4335fc302a4c02a564d8ee6964be1d", package = "liquid_abi_gen", default-features = false, optional = true }
 
 [dev-dependencies]
 predicates = "1.0.5"

template/contract/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2021-06-23"
+channel = "nightly-2023-01-03"