aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-27 21:02:26 +0100
committerbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-27 21:02:26 +0100
commitde278d164906d6d29974790c5a4db28303692484 (patch)
treecc09d9554a015aaf27a7caf6a60e6994f4b4f58b /crates
parent442072d746c06c61923d85b8e33f4201a7bd57ab (diff)
parente29cbcbedd9586707d46e82a32c553e0a95632da (diff)
Merge #1599
1599: it's a good idea to build extension before installing it r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_tools/src/main.rs8
1 files changed, 7 insertions, 1 deletions
diff --git a/crates/ra_tools/src/main.rs b/crates/ra_tools/src/main.rs
index 59d4ea6d3..4fcb2adeb 100644
--- a/crates/ra_tools/src/main.rs
+++ b/crates/ra_tools/src/main.rs
@@ -27,7 +27,7 @@ fn main() -> Result<()> {
27 .subcommand( 27 .subcommand(
28 SubCommand::with_name("install-ra") 28 SubCommand::with_name("install-ra")
29 .arg(Arg::with_name("server").long("--server")) 29 .arg(Arg::with_name("server").long("--server"))
30 .arg(Arg::with_name("jemalloc").long("jemalloc").requires("server")) 30 .arg(Arg::with_name("jemalloc").long("jemalloc"))
31 .arg(Arg::with_name("client-code").long("client-code").conflicts_with("server")), 31 .arg(Arg::with_name("client-code").long("client-code").conflicts_with("server")),
32 ) 32 )
33 .alias("install-code") 33 .alias("install-code")
@@ -107,6 +107,12 @@ fn fix_path_for_mac() -> Result<()> {
107 107
108fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> { 108fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
109 Cmd { unix: r"npm ci", windows: r"cmd.exe /c npm.cmd ci", work_dir: "./editors/code" }.run()?; 109 Cmd { unix: r"npm ci", windows: r"cmd.exe /c npm.cmd ci", work_dir: "./editors/code" }.run()?;
110 Cmd {
111 unix: r"npm run package",
112 windows: r"cmd.exe /c npm.cmd run package",
113 work_dir: "./editors/code",
114 }
115 .run()?;
110 116
111 let code_in_path = Cmd { 117 let code_in_path = Cmd {
112 unix: r"code --version", 118 unix: r"code --version",