diff --git a/.travis.yml b/.travis.yml index b6df14fae66..d856086f9ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,6 @@ matrix: env: global: - - TRAVIS_NODE_VERSION="6" - CXX="g++-4.8" - CC="gcc-4.8" - RUST_BACKTRACE="1" @@ -51,7 +50,6 @@ addons: - g++-4.8 install: - - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION - ([ "$RUN_COVERAGE" = "false" ]) || (test -x $KCOV_CMD) || ( wget https://github.com/SimonKagstrom/kcov/archive/master.tar.gz && tar xzf master.tar.gz && diff --git a/Cargo.lock b/Cargo.lock index 7ac3728aaa6..c9b8692267b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -279,10 +279,10 @@ dependencies = [ "jsonrpc-http-server 5.1.0 (git+https://github.com/ethcore/jsonrpc-http-server.git)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 1.6.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-dapps 0.3.0 (git+https://github.com/ethcore/parity-ui.git)", - "parity-dapps-home 0.5.2 (git+https://github.com/ethcore/parity-ui.git)", - "parity-dapps-status 0.5.1 (git+https://github.com/ethcore/parity-ui.git)", - "parity-dapps-wallet 0.6.1 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps-home 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps-status 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps-wallet 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "serde 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)", "serde_codegen 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)", @@ -377,7 +377,7 @@ dependencies = [ "ethcore-util 1.3.0", "jsonrpc-core 2.0.7 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "parity-dapps-signer 0.2.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps-signer 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "ws 0.5.0 (git+https://github.com/ethcore/ws-rs.git?branch=stable)", @@ -882,8 +882,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "parity-dapps" -version = "0.3.0" -source = "git+https://github.com/ethcore/parity-ui.git#f16a7e8b7f1ea4fe4da12af22f36a745a07513d6" +version = "0.6.0" +source = "git+https://github.com/ethcore/parity-ui.git#fb88ca259fa8eda6e54d9a04b325abd9eec2818b" dependencies = [ "aster 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", @@ -896,34 +896,34 @@ dependencies = [ [[package]] name = "parity-dapps-home" -version = "0.5.2" -source = "git+https://github.com/ethcore/parity-ui.git#f16a7e8b7f1ea4fe4da12af22f36a745a07513d6" +version = "0.6.0" +source = "git+https://github.com/ethcore/parity-ui.git#fb88ca259fa8eda6e54d9a04b325abd9eec2818b" dependencies = [ - "parity-dapps 0.3.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", ] [[package]] name = "parity-dapps-signer" -version = "0.2.0" -source = "git+https://github.com/ethcore/parity-ui.git#f16a7e8b7f1ea4fe4da12af22f36a745a07513d6" +version = "0.6.0" +source = "git+https://github.com/ethcore/parity-ui.git#fb88ca259fa8eda6e54d9a04b325abd9eec2818b" dependencies = [ - "parity-dapps 0.3.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", ] [[package]] name = "parity-dapps-status" -version = "0.5.1" -source = "git+https://github.com/ethcore/parity-ui.git#f16a7e8b7f1ea4fe4da12af22f36a745a07513d6" +version = "0.6.0" +source = "git+https://github.com/ethcore/parity-ui.git#fb88ca259fa8eda6e54d9a04b325abd9eec2818b" dependencies = [ - "parity-dapps 0.3.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", ] [[package]] name = "parity-dapps-wallet" -version = "0.6.1" -source = "git+https://github.com/ethcore/parity-ui.git#f16a7e8b7f1ea4fe4da12af22f36a745a07513d6" +version = "0.6.0" +source = "git+https://github.com/ethcore/parity-ui.git#fb88ca259fa8eda6e54d9a04b325abd9eec2818b" dependencies = [ - "parity-dapps 0.3.0 (git+https://github.com/ethcore/parity-ui.git)", + "parity-dapps 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index a4de88a277f..9feb18e089b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,7 +51,9 @@ version = "0.8" default-features = false [features] -default = ["dapps", "ethcore-signer/ui"] +default = ["ui", "use-precompiled-js"] +ui = ["dapps", "ethcore-signer/ui"] +use-precompiled-js = ["ethcore-dapps/use-precompiled-js", "ethcore-signer/use-precompiled-js"] dapps = ["ethcore-dapps"] dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "ethcore-rpc/dev", "ethcore-dapps/dev", "ethcore-signer/dev"] diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml index e3fc61af81a..7d2054ed1b4 100644 --- a/dapps/Cargo.toml +++ b/dapps/Cargo.toml @@ -21,11 +21,11 @@ serde_json = "0.7.0" serde_macros = { version = "0.7.0", optional = true } ethcore-rpc = { path = "../rpc" } ethcore-util = { path = "../util" } -parity-dapps = { git = "https://github.com/ethcore/parity-ui.git", version = "0.3" } +parity-dapps = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6" } # List of apps -parity-dapps-status = { git = "https://github.com/ethcore/parity-ui.git", version = "0.5.1" } -parity-dapps-home = { git = "https://github.com/ethcore/parity-ui.git", version = "0.5.2" } -parity-dapps-wallet = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6.0", optional = true } +parity-dapps-status = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6" } +parity-dapps-home = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6" } +parity-dapps-wallet = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6", optional = true } mime_guess = { version = "1.6.1" } clippy = { version = "0.0.79", optional = true} @@ -38,3 +38,9 @@ default = ["serde_codegen", "extra-dapps"] extra-dapps = ["parity-dapps-wallet"] nightly = ["serde_macros"] dev = ["clippy", "ethcore-rpc/dev", "ethcore-util/dev"] + +use-precompiled-js = [ + "parity-dapps-status/use-precompiled-js", + "parity-dapps-home/use-precompiled-js", + "parity-dapps-wallet/use-precompiled-js" +] diff --git a/scripts/cov.sh b/scripts/cov.sh index 1a189e2ead3..49ef97c090e 100755 --- a/scripts/cov.sh +++ b/scripts/cov.sh @@ -21,7 +21,7 @@ if ! type $KCOV > /dev/null; then fi . ./scripts/targets.sh -cargo test $TARGETS --no-default-features --no-run || exit $? +cargo test $TARGETS --no-run || exit $? diff --git a/scripts/doc.sh b/scripts/doc.sh index 3ab3d975c5c..657f47567d1 100755 --- a/scripts/doc.sh +++ b/scripts/doc.sh @@ -3,5 +3,5 @@ . ./scripts/targets.sh -cargo doc --no-deps --verbose --no-default-features $TARGETS && +cargo doc --no-deps --verbose $TARGETS && echo '' > target/doc/index.html diff --git a/scripts/targets.sh b/scripts/targets.sh index e159fbfdfbf..ee743f840f7 100644 --- a/scripts/targets.sh +++ b/scripts/targets.sh @@ -1,14 +1,14 @@ #!/bin/bash export TARGETS=" - -p ethkey \ - -p ethstore \ + -p bigint\ -p ethash \ - -p ethcore-util \ -p ethcore \ - -p ethsync \ + -p ethcore-dapps \ -p ethcore-rpc \ -p ethcore-signer \ - -p parity \ - -p bigint" -# TODO [ToDr] add ethcore-dapps back + -p ethcore-util \ + -p ethkey \ + -p ethstore \ + -p ethsync \ + -p parity" diff --git a/signer/Cargo.toml b/signer/Cargo.toml index f2a7af58aa5..2bee45bb0bc 100644 --- a/signer/Cargo.toml +++ b/signer/Cargo.toml @@ -18,10 +18,11 @@ env_logger = "0.3" ws = { git = "https://github.com/ethcore/ws-rs.git", branch = "stable" } ethcore-util = { path = "../util" } ethcore-rpc = { path = "../rpc" } -parity-dapps-signer = { git = "https://github.com/ethcore/parity-ui.git", version = "0.2.0", optional = true} +parity-dapps-signer = { git = "https://github.com/ethcore/parity-ui.git", version = "0.6", optional = true} clippy = { version = "0.0.79", optional = true} [features] dev = ["clippy"] ui = ["parity-dapps-signer"] +use-precompiled-js = ["parity-dapps-signer/use-precompiled-js"] diff --git a/test.sh b/test.sh index 15090434dc1..af51fd3fde3 100755 --- a/test.sh +++ b/test.sh @@ -14,5 +14,5 @@ case $1 in esac . ./scripts/targets.sh -cargo test --no-default-features $FEATURES $TARGETS $1 \ +cargo test --release --verbose $FEATURES $TARGETS $1 \