Unify pwasm-utils and pwasm-utils-cli packet

Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "pwasm-utils"
 version = "0.15.0"
+edition = "2018"
 authors = ["Nikolay Volf <nikvolf@gmail.com>", "Sergey Pepyakin <s.pepyakin@gmail.com>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -8,6 +9,41 @@ description = "Collection of command-line utilities and corresponding Rust api f
 keywords = ["wasm", "webassembly", "pwasm"]
 repository = "https://github.com/paritytech/wasm-utils"
 
+[[bin]]
+name = "wasm-prune"
+path = "cli/prune/main.rs"
+required-features = ["cli"]
+
+[[bin]]
+name = "wasm-ext"
+path = "cli/ext/main.rs"
+required-features = ["cli"]
+
+[[bin]]
+name = "wasm-gas"
+path = "cli/gas/main.rs"
+required-features = ["cli"]
+
+[[bin]]
+name = "wasm-build"
+path = "cli/build/main.rs"
+required-features = ["cli"]
+
+[[bin]]
+name = "wasm-stack-height"
+path = "cli/stack_height/main.rs"
+required-features = ["cli"]
+
+[[bin]]
+name = "wasm-pack"
+path = "cli/pack/main.rs"
+required-features = ["cli"]
+
+[[bin]]
+name = "wasm-check"
+path = "cli/check/main.rs"
+required-features = ["cli"]
+
 [dependencies]
 # If you add the feature "bulk", make sure you fixed all expects that say
 # "parity-wasm is compiled without bulk-memory operations"
@@ -15,6 +51,12 @@ parity-wasm = { version = "0.41.0", default-features = false }
 log = { version = "0.4", default-features = false }
 byteorder = { version = "1", default-features = false }
 
+# Dependencies only used by the binaries
+glob = { version = "0.2", optional = true }
+clap = { version = "2.24", optional = true }
+env_logger = { version = "0.5", optional = true }
+lazy_static = { version = "1.0", optional = true }
+
 [dev-dependencies]
 tempdir = "0.3"
 wabt = "0.10"
@@ -26,8 +68,9 @@ binaryen = "0.8"
 [features]
 default = ["std"]
 std = ["parity-wasm/std", "log/std", "byteorder/std"]
-
-[workspace]
-members = [
-  "./cli",
+cli = [
+  "glob",
+  "clap",
+  "env_logger",
+  "lazy_static",
 ]