diff --git a/.travis.yml b/.travis.yml index b6df14fae..d856086f9 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 ad1eba3a5..92d2d7fc8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -872,7 +872,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "parity-dapps" version = "0.6.0" -source = "git+https://github.com/ethcore/parity-ui.git#7cf424e7a28a76957afd232221fb7395f8565d34" +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)", @@ -886,7 +886,7 @@ dependencies = [ [[package]] name = "parity-dapps-home" version = "0.6.0" -source = "git+https://github.com/ethcore/parity-ui.git#7cf424e7a28a76957afd232221fb7395f8565d34" +source = "git+https://github.com/ethcore/parity-ui.git#fb88ca259fa8eda6e54d9a04b325abd9eec2818b" dependencies = [ "parity-dapps 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", ] @@ -894,7 +894,7 @@ dependencies = [ [[package]] name = "parity-dapps-signer" version = "0.6.0" -source = "git+https://github.com/ethcore/parity-ui.git#7cf424e7a28a76957afd232221fb7395f8565d34" +source = "git+https://github.com/ethcore/parity-ui.git#fb88ca259fa8eda6e54d9a04b325abd9eec2818b" dependencies = [ "parity-dapps 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", ] @@ -902,7 +902,7 @@ dependencies = [ [[package]] name = "parity-dapps-status" version = "0.6.0" -source = "git+https://github.com/ethcore/parity-ui.git#7cf424e7a28a76957afd232221fb7395f8565d34" +source = "git+https://github.com/ethcore/parity-ui.git#fb88ca259fa8eda6e54d9a04b325abd9eec2818b" dependencies = [ "parity-dapps 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", ] @@ -910,7 +910,7 @@ dependencies = [ [[package]] name = "parity-dapps-wallet" version = "0.6.0" -source = "git+https://github.com/ethcore/parity-ui.git#7cf424e7a28a76957afd232221fb7395f8565d34" +source = "git+https://github.com/ethcore/parity-ui.git#fb88ca259fa8eda6e54d9a04b325abd9eec2818b" dependencies = [ "parity-dapps 0.6.0 (git+https://github.com/ethcore/parity-ui.git)", ] diff --git a/Cargo.toml b/Cargo.toml index 77ea5e9c9..5643f8bf2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,7 +50,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 c4726394b..7d2054ed1 100644 --- a/dapps/Cargo.toml +++ b/dapps/Cargo.toml @@ -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/signer/Cargo.toml b/signer/Cargo.toml index d33b9da88..2bee45bb0 100644 --- a/signer/Cargo.toml +++ b/signer/Cargo.toml @@ -25,3 +25,4 @@ 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 15090434d..0de4d758c 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 $FEATURES $TARGETS $1 \