Move all executables to wasm-utils-tools crate

Cargo.toml

@@ -23,10 +23,5 @@ std = ["parity-wasm/std", "log/std", "byteorder/std"]
 
 [workspace]
 members = [
-  "./logger",
-  "./build",
-  "./ext",
-  "./gas",
-  "./prune",
-  "./stack_height",
+  "./tools",
 ]

ext/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "pwasm-utils-ext"
-version = "0.1.5"
-authors = ["Nikolay Volf <nikvolf@gmail.com>", "Sergey Pepyakin <s.pepyakin@gmail.com>"]
-license = "MIT/Apache-2.0"
-readme = "README.md"
-description = "Collection of command-line utilities and corresponding Rust api for producing pwasm-compatible executables"
-keywords = ["wasm", "webassembly", "pwasm"]
-
-[[bin]]
-name = "wasm-ext"
-path = "src/main.rs"
-
-[dependencies]
-parity-wasm = { git = "https://github.com/paritytech/parity-wasm" }
-pwasm-utils = { path = ".." }
-pwasm-utils-logger = { path = "../logger" }

gas/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "pwasm-utils-gas"
-version = "0.1.5"
-authors = ["Nikolay Volf <nikvolf@gmail.com>", "Sergey Pepyakin <s.pepyakin@gmail.com>"]
-license = "MIT/Apache-2.0"
-readme = "README.md"
-description = "Collection of command-line utilities and corresponding Rust api for producing pwasm-compatible executables"
-keywords = ["wasm", "webassembly", "pwasm"]
-
-[[bin]]
-name = "wasm-gas"
-path = "src/main.rs"
-
-[dependencies]
-parity-wasm = { git = "https://github.com/paritytech/parity-wasm" }
-pwasm-utils = { path = ".." }
-pwasm-utils-logger = { path = "../logger" }

logger/Cargo.toml

@@ -1,16 +0,0 @@
-[package]
-name = "pwasm-utils-logger"
-version = "0.1.5"
-authors = ["Nikolay Volf <nikvolf@gmail.com>", "Sergey Pepyakin <s.pepyakin@gmail.com>"]
-license = "MIT/Apache-2.0"
-readme = "README.md"
-description = "Collection of command-line utilities and corresponding Rust api for producing pwasm-compatible executables"
-keywords = ["wasm", "webassembly", "pwasm"]
-
-[lib]
-name = "logger"
-
-[dependencies]
-log = "0.4"
-env_logger = "0.5"
-lazy_static = "1.0"

prune/Cargo.toml

@@ -1,18 +0,0 @@
-[package]
-name = "pwasm-utils-prune"
-version = "0.1.5"
-authors = ["Nikolay Volf <nikvolf@gmail.com>", "Sergey Pepyakin <s.pepyakin@gmail.com>"]
-license = "MIT/Apache-2.0"
-readme = "README.md"
-description = "Collection of command-line utilities and corresponding Rust api for producing pwasm-compatible executables"
-keywords = ["wasm", "webassembly", "pwasm"]
-
-[[bin]]
-name = "wasm-prune"
-path = "src/main.rs"
-
-[dependencies]
-parity-wasm = { git = "https://github.com/paritytech/parity-wasm" }
-pwasm-utils = { path = ".." }
-pwasm-utils-logger = { path = "../logger" }
-clap = "2.24"

stack_height/Cargo.toml

@@ -1,17 +0,0 @@
-[package]
-name = "pwasm-utils-stack-height"
-version = "0.1.5"
-authors = ["Nikolay Volf <nikvolf@gmail.com>", "Sergey Pepyakin <s.pepyakin@gmail.com>"]
-license = "MIT/Apache-2.0"
-readme = "README.md"
-description = "Collection of command-line utilities and corresponding Rust api for producing pwasm-compatible executables"
-keywords = ["wasm", "webassembly", "pwasm"]
-
-[[bin]]
-name = "wasm-stack-height"
-path = "src/main.rs"
-
-[dependencies]
-parity-wasm = { git = "https://github.com/paritytech/parity-wasm" }
-pwasm-utils = { path = ".." }
-pwasm-utils-logger = { path = "../logger" }

tools/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "pwasm-utils-build"
+name = "pwasm-utils-tools"
 version = "0.1.5"
 authors = ["Nikolay Volf <nikvolf@gmail.com>", "Sergey Pepyakin <s.pepyakin@gmail.com>"]
 license = "MIT/Apache-2.0"
@@ -7,16 +7,36 @@ readme = "README.md"
 description = "Collection of command-line utilities and corresponding Rust api for producing pwasm-compatible executables"
 keywords = ["wasm", "webassembly", "pwasm"]
 
+[lib]
+
+[[bin]]
+name = "wasm-prune"
+path = "prune/main.rs"
+
+[[bin]]
+name = "wasm-ext"
+path = "ext/main.rs"
+
+[[bin]]
+name = "wasm-gas"
+path = "gas/main.rs"
+
 [[bin]]
 name = "wasm-build"
-path = "src/main.rs"
+path = "build/main.rs"
+
+[[bin]]
+name = "wasm-stack-height"
+path = "stack_height/main.rs"
 
 [dependencies]
 parity-wasm = { git = "https://github.com/paritytech/parity-wasm" }
 pwasm-utils = { path = ".." }
-pwasm-utils-logger = { path = "../logger" }
 glob = "0.2"
 clap = "2.24"
+log = "0.4"
+env_logger = "0.5"
+lazy_static = "1.0"
 
 [dev-dependencies]
 tempdir = "0.3"

tools/build/main.rs

@@ -4,7 +4,7 @@ extern crate glob;
 extern crate pwasm_utils as utils;
 extern crate clap;
 extern crate parity_wasm;
-extern crate logger;
+extern crate pwasm_utils_tools as logger;
 
 mod source;
 

tools/ext/main.rs

@@ -1,6 +1,6 @@
 extern crate parity_wasm;
 extern crate pwasm_utils as utils;
-extern crate logger;
+extern crate pwasm_utils_tools as logger;
 
 use std::env;
 

tools/gas/main.rs

@@ -1,6 +1,6 @@
 extern crate parity_wasm;
 extern crate pwasm_utils as utils;
-extern crate logger;
+extern crate pwasm_utils_tools as logger;
 
 use std::env;
 

tools/prune/main.rs

@@ -1,6 +1,6 @@
 extern crate parity_wasm;
 extern crate pwasm_utils as utils;
-extern crate logger;
+extern crate pwasm_utils_tools as logger;
 extern crate clap;
 
 use clap::{App, Arg};

tools/stack_height/main.rs

@@ -1,6 +1,6 @@
 extern crate pwasm_utils as utils;
 extern crate parity_wasm;
-extern crate logger;
+extern crate pwasm_utils_tools as logger;
 
 use std::env;
 use utils::stack_height;