fix: search for the doxygen directory in activate

aminya · May 10, 2022 · 9504707 · 9504707
1 parent c10dc8c
commit 9504707
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 28 deletions.
diff --git a/dist/setup_cpp.js b/dist/setup_cpp.js
diff --git a/dist/setup_cpp.js.map b/dist/setup_cpp.js.map
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/doxygen/doxygen.ts b/src/doxygen/doxygen.ts
@@ -8,6 +8,7 @@ import { extractTar, extractZip } from "../utils/setup/extract"
 import { notice } from "../utils/io/io"
 import { setupGraphviz } from "../graphviz/graphviz"
 import { getVersion } from "../default_versions"
+import { existsSync } from "fs"
 
 /** Get the platform data for cmake */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -74,9 +75,17 @@ export async function setupDoxygen(version: string, setupDir: string, arch: stri
 function activateWinDoxygen() {
   switch (process.platform) {
     case "win32": {
-      const binDir = "C:/Program Files/doxygen/bin"
-      addPath(binDir)
-      return binDir
+      for (const binDir of [
+        "C:/ProgramData/chocolatey/bin",
+        "C:/Program Files/doxygen/bin",
+        "C:/Program Files (x86)/doxygen",
+      ]) {
+        if (existsSync(binDir)) {
+          addPath(binDir)
+          return binDir
+        }
+      }
+      throw new Error("Failed to find doxygen binary")
     }
     default: {
       throw new Error(`Unsupported platform`)