This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-msbuild_cleanup
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
commit 8e7087efb7d9e56fc9d8ff6db1cb657be30fb2e3
Author: Jan Piotrowski <piotrow...@gmail.com>
AuthorDate: Wed Feb 14 19:15:20 2018 +0100
clearer comment
---
template/cordova/lib/MSBuildTools.js | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/template/cordova/lib/MSBuildTools.js
b/template/cordova/lib/MSBuildTools.js
index 261aa72..fa4ca38 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -89,16 +89,17 @@ module.exports.findAvailableVersion = function () {
// build.js -> run()
// check_reqs.js -> checkMSBuild()
module.exports.findAllAvailableVersions = function () {
- // CB-11548 use VSINSTALLDIR environment if defined to find MSBuild. If
VSINSTALLDIR
- // is not specified or doesn't contain the MSBuild path we are looking for
- fall back
- // to default discovery mechanism.
console.log('findAllAvailableVersions');
+ // CB-11548 use VSINSTALLDIR environment if defined to find MSBuild.
if (process.env.VSINSTALLDIR) {
var msBuildPath = path.join(process.env.VSINSTALLDIR,
'MSBuild/15.0/Bin');
return module.exports.getMSBuildToolsAt(msBuildPath)
.then(function (msBuildTools) {
return [msBuildTools];
- }).catch(findAllAvailableVersionsFallBack);
+ })
+ // If VSINSTALLDIR is not specified or doesn't contain the MSBuild
path we are
+ // looking for - fall back to default discovery mechanism.
+ .catch(findAllAvailableVersionsFallBack);
}
return findAllAvailableVersionsFallBack();
--
To stop receiving notification emails like this one, please contact
jan...@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org
