Removing submodule in favour of rust crate (#2756)

* Removing submodule

* Fixing UI dependency structure.

* Merging RS and JS package

* Updating release script to push also rs files

* fix merge gone wrong

* Fixing compilation
This commit is contained in:
Tomasz Drwięga
2016-10-22 20:07:12 +02:00
committed by Arkadiy Paronyan
parent 20591e882e
commit aca82fb84b
18 changed files with 158 additions and 62 deletions

View File

@@ -24,7 +24,7 @@ use std::str::FromStr;
use jsonrpc_core::IoHandler;
use util::{H256, Mutex, version};
#[cfg(feature = "ui")]
#[cfg(feature = "parity-ui")]
mod ui {
extern crate parity_ui as ui;
extern crate parity_dapps_glue as dapps;
@@ -46,7 +46,7 @@ mod ui {
}
}
}
#[cfg(not(feature = "ui"))]
#[cfg(not(feature = "parity-ui"))]
mod ui {
pub struct File {
pub content: &'static [u8],