Skip to content

Commit bf5e374

Browse files
authored
Merge pull request #83 from aminya/doxygen-win [skip ci]
fix: fix doxygen installation path on windows
2 parents f1ac436 + 5524077 commit bf5e374

File tree

8 files changed

+22
-14
lines changed

8 files changed

+22
-14
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ temp-*
1515
!./dist/setup_cpp.js
1616
!./dist/setup_cpp.js.map
1717
.parcel-cache
18-
exe
18+
*.log
19+
*.exe

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/doxygen/doxygen.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { notice } from "../utils/io/io"
99
import { setupGraphviz } from "../graphviz/graphviz"
1010
import { getVersion } from "../default_versions"
1111
import { existsSync } from "fs"
12+
import { join } from "path"
1213

1314
/** Get the platform data for cmake */
1415
// eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -80,7 +81,7 @@ async function activateWinDoxygen() {
8081
"C:/Program Files/doxygen/bin",
8182
"C:/Program Files (x86)/doxygen",
8283
]) {
83-
if (existsSync(binDir)) {
84+
if (existsSync(join(binDir, "doxygen.exe"))) {
8485
// eslint-disable-next-line no-await-in-loop
8586
await addPath(binDir)
8687
return binDir

src/gcc/__tests__/gcc.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jest.setTimeout(3000000)
1010
describe("setup-gcc", () => {
1111
let directory: string
1212
beforeAll(async () => {
13-
directory = await setupTmpDir("doxygen")
13+
directory = await setupTmpDir("gcc")
1414
})
1515

1616
it("should setup gcc", async () => {
@@ -37,6 +37,6 @@ describe("setup-gcc", () => {
3737
})
3838

3939
afterAll(async () => {
40-
await cleanupTmpDir("doxygen")
40+
await cleanupTmpDir("gcc")
4141
}, 100000)
4242
})

src/gcc/__tests__/main.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@
88
#include <cstddef>
99
#include <cstdint>
1010
#include <cstring>
11+
#include <cmath>
1112

1213
int main() {
13-
const auto x = 10.0;
14-
std::cout << "Testing " << x << '\n';
14+
const auto val1 = 10.0;
15+
std::cout << "Testing " << val1 << '\n';
1516

16-
const auto y = std::to_string(x);
17-
std::cout << "Testing " << y << '\n';
17+
const auto val2 = std::to_string(val1);
18+
std::cout << "Testing " << val2 << '\n';
19+
20+
return static_cast<int>(std::sin(val1) + std::log(static_cast<double>(val2.size())) - 1);
1821
}

src/gcc/__tests__/main.exe

-111 KB
Binary file not shown.

src/llvm/__tests__/main.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@
88
#include <cstddef>
99
#include <cstdint>
1010
#include <cstring>
11+
#include <cmath>
1112

1213
int main() {
13-
const auto x = 10.0;
14-
std::cout << "Testing " << x << '\n';
14+
const auto val1 = 10.0;
15+
std::cout << "Testing " << val1 << '\n';
1516

16-
const auto y = std::to_string(x);
17-
std::cout << "Testing " << y << '\n';
17+
const auto val2 = std::to_string(val1);
18+
std::cout << "Testing " << val2 << '\n';
19+
20+
return static_cast<int>(std::sin(val1) + std::log(static_cast<double>(val2.size())) - 1);
1821
}

0 commit comments

Comments
 (0)