Skip to content

Commit c6a8977

Browse files
aminyaaminya
authored
Merge pull request #79 from aminya/faster-pwsh [skip ci]
2 parents 0286b4c + 7e3e265 commit c6a8977

File tree

24 files changed

+111
-94
lines changed

24 files changed

+111
-94
lines changed

‎dist/setup_cpp.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/setup_cpp.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/__tests__/main.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe("getCompilerInfo", () => {
2323
})
2424

2525
describe("syncVersion", () => {
26-
it("Syncs llvm tools versions", async () => {
26+
it("Syncs llvm tools versions", () => {
2727
const llvmTools = ["llvm", "clangtidy", "clangformat"] as Inputs[]
2828
expect(syncVersions(parseArgs(["--llvm", "14.0.0", "--clangtidy", "true"]), llvmTools)).toBe(true)
2929
expect(syncVersions(parseArgs(["--llvm", "13.0.0", "--clangtidy", "true"]), llvmTools)).toBe(true)

‎src/chocolatey/chocolatey.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ import { InstallationInfo } from "../utils/setup/setupBin"
88

99
let binDir: string | undefined
1010

11-
export function setupChocolatey(
11+
export async function setupChocolatey(
1212
// eslint-disable-next-line @typescript-eslint/no-unused-vars
1313
_version: string,
1414
// eslint-disable-next-line @typescript-eslint/no-unused-vars
1515
_setupDir: string,
1616
// eslint-disable-next-line @typescript-eslint/no-unused-vars
1717
_arch: string
18-
): InstallationInfo | undefined {
18+
): Promise<InstallationInfo | undefined> {
1919
if (process.platform !== "win32") {
2020
return undefined
2121
}
@@ -54,7 +54,7 @@ export function setupChocolatey(
5454
)
5555

5656
const chocoPath = `${process.env.ALLUSERSPROFILE}\\chocolatey\\bin`
57-
addPath(chocoPath)
57+
await addPath(chocoPath)
5858

5959
const maybeChoco = which.sync("choco", { nothrow: true })
6060
if (maybeChoco !== null) {

‎src/cppcheck/cppcheck.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export async function setupCppcheck(version: string | undefined, _setupDir: stri
88
switch (process.platform) {
99
case "win32": {
1010
await setupChocoPack("cppcheck", version)
11-
const binDir = activateWinCppcheck()
11+
const binDir = await activateWinCppcheck()
1212
return { binDir }
1313
}
1414
case "darwin": {
@@ -23,8 +23,8 @@ export async function setupCppcheck(version: string | undefined, _setupDir: stri
2323
}
2424
}
2525

26-
function activateWinCppcheck() {
26+
async function activateWinCppcheck() {
2727
const binDir = "C:/Program Files/Cppcheck"
28-
addPath(binDir)
28+
await addPath(binDir)
2929
return binDir
3030
}

‎src/doxygen/doxygen.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export async function setupDoxygen(version: string, setupDir: string, arch: stri
4343
switch (process.platform) {
4444
case "win32": {
4545
await setupChocoPack("doxygen.install", version)
46-
const binDir = activateWinDoxygen()
46+
const binDir = await activateWinDoxygen()
4747
const installationInfo = { binDir }
4848
await setupGraphviz(getVersion("graphviz", undefined), "", arch)
4949
return installationInfo
@@ -72,7 +72,7 @@ export async function setupDoxygen(version: string, setupDir: string, arch: stri
7272
}
7373
}
7474

75-
function activateWinDoxygen() {
75+
async function activateWinDoxygen() {
7676
switch (process.platform) {
7777
case "win32": {
7878
for (const binDir of [
@@ -81,7 +81,8 @@ function activateWinDoxygen() {
8181
"C:/Program Files (x86)/doxygen",
8282
]) {
8383
if (existsSync(binDir)) {
84-
addPath(binDir)
84+
// eslint-disable-next-line no-await-in-loop
85+
await addPath(binDir)
8586
return binDir
8687
}
8788
}

‎src/gcc/gcc.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ export async function setupGcc(version: string, _setupDir: string, arch: string)
2121
await setupChocoPack("mingw", version)
2222
if (arch === "x64" && existsSync("C:/tools/mingw64/bin")) {
2323
binDir = "C:/tools/mingw64/bin"
24-
addPath(binDir)
24+
await addPath(binDir)
2525
} else if (arch === "ia32" && existsSync("C:/tools/mingw32/bin")) {
2626
binDir = "C:/tools/mingw32/bin"
27-
addPath(binDir)
27+
await addPath(binDir)
2828
} else if (existsSync(`${process.env.ChocolateyInstall ?? "C:/ProgramData/chocolatey"}/bin/g++.exe`)) {
2929
binDir = `${process.env.ChocolateyInstall ?? "C:/ProgramData/chocolatey"}/bin`
3030
}
@@ -72,19 +72,19 @@ async function activateGcc(version: string, binDir: string) {
7272
// const ld = process.env.LD_LIBRARY_PATH ?? ""
7373
// const dyld = process.env.DYLD_LIBRARY_PATH ?? ""
7474
// // Setup gcc as the compiler
75-
// addEnv("LD_LIBRARY_PATH", `${installDir}/lib${path.delimiter}${ld}`)
76-
// addEnv("DYLD_LIBRARY_PATH", `${installDir}/lib${path.delimiter}${dyld}`)
77-
// addEnv("CPATH", `${installDir}/lib/gcc/${majorVersion}/include`)
78-
// addEnv("LDFLAGS", `-L${installDir}/lib`)
79-
// addEnv("CPPFLAGS", `-I${installDir}/include`)
75+
// await addEnv("LD_LIBRARY_PATH", `${installDir}/lib${path.delimiter}${ld}`)
76+
// await addEnv("DYLD_LIBRARY_PATH", `${installDir}/lib${path.delimiter}${dyld}`)
77+
// await addEnv("CPATH", `${installDir}/lib/gcc/${majorVersion}/include`)
78+
// await addEnv("LDFLAGS", `-L${installDir}/lib`)
79+
// await addEnv("CPPFLAGS", `-I${installDir}/include`)
8080
if (process.platform === "win32") {
81-
addEnv("CC", `${binDir}/gcc`)
82-
addEnv("CXX", `${binDir}/g++`)
81+
await addEnv("CC", `${binDir}/gcc`)
82+
await addEnv("CXX", `${binDir}/g++`)
8383
} else {
8484
const majorVersion = semverMajor(semverCoerce(version) ?? version)
8585
if (majorVersion >= 5) {
86-
addEnv("CC", `${binDir}/gcc-${majorVersion}`)
87-
addEnv("CXX", `${binDir}/g++-${majorVersion}`)
86+
await addEnv("CC", `${binDir}/gcc-${majorVersion}`)
87+
await addEnv("CXX", `${binDir}/g++-${majorVersion}`)
8888

8989
if (process.platform === "linux") {
9090
await updateAptAlternatives("cc", `${binDir}/gcc-${majorVersion}`)
@@ -93,8 +93,8 @@ async function activateGcc(version: string, binDir: string) {
9393
await updateAptAlternatives("g++", `${binDir}/g++-${majorVersion}`)
9494
}
9595
} else {
96-
addEnv("CC", `${binDir}/gcc-${version}`)
97-
addEnv("CXX", `${binDir}/g++-${version}`)
96+
await addEnv("CC", `${binDir}/gcc-${version}`)
97+
await addEnv("CXX", `${binDir}/g++-${version}`)
9898

9999
if (process.platform === "linux") {
100100
await updateAptAlternatives("cc", `${binDir}/gcc-${version}`)

‎src/graphviz/graphviz.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import { setupBrewPack } from "../utils/setup/setupBrewPack"
55
import { setupChocoPack } from "../utils/setup/setupChocoPack"
66

77
// eslint-disable-next-line @typescript-eslint/no-unused-vars
8-
export function setupGraphviz(version: string, _setupDir: string, _arch: string) {
8+
export async function setupGraphviz(version: string, _setupDir: string, _arch: string) {
99
switch (process.platform) {
1010
case "win32": {
11-
setupChocoPack("graphviz", version)
11+
await setupChocoPack("graphviz", version)
1212
return activateGraphviz()
1313
}
1414
case "darwin": {
@@ -23,11 +23,11 @@ export function setupGraphviz(version: string, _setupDir: string, _arch: string)
2323
}
2424
}
2525

26-
function activateGraphviz(): InstallationInfo {
26+
async function activateGraphviz(): Promise<InstallationInfo> {
2727
switch (process.platform) {
2828
case "win32": {
2929
const binDir = "C:/Program Files/Graphviz/bin"
30-
addPath(binDir)
30+
await addPath(binDir)
3131
return { binDir }
3232
}
3333
default: {

‎src/llvm/llvm.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -301,29 +301,29 @@ export async function activateLLVM(directory: string, versionGiven: string) {
301301
const ld = process.env.LD_LIBRARY_PATH ?? ""
302302
const dyld = process.env.DYLD_LIBRARY_PATH ?? ""
303303

304-
addEnv("LLVM_PATH", directory) // the output of this action
304+
await addEnv("LLVM_PATH", directory) // the output of this action
305305

306306
// Setup LLVM as the compiler
307-
addEnv("LD_LIBRARY_PATH", `${lib}${path.delimiter}${ld}`)
308-
addEnv("DYLD_LIBRARY_PATH", `${lib}${path.delimiter}${dyld}`)
307+
await addEnv("LD_LIBRARY_PATH", `${lib}${path.delimiter}${ld}`)
308+
await addEnv("DYLD_LIBRARY_PATH", `${lib}${path.delimiter}${dyld}`)
309309

310310
// windows builds fail with llvm's CPATH
311311
if (process.platform !== "win32") {
312312
const llvmMajor = semverMajor(version)
313313
if (existsSync(`${directory}/lib/clang/${version}/include`)) {
314-
addEnv("CPATH", `${directory}/lib/clang/${version}/include`)
314+
await addEnv("CPATH", `${directory}/lib/clang/${version}/include`)
315315
} else if (existsSync(`${directory}/lib/clang/${llvmMajor}/include`)) {
316-
addEnv("CPATH", `${directory}/lib/clang/${llvmMajor}/include`)
316+
await addEnv("CPATH", `${directory}/lib/clang/${llvmMajor}/include`)
317317
}
318318
}
319319

320-
addEnv("LDFLAGS", `-L"${directory}/lib"`)
321-
addEnv("CPPFLAGS", `-I"${directory}/include"`)
320+
await addEnv("LDFLAGS", `-L"${directory}/lib"`)
321+
await addEnv("CPPFLAGS", `-I"${directory}/include"`)
322322

323-
addEnv("CC", `${directory}/bin/clang`)
324-
addEnv("CXX", `${directory}/bin/clang++`)
323+
await addEnv("CC", `${directory}/bin/clang`)
324+
await addEnv("CXX", `${directory}/bin/clang++`)
325325

326-
addEnv("LIBRARY_PATH", `${directory}/lib`)
326+
await addEnv("LIBRARY_PATH", `${directory}/lib`)
327327

328328
await setupMacOSSDK()
329329

‎src/macos-sdk/macos-sdk.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export async function setupMacOSSDK() {
88
const xcrun = await getExecOutput("xcrun --sdk macosx --show-sdk-path")
99
const sdkroot = xcrun.stdout || xcrun.stderr
1010
if (sdkroot) {
11-
addEnv("SDKROOT", sdkroot.trim())
11+
await addEnv("SDKROOT", sdkroot.trim())
1212
} else {
1313
error(`SDKROOT not set`)
1414
}

0 commit comments

Comments
 (0)