diff options
| -rw-r--r-- | etc/scripts/util/orphancompiler.py | 2 | ||||
| -rw-r--r-- | lib/compiler-finder.js | 7 | ||||
| -rwxr-xr-x | lib/options-handler.js | 13 |
3 files changed, 8 insertions, 14 deletions
diff --git a/etc/scripts/util/orphancompiler.py b/etc/scripts/util/orphancompiler.py index dce4a266f..8dcd2f36d 100644 --- a/etc/scripts/util/orphancompiler.py +++ b/etc/scripts/util/orphancompiler.py @@ -39,7 +39,7 @@ LIB_VERSIONS_LIST_RE = re.compile(r'libs\.(.*?)\.versions=(.*)') LIB_VERSION_RE = re.compile(r'libs\.(.*?)\.versions\.(.*?)\.version') TOOLS_LIST_RE = re.compile(r'tools=(.+)') TOOL_EXE_RE = re.compile(r'tools\.(.*?)\.exe') -EMPTY_LIST_RE = re.compile(r'.*(compilers|formatters|versions|tools|alias|exclude)=.*::.*') +EMPTY_LIST_RE = re.compile(r'.*(compilers|formatters|versions|tools|alias|exclude|libPath)=.*::.*') DISABLED_RE = re.compile(r'^# Disabled:\s*(.*)') diff --git a/lib/compiler-finder.js b/lib/compiler-finder.js index 75b567d57..97b14a37f 100644 --- a/lib/compiler-finder.js +++ b/lib/compiler-finder.js @@ -280,11 +280,8 @@ export class CompilerFinder { return []; } - if (process.platform === 'win32') { - compilerInfo.libPath = compilerInfo.libPath.split(';').filter(p => p !== ''); - } else { - compilerInfo.libPath = compilerInfo.libPath.split(':').filter(p => p !== ''); - } + // This seems like no longer needed with orphancompiler.py checks + compilerInfo.libPath = compilerInfo.libPath.split(path.delimiter).filter(p => p !== ''); logger.debug('Found compiler', compilerInfo); return compilerInfo; diff --git a/lib/options-handler.js b/lib/options-handler.js index 85624482d..2edbe8955 100755 --- a/lib/options-handler.js +++ b/lib/options-handler.js @@ -25,6 +25,7 @@ import https from 'https'; import fs from 'fs-extra'; +import path from 'path'; import semverParser from 'semver'; import _ from 'underscore'; @@ -226,19 +227,15 @@ export class ClientOptionsHandler { } const includes = this.compilerProps(lang, libVersionName + '.path'); - if (includes && process.platform === 'win32') { - versionObject.path = includes.split(';'); - } else if (includes) { - versionObject.path = includes.split(':'); + if (includes) { + versionObject.path = includes.split(path.delimiter); } else { logger.warn(`Library ${lib} ${version} (${lang}) has no include paths`); } const libpath = this.compilerProps(lang, libVersionName + '.libpath'); - if (libpath && process.platform === 'win32') { - versionObject.libpath = libpath.split(';'); - } else if (libpath) { - versionObject.libpath = libpath.split(':'); + if (libpath) { + versionObject.libpath = libpath.split(path.delimiter); } const options = this.compilerProps(lang, libVersionName + '.options'); |