Merge pull request #71 from aminya/doxygen [skip ci]

Author: aminya

dist/setup_cpp.js

@@ -12,7 +12,7 @@ const DefaultVersions: Record<string, string> = {
   python: "3.8.10",
   kcov: "40", // https://github.com/SimonKagstrom/kcov/releases
   task: "3.12.0", // https://github.com/go-task/task/releases
-  doxygen: "1.9.1", // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=doxygen
+  doxygen: process.platform === "darwin" ? "1.9.3" : "1.9.4", // https://www.doxygen.nl/download.html // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=doxygen
   gcc: process.platform === "win32" ? "11.2.0.07112021" : "11", // https://community.chocolatey.org/packages/mingw#versionhistory and // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=gcc
 }
 

dist/setup_cpp.js.map

@@ -4,10 +4,11 @@ import { InstallationInfo, PackageInfo, setupBin } from "../utils/setup/setupBin
 import { setupBrewPack } from "../utils/setup/setupBrewPack"
 import { setupChocoPack } from "../utils/setup/setupChocoPack"
 import { addBinExtension } from "../utils/extension/extension"
-import { extractTar } from "../utils/setup/extract"
+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
@@ -23,6 +24,16 @@ function getDoxygenPackageInfo(version: string, platform: NodeJS.Platform, _arch
         url: `https://www.doxygen.nl/files/${folderName}.linux.bin.tar.gz`,
       }
     }
+    case "win32": {
+      const folderName = `doxygen-${version}`
+      return {
+        binRelativeDir: "",
+        binFileName: addBinExtension("doxygen"),
+        extractedFolderName: folderName,
+        extractFunction: extractZip,
+        url: `https://www.doxygen.nl/files/${folderName}.windows.x64.bin.zip`,
+      }
+    }
     default:
       throw new Error(`Unsupported platform '${platform}'`)
   }
@@ -32,9 +43,10 @@ export async function setupDoxygen(version: string, setupDir: string, arch: stri
   switch (process.platform) {
     case "win32": {
       await setupChocoPack("doxygen.install", version)
-      await setupGraphviz(getVersion("graphviz", undefined), "", arch)
       const binDir = activateWinDoxygen()
-      return { binDir }
+      const installationInfo = { binDir }
+      await setupGraphviz(getVersion("graphviz", undefined), "", arch)
+      return installationInfo
     }
     case "darwin": {
       const installationInfo = setupBrewPack("doxygen", undefined)
@@ -63,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`)