Merge pull request #1627 from ethcore/new-ui

Re-enabling Parity UI
openethereum · Jul 18, 2016 · 3d00a91 · 3d00a91
2 parents dd17c76 + 3005b39
commit 3d00a91
Show file tree

Hide file tree

Showing 9 changed files with 44 additions and 37 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -3,5 +3,5 @@
 
 . ./scripts/targets.sh
 
-cargo doc --no-deps --verbose --no-default-features $TARGETS &&
+cargo doc --no-deps --verbose $TARGETS &&
 	echo '<meta http-equiv=refresh content=0;url=ethcore/index.html>' > target/doc/index.html
diff --git 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
@@ -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
@@ -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 \
-Original file line number
+Diff line change
@@ Expand Up / @@ -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 $?
@@ Expand Down @@