grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix js-glue.

Browse Source
This commit is contained in:
Tomasz Drwięga 2017-11-10 10:18:20 +01:00
parent 73d195ab79
commit 6ab03412ea
No known key found for this signature in database
GPG Key ID: D066F497E62CAF66
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Cargo.lock generated
View File

@ -2001,6 +2001,20 @@ dependencies = [
[[package]] [[package]]
name = "parity-dapps-glue" name = "parity-dapps-glue"
version = "1.9.0" version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "parity-dapps-glue"
version = "1.9.1"
dependencies = [ dependencies = [
"aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)",
"clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2013,20 +2027,6 @@ dependencies = [
"syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "parity-dapps-glue"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
"syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "parity-hash-fetch" name = "parity-hash-fetch"
version = "1.9.0" version = "1.9.0"

2
dapps/js-glue/Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
description = "Base Package for all Parity built-in dapps" description = "Base Package for all Parity built-in dapps"
name = "parity-dapps-glue" name = "parity-dapps-glue"
version = "1.9.0" version = "1.9.1"
license = "GPL-3.0" license = "GPL-3.0"
authors = ["Parity Technologies <admin@parity.io>"] authors = ["Parity Technologies <admin@parity.io>"]
build = "build.rs" build = "build.rs"

18
dapps/js-glue/src/js.rs
View File

@ -25,7 +25,7 @@ mod platform {
use std::process::Command; use std::process::Command;
pub static NPM_CMD: &'static str = "npm"; pub static NPM_CMD: &'static str = "npm";
pub fn handle_fd(cmd: &mut Command) -> &mut Command { pub fn handle_cmd(cmd: &mut Command) -> &mut Command {
cmd cmd
} }
} }
@ -34,14 +34,14 @@ mod platform {
mod platform { mod platform {
use std::process::{Command, Stdio}; use std::process::{Command, Stdio};
pub static NPM_CMD: &'static str = "npm.cmd"; pub static NPM_CMD: &'static str = "cmd.exe";
// NOTE [ToDr] For some reason on windows // NOTE [ToDr] For some reason on windows
// We cannot have any file descriptors open when running a child process // The command doesn't have %~dp0 set properly
// during build phase. // and it cannot load globally installed node.exe
pub fn handle_fd(cmd: &mut Command) -> &mut Command { pub fn handle_cmd(cmd: &mut Command) -> &mut Command {
cmd.stdin(Stdio::null()) cmd.stdin(Stdio::null())
.stdout(Stdio::null()) .arg("/c")
.stderr(Stdio::null()) .arg("npm.cmd")
} }
} }
@ -58,7 +58,7 @@ pub fn build(_path: &str, _dest: &str) {
#[cfg(not(feature = "use-precompiled-js"))] #[cfg(not(feature = "use-precompiled-js"))]
pub fn build(path: &str, dest: &str) { pub fn build(path: &str, dest: &str) {
let child = platform::handle_fd(&mut Command::new(platform::NPM_CMD)) let child = platform::handle_cmd(&mut Command::new(platform::NPM_CMD))
.arg("install") .arg("install")
.arg("--no-progress") .arg("--no-progress")
.current_dir(path) .current_dir(path)
@ -66,7 +66,7 @@ pub fn build(path: &str, dest: &str) {
.unwrap_or_else(|e| die("Installing node.js dependencies with npm", e)); .unwrap_or_else(|e| die("Installing node.js dependencies with npm", e));
assert!(child.success(), "There was an error installing dependencies."); assert!(child.success(), "There was an error installing dependencies.");
let child = platform::handle_fd(&mut Command::new(platform::NPM_CMD)) let child = platform::handle_cmd(&mut Command::new(platform::NPM_CMD))
.arg("run") .arg("run")
.arg("build") .arg("build")
.env("NODE_ENV", "production") .env("NODE_ENV", "production")