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

dapps/Cargo.toml

@@ -20,17 +20,17 @@ url = "1.0"
 rustc-serialize = "0.3"
 serde = "0.8"
 serde_json = "0.8"
-serde_macros = { version = "0.8", optional = true }
-zip = { version = "0.1", default-features = false }
 ethabi = "0.2.2"
 linked-hash-map = "0.3"
+parity-dapps-glue = "1.4"
 mime = "0.2"
+serde_macros = { version = "0.8", optional = true }
+zip = { version = "0.1", default-features = false }
 ethcore-devtools = { path = "../devtools" }
 ethcore-rpc = { path = "../rpc" }
 ethcore-util = { path = "../util" }
 fetch = { path = "../util/fetch" }
 parity-ui = { path = "./ui" }
-parity-dapps-glue = { path = "./js-glue" }
 
 mime_guess = { version = "1.6.1" }
 clippy = { version = "0.0.90", optional = true}
@@ -43,4 +43,5 @@ default = ["serde_codegen"]
 nightly = ["serde_macros"]
 dev = ["clippy", "ethcore-rpc/dev", "ethcore-util/dev"]
 
-use-precompiled-js = ["parity-ui/use-precompiled-js"]
+ui = ["parity-ui/no-precompiled-js"]
+ui-precompiled = ["parity-ui/use-precompiled-js"]

dapps/js-glue/src/js.rs

@@ -53,11 +53,11 @@ fn die<T : fmt::Debug>(s: &'static str, e: T) -> ! {
 pub fn test(_path: &str) {
 }
 #[cfg(feature = "use-precompiled-js")]
-pub fn build(_path: &str) {
+pub fn build(_path: &str, _dest: &str) {
 }
 
 #[cfg(not(feature = "use-precompiled-js"))]
-pub fn build(path: &str) {
+pub fn build(path: &str, dest: &str) {
 	let child = platform::handle_fd(&mut Command::new(platform::NPM_CMD))
 		.arg("install")
 		.arg("--no-progress")
@@ -70,7 +70,7 @@ pub fn build(path: &str) {
 		.arg("run")
 		.arg("build")
 		.env("NODE_ENV", "production")
-		.env("BUILD_DEST", "build")
+		.env("BUILD_DEST", dest)
 		.current_dir(path)
 		.status()
 		.unwrap_or_else(|e| die("Building JS code", e));

dapps/ui/Cargo.toml

@@ -1,19 +1,18 @@
 [package]
-description = "Parity built-in dapps."
+description = "Ethcore Parity UI"
+homepage = "http://ethcore.io"
+license = "GPL-3.0"
 name = "parity-ui"
 version = "1.4.0"
-license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
-build = "build.rs"
-
-[features]
-default = ["with-syntex"]
-use-precompiled-js = ["parity-dapps-glue/use-precompiled-js"]
-with-syntex = ["parity-dapps-glue/with-syntex"]
 
 [build-dependencies]
-parity-dapps-glue = { path = "../js-glue" }
+rustc_version = "0.1"
 
 [dependencies]
-parity-dapps-glue = { path = "../js-glue" }
+parity-ui-dev = { path = "../../js", optional = true }
+parity-ui-precompiled = { git = "https://github.com/ethcore/js-precompiled.git", optional = true }
 
+[features]
+no-precompiled-js = ["parity-ui-dev"]
+use-precompiled-js = ["parity-ui-precompiled"]

dapps/ui/build.rs

@@ -1,22 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate parity_dapps_glue;
-
-fn main() {
-	parity_dapps_glue::js::build(concat!(env!("CARGO_MANIFEST_DIR"), "/../../js"));
-	parity_dapps_glue::generate();
-}

dapps/ui/src/lib.rs

@@ -14,9 +14,20 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-#[cfg(feature = "with-syntex")]
-include!(concat!(env!("OUT_DIR"), "/lib.rs"));
 
-#[cfg(not(feature = "with-syntex"))]
-include!("lib.rs.in");
+#[cfg(feature = "parity-ui-dev")]
+mod inner {
+	extern crate parity_ui_dev;
 
+	pub use self::parity_ui_dev::*;
+}
+
+#[cfg(feature = "parity-ui-precompiled")]
+mod inner {
+	extern crate parity_ui_precompiled;
+
+	pub use self::parity_ui_precompiled::*;
+}
+
+
+pub use self::inner::*;

dapps/ui/src/lib.rs.in

@@ -1,55 +0,0 @@
-// Copyright 2015, 2016 Ethcore (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-extern crate parity_dapps_glue;
-
-use std::collections::HashMap;
-use parity_dapps_glue::{WebApp, File, Info};
-
-#[derive(WebAppFiles)]
-#[webapp(path = "../../../js/build")]
-pub struct App {
-	pub files: HashMap<&'static str, File>,
-}
-
-impl Default for App {
-	fn default() -> App {
-		App {
-			files: Self::files(),
-		}
-	}
-}
-
-impl WebApp for App {
-	fn file(&self, path: &str) -> Option<&File> {
-		self.files.get(path)
-	}
-
-	fn info(&self) -> Info {
-		Info {
-			name: "Parity UI",
-			version: env!("CARGO_PKG_VERSION"),
-			author: "Ethcore <admin@ethcore.io>",
-			description: "New UI for Parity. (Experimental)",
-			icon_url: "icon.png",
-		}
-	}
-}
-
-#[test]
-fn test_js() {
-	parity_dapps_glue::js::build(concat!(env!("CARGO_MANIFEST_DIR"), "/../../js"));
-}