You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ja...@apache.org on 2018/02/15 15:24:17 UTC
[cordova-windows] branch master updated: CB-13883 Visual Studio
2017 support (#261)
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git
The following commit(s) were added to refs/heads/master by this push:
new 6f7572d CB-13883 Visual Studio 2017 support (#261)
6f7572d is described below
commit 6f7572d6ade734cde3e662c28449c9ece735ded8
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Thu Feb 15 16:24:15 2018 +0100
CB-13883 Visual Studio 2017 support (#261)
---
template/cordova/lib/MSBuildTools.js | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index af914c9..fa05e73 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -93,7 +93,7 @@ module.exports.findAllAvailableVersions = function () {
function findAllAvailableVersionsFallBack () {
console.log('findAllAvailableVersionsFALLBACK');
- var versions = ['15.0', '14.0', '12.0', '4.0'];
+ var versions = ['15.5', '15.0', '14.0', '12.0', '4.0'];
events.emit('verbose', 'Searching for available MSBuild versions...');
return Q.all(versions.map(checkMSBuildVersion)).then(function (unprocessedResults) {
@@ -106,12 +106,12 @@ function findAllAvailableVersionsFallBack () {
// returns full path to msbuild tools required to build the project and tools version
// check_reqs.js -> run()
module.exports.findAvailableVersion = function () {
- var versions = ['15.0', '14.0', '12.0', '4.0'];
+ var versions = ['15.5', '15.0', '14.0', '12.0', '4.0'];
return Q.all(versions.map(checkMSBuildVersion)).then(function (versions) {
console.log('findAvailableVersion', versions);
// select first msbuild version available, and resolve promise with it
- var msbuildTools = versions[0] || versions[1] || versions[2] || versions[3];
+ var msbuildTools = versions[0] || versions[1] || versions[2] || versions[3] || versions[4];
return msbuildTools ? Q.resolve(msbuildTools) : Q.reject('MSBuild tools not found');
});
@@ -150,6 +150,8 @@ function checkMSBuildVersion (version) {
// console.log('correspondingWillows', correspondingWillows);
var correspondingWillow = correspondingWillows[0]; // TODO Do not only handle one!
if (correspondingWillow) {
+ // super hacky: VS2017/Willow is 15.x but MSBuild is always 15.0 in path - so set that here
+ version = '15.0';
var toolsPath = path.join(correspondingWillow.path, 'MSBuild', version, 'Bin');
console.log('matching VS:', version, toolsPath);
console.log('from list of VS installations: ', correspondingWillows);
@@ -253,6 +255,10 @@ function msBuild15TargetsFilter (target) {
return target === projFiles.win || target === projFiles.phone || target === projFiles.win10;
}
+function msBuild155TargetsFilter (target) {
+ return target === projFiles.win10;
+}
+
function filterSupportedTargets (targets, msbuild) {
console.log('MSBuildTools->filterSupportedTargets', targets, msbuild);
if (!targets || targets.length === 0) {
@@ -264,6 +270,7 @@ function filterSupportedTargets (targets, msbuild) {
'12.0': msBuild12TargetsFilter,
'14.0': msBuild14TargetsFilter,
'15.x': msBuild15TargetsFilter,
+ '15.5': msBuild155TargetsFilter,
get: function (version) {
// Apart from exact match also try to get filter for version range
// so we can find for example targets for version '15.1'
--
To stop receiving notification emails like this one, please contact
janpio@apache.org.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org