fix: use a map to set the default versions on ubuntu

This commit is contained in:
Amin Yahyaabadi 2022-05-20 20:00:30 -07:00
parent 43b287e9ae
commit d1458aa5c0
3 changed files with 40 additions and 21 deletions

2
dist/setup_cpp.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -16,32 +16,51 @@ const DefaultVersions: Record<string, string> = {
gcc: "11", // https://github.com/brechtsanders/winlibs_mingw/releases and // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=gcc gcc: "11", // https://github.com/brechtsanders/winlibs_mingw/releases and // https://packages.ubuntu.com/search?suite=all&arch=any&searchon=names&keywords=gcc
} }
/// If an ubuntu versions is not in this map:
// - the newer ubuntu versions use the first entry (e.g. v20),
// - the older ones use ""
const DefaultUbuntuVersion: Record<string, Record<number, string>> = {
llvm: {
20: "13.0.0-ubuntu-20.04",
18: "13.0.1-ubuntu-18.04",
16: "13.0.0-ubuntu-16.04",
},
clangtidy: {
20: "13.0.0-ubuntu-20.04",
18: "13.0.1-ubuntu-18.04",
16: "13.0.0-ubuntu-16.04",
},
clangformat: {
20: "13.0.0-ubuntu-20.04",
18: "13.0.1-ubuntu-18.04",
16: "13.0.0-ubuntu-16.04",
},
gcovr: {
20: "5.1",
18: "5.0",
},
meson: {
20: "0.62.1",
18: "0.61.4",
},
doxygen: {
20: "1.9.4",
},
}
/** Get the default version if passed true or undefined, otherwise return the version itself */ /** Get the default version if passed true or undefined, otherwise return the version itself */
export function getVersion(name: string, version: string | undefined, osVersion: number[] | null = null) { export function getVersion(name: string, version: string | undefined, osVersion: number[] | null = null) {
if (useDefault(version, name)) { if (useDefault(version, name)) {
// choose the default linux version based on ubuntu version // choose the default linux version based on ubuntu version
if (process.platform === "linux" && osVersion !== null) { if (process.platform === "linux" && osVersion !== null && name in DefaultUbuntuVersion) {
if (["llvm", "clangtidy", "clangformat"].includes(name)) { const osVersionMaj = osVersion[0]
if ([20, 18, 16].includes(osVersion[0]) && osVersion[1] === 4) { const newest = parseInt(Object.keys(DefaultUbuntuVersion[name])[0], 10) // newest version with the default
return `${osVersion[0] === 18 ? "13.0.1" : "13.0.0"}-ubuntu-${osVersion[0]}.0${osVersion[1]}` if (osVersionMaj >= newest) {
} return DefaultUbuntuVersion[name][osVersionMaj]
} else { } else {
if (osVersion[0] < 20) { return ""
switch (name) {
case "gcovr":
return osVersion[0] === 18 ? "5.0" : "" /* pip default */
case "meson":
return osVersion[0] === 18 ? "0.61.4" : "" /* pip default */
case "doxygen":
return "" /* apt default */
default: {
// nothing
}
}
}
} }
} }
// anything else // anything else
return DefaultVersions[name] return DefaultVersions[name]
} else { } else {