UI feature
This commit is contained in:
parent
11cae70cdd
commit
29076da4b7
@ -29,13 +29,13 @@ ethsync = { path = "sync" }
|
||||
ethcore-devtools = { path = "devtools" }
|
||||
ethcore-rpc = { path = "rpc" }
|
||||
ethcore-signer = { path = "signer" }
|
||||
ethcore-dapps = { path = "dapps", optional = true }
|
||||
semver = "0.2"
|
||||
ethcore-ipc-nano = { path = "ipc/nano" }
|
||||
ethcore-ipc = { path = "ipc/rpc" }
|
||||
ethcore-ipc-hypervisor = { path = "ipc/hypervisor" }
|
||||
json-ipc-server = { git = "https://github.com/ethcore/json-ipc-server.git" }
|
||||
ansi_term = "0.7"
|
||||
ethcore-dapps = { path = "dapps", optional = true }
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
winapi = "0.2"
|
||||
@ -48,8 +48,7 @@ version = "0.8"
|
||||
default-features = false
|
||||
|
||||
[features]
|
||||
default = ["dapps"]
|
||||
no-ui = ["ethcore-signer/no-ui"]
|
||||
default = ["dapps", "ethcore-signer/ui"]
|
||||
dapps = ["ethcore-dapps"]
|
||||
dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "ethcore-rpc/dev",
|
||||
"ethcore-dapps/dev", "ethcore-signer/dev"]
|
||||
|
@ -561,7 +561,7 @@ impl Configuration {
|
||||
}
|
||||
|
||||
pub fn dapps_enabled(&self) -> bool {
|
||||
!self.args.flag_dapps_off && !self.args.flag_no_dapps && cfg!(not(feature = "no-ui"))
|
||||
!self.args.flag_dapps_off && !self.args.flag_no_dapps && cfg!(feature = "dapps")
|
||||
}
|
||||
|
||||
pub fn signer_enabled(&self) -> bool {
|
||||
|
@ -21,9 +21,9 @@ use util::panics::PanicHandler;
|
||||
use die::*;
|
||||
use rpc_apis;
|
||||
|
||||
#[cfg(all(feature = "dapps", not(feature = "no-ui")))]
|
||||
#[cfg(feature = "dapps")]
|
||||
pub use ethcore_dapps::Server as WebappServer;
|
||||
#[cfg(any(not(feature = "dapps"), feature = "no-ui"))]
|
||||
#[cfg(not(feature = "dapps"))]
|
||||
pub struct WebappServer;
|
||||
|
||||
pub struct Configuration {
|
||||
@ -62,7 +62,7 @@ pub fn new(configuration: Configuration, deps: Dependencies) -> Option<WebappSer
|
||||
Some(setup_dapps_server(deps, configuration.dapps_path, &addr, auth))
|
||||
}
|
||||
|
||||
#[cfg(any(not(feature = "dapps"), feature = "no-ui"))]
|
||||
#[cfg(not(feature = "dapps"))]
|
||||
pub fn setup_dapps_server(
|
||||
_deps: Dependencies,
|
||||
_dapps_path: String,
|
||||
@ -72,7 +72,7 @@ pub fn setup_dapps_server(
|
||||
die!("Your Parity version has been compiled without WebApps support.")
|
||||
}
|
||||
|
||||
#[cfg(all(feature = "dapps", not(feature = "no-ui")))]
|
||||
#[cfg(feature = "dapps")]
|
||||
pub fn setup_dapps_server(
|
||||
deps: Dependencies,
|
||||
dapps_path: String,
|
||||
|
@ -51,7 +51,7 @@ extern crate ethcore_rpc;
|
||||
extern crate ethcore_signer;
|
||||
extern crate ansi_term;
|
||||
|
||||
#[cfg(all(feature = "dapps", not(feature = "no-ui")))]
|
||||
#[cfg(feature = "dapps")]
|
||||
extern crate ethcore_dapps;
|
||||
|
||||
#[macro_use]
|
||||
|
@ -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" }
|
||||
parity-dapps-signer = { git = "https://github.com/ethcore/parity-ui.git", version = "0.2.0", optional = true}
|
||||
|
||||
clippy = { version = "0.0.79", optional = true}
|
||||
|
||||
[features]
|
||||
default = ["ui"]
|
||||
dev = ["clippy"]
|
||||
no-ui = []
|
||||
ui = ["parity-dapps-signer"]
|
||||
|
@ -51,7 +51,7 @@ extern crate ethcore_util as util;
|
||||
extern crate ethcore_rpc as rpc;
|
||||
extern crate jsonrpc_core;
|
||||
extern crate ws;
|
||||
#[cfg(not(feature = "no-ui"))]
|
||||
#[cfg(feature = "ui")]
|
||||
extern crate parity_dapps_signer as signer;
|
||||
|
||||
mod authcode_store;
|
||||
|
@ -24,7 +24,7 @@ use std::str::FromStr;
|
||||
use jsonrpc_core::IoHandler;
|
||||
use util::H256;
|
||||
|
||||
#[cfg(not(feature = "no-ui"))]
|
||||
#[cfg(feature = "ui")]
|
||||
mod signer {
|
||||
use signer;
|
||||
|
||||
@ -32,7 +32,7 @@ mod signer {
|
||||
signer::handle(req)
|
||||
}
|
||||
}
|
||||
#[cfg(feature = "no-ui")]
|
||||
#[cfg(not(feature = "ui"))]
|
||||
mod signer {
|
||||
pub struct File {
|
||||
pub content: String,
|
||||
|
Loading…
Reference in New Issue
Block a user