Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-29 06:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #2336

Browse source 
2336: Remove npm.cmd r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-11-20 20:28:00 +00:00 committed by GitHub
commit 612a72fc4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xtask/src/main.rs
View file

@ -173,7 +173,7 @@ fn fix_path_for_mac() -> Result<()> {
fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> { fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
let npm_version = Cmd { let npm_version = Cmd {
unix: r"npm --version", unix: r"npm --version",
windows: r"cmd.exe /c npm.cmd --version", windows: r"cmd.exe /c npm --version",
work_dir: "./editors/code", work_dir: "./editors/code",
} }
.run(); .run();
@ -182,10 +182,10 @@ fn install_client(ClientOpt::VsCode: ClientOpt) -> Result<()> {
eprintln!("\nERROR: `npm --version` failed, `npm` is required to build the VS Code plugin") eprintln!("\nERROR: `npm --version` failed, `npm` is required to build the VS Code plugin")
} }
Cmd { unix: r"npm ci", windows: r"cmd.exe /c npm.cmd ci", work_dir: "./editors/code" }.run()?; Cmd { unix: r"npm ci", windows: r"cmd.exe /c npm ci", work_dir: "./editors/code" }.run()?;
Cmd { Cmd {
unix: r"npm run package --scripts-prepend-node-path", unix: r"npm run package --scripts-prepend-node-path",
windows: r"cmd.exe /c npm.cmd run package", windows: r"cmd.exe /c npm run package",
work_dir: "./editors/code", work_dir: "./editors/code",
} }
.run()?; .run()?;