OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

Fix yarn task for windows

Browse Source
This commit is contained in:
Kyle Carberry 2019-02-27 22:28:46 -06:00
parent 83b64365ba
commit e6689f3501
No known key found for this signature in database
GPG Key ID: A0409BDB6B0B3EDB
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/tasks.ts
View File

@ -5,6 +5,7 @@ import * as os from "os";
import * as path from "path"; import * as path from "path";
import * as zlib from "zlib"; import * as zlib from "zlib";
const isWin = os.platform() === "win32";
const libPath = path.join(__dirname, "../lib"); const libPath = path.join(__dirname, "../lib");
const vscodePath = path.join(libPath, "vscode"); const vscodePath = path.join(libPath, "vscode");
const pkgsPath = path.join(__dirname, "../packages"); const pkgsPath = path.join(__dirname, "../packages");
@ -84,7 +85,7 @@ const buildServerBinaryCopy = register("build:server:binary:copy", async (runner
const nodePtyModule = path.join(pkgsPath, "protocol", "node_modules", "node-pty-prebuilt", "build", "Release", "pty.node"); const nodePtyModule = path.join(pkgsPath, "protocol", "node_modules", "node-pty-prebuilt", "build", "Release", "pty.node");
const spdlogModule = path.join(pkgsPath, "protocol", "node_modules", "spdlog", "build", "Release", "spdlog.node"); const spdlogModule = path.join(pkgsPath, "protocol", "node_modules", "spdlog", "build", "Release", "spdlog.node");
let ripgrepPath = path.join(pkgsPath, "..", "lib", "vscode", "node_modules", "vscode-ripgrep", "bin", "rg"); let ripgrepPath = path.join(pkgsPath, "..", "lib", "vscode", "node_modules", "vscode-ripgrep", "bin", "rg");
if (os.platform() === "win32") { if (isWin) {
ripgrepPath += ".exe"; ripgrepPath += ".exe";
} }
@ -188,7 +189,7 @@ const ensureInstalled = register("vscode:install", async (runner) => {
await ensureCloned(); await ensureCloned();
runner.cwd = vscodePath; runner.cwd = vscodePath;
const install = await runner.execute("yarn", []); const install = await runner.execute(isWin ? "yarn.cmd" : "yarn", []);
if (install.exitCode !== 0) { if (install.exitCode !== 0) {
throw new Error(`Failed to install vscode dependencies: ${install.stderr}`); throw new Error(`Failed to install vscode dependencies: ${install.stderr}`);
} }