Fixing evmbin compilation and added standard build. (#4561)

This commit is contained in:
Tomasz Drwięga 2017-02-15 16:58:42 +01:00 committed by Gav Wood
parent 895298fc49
commit efb95a59be
6 changed files with 18 additions and 6 deletions

View File

@ -379,6 +379,7 @@ darwin:
export PLATFORM=x86_64-apple-darwin export PLATFORM=x86_64-apple-darwin
cargo build -j 8 --features final --release #$CARGOFLAGS cargo build -j 8 --features final --release #$CARGOFLAGS
cargo build -j 8 --features final --release -p ethstore #$CARGOFLAGS cargo build -j 8 --features final --release -p ethstore #$CARGOFLAGS
cargo build -j 8 --features final --release -p evmbin #$CARGOFLAGS
rm -rf parity.md5 rm -rf parity.md5
md5sum target/release/parity > parity.md5 md5sum target/release/parity > parity.md5
export SHA3=$(target/release/parity tools hash target/release/parity) export SHA3=$(target/release/parity tools hash target/release/parity)
@ -504,7 +505,7 @@ test-windows:
- git submodule update --init --recursive - git submodule update --init --recursive
script: script:
- set RUST_BACKTRACE=1 - set RUST_BACKTRACE=1
- echo cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p ethcore-dapps -p ethcore-rpc -p ethcore-signer -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity %CARGOFLAGS% --verbose --release - echo cargo test --features json-tests -p rlp -p ethash -p ethcore -p ethcore-bigint -p ethcore-dapps -p ethcore-rpc -p ethcore-signer -p ethcore-util -p ethcore-network -p ethcore-io -p ethkey -p ethstore -p evmbin -p ethsync -p ethcore-ipc -p ethcore-ipc-tests -p ethcore-ipc-nano -p parity %CARGOFLAGS% --verbose --release
tags: tags:
- rust-windows - rust-windows
allow_failure: true allow_failure: true

11
Cargo.lock generated
View File

@ -24,6 +24,7 @@ dependencies = [
"ethcore-stratum 1.6.0", "ethcore-stratum 1.6.0",
"ethcore-util 1.6.0", "ethcore-util 1.6.0",
"ethsync 1.6.0", "ethsync 1.6.0",
"evmbin 0.1.0",
"fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
"hyper 0.10.0-a.0 (git+https://github.com/ethcore/hyper)", "hyper 0.10.0-a.0 (git+https://github.com/ethcore/hyper)",
"isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -781,6 +782,16 @@ dependencies = [
"time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "evmbin"
version = "0.1.0"
dependencies = [
"docopt 0.6.80 (registry+https://github.com/rust-lang/crates.io-index)",
"ethcore 1.6.0",
"ethcore-util 1.6.0",
"rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "evmjit" name = "evmjit"
version = "1.6.0" version = "1.6.0"

View File

@ -39,6 +39,7 @@ ethcore-ipc-hypervisor = { path = "ipc/hypervisor" }
ethcore-light = { path = "ethcore/light" } ethcore-light = { path = "ethcore/light" }
ethcore-logger = { path = "logger" } ethcore-logger = { path = "logger" }
ethcore-stratum = { path = "stratum" } ethcore-stratum = { path = "stratum" }
evmbin = { path = "evmbin" }
rlp = { path = "util/rlp" } rlp = { path = "util/rlp" }
rpc-cli = { path = "rpc_cli" } rpc-cli = { path = "rpc_cli" }
parity-rpc-client = { path = "rpc_client" } parity-rpc-client = { path = "rpc_client" }

View File

@ -1,5 +1,5 @@
[package] [package]
name = "evm" name = "evmbin"
description = "Parity's EVM implementation" description = "Parity's EVM implementation"
version = "0.1.0" version = "0.1.0"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]

View File

@ -31,7 +31,7 @@ pub struct FakeExt {
impl Default for FakeExt { impl Default for FakeExt {
fn default() -> Self { fn default() -> Self {
FakeExt { FakeExt {
schedule: Schedule::new_homestead_gas_fix(), schedule: Schedule::new_post_eip150(usize::max_value(), true, true, true),
store: HashMap::new(), store: HashMap::new(),
depth: 1, depth: 1,
} }
@ -51,7 +51,7 @@ impl Ext for FakeExt {
unimplemented!(); unimplemented!();
} }
fn exists_and_not_null(&self, address: &Address) -> bool { fn exists_and_not_null(&self, _address: &Address) -> bool {
unimplemented!(); unimplemented!();
} }

View File

@ -21,7 +21,6 @@
extern crate ethcore; extern crate ethcore;
extern crate rustc_serialize; extern crate rustc_serialize;
extern crate docopt; extern crate docopt;
#[macro_use]
extern crate ethcore_util as util; extern crate ethcore_util as util;
mod ext; mod ext;