Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm
Precedence: bulk
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: an-selm@apache.org
To: commits@cordova.apache.org
Message-Id: <b4a1760f97e2478d9cbccf3c1a3c8109@git.apache.org>
Subject: cordova-windows git commit: CB-10292: Windows platform support for
 next version of VS/MSBuild
Date: Wed,  6 Jan 2016 07:55:58 +0000 (UTC)

Repository: cordova-windows
Updated Branches:
  refs/heads/master 1fdc15560 -> 74303fcf8


CB-10292: Windows platform support for next version of VS/MSBuild


Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/74303fcf
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/74303fcf
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/74303fcf

Branch: refs/heads/master
Commit: 74303fcf8ff3bc69169d7099c857b33e0b83a838
Parents: 1fdc155
Author: Jason Ginchereau <jasongin@microsoft.com>
Authored: Mon Jan 4 10:31:48 2016 -0800
Committer: Jason Ginchereau <jasongin@microsoft.com>
Committed: Tue Jan 5 09:47:15 2016 -0800

----------------------------------------------------------------------
 template/cordova/lib/MSBuildTools.js |  8 ++++----
 template/cordova/lib/build.js        | 11 ++++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/74303fcf/template/cordova/lib/MSBuildTools.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index c56c99a..114c12c 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -50,18 +50,18 @@ MSBuildTools.prototype.buildProject = function(projFile, buildType, buildarch, o
 
 // returns full path to msbuild tools required to build the project and tools version
 module.exports.findAvailableVersion = function () {
-    var versions = ['14.0', '12.0', '4.0'];
+    var versions = ['15.0', '14.0', '12.0', '4.0'];
 
     return Q.all(versions.map(checkMSBuildVersion)).then(function (versions) {
         // select first msbuild version available, and resolve promise with it
-        var msbuildTools = versions[0] || versions[1] || versions[2];
+        var msbuildTools = versions[0] || versions[1] || versions[2] || versions[3];
 
         return msbuildTools ? Q.resolve(msbuildTools) : Q.reject('MSBuild tools not found');
     });
 };
 
 module.exports.findAllAvailableVersions = function () {
-    var versions = ['14.0', '12.0', '4.0'];
+    var versions = ['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) {
@@ -80,7 +80,7 @@ function checkMSBuildVersion(version) {
             toolsPath = toolsPath[1];
             // CB-9565: Windows 10 invokes .NET Native compiler, which only runs on x86 arch,
             // so if we're running an x64 Node, make sure to use x86 tools.
-            if (version === '14.0' && toolsPath.indexOf('amd64') > -1) {
+            if ((version === '15.0' || version === '14.0') && toolsPath.indexOf('amd64') > -1) {
                 toolsPath = path.resolve(toolsPath, '..');
             }
             events.emit('verbose', 'Found MSBuild v' + version + ' at ' + toolsPath);

http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/74303fcf/template/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/build.js b/template/cordova/lib/build.js
index e8586f3..b90c205 100644
--- a/template/cordova/lib/build.js
+++ b/template/cordova/lib/build.js
@@ -502,8 +502,8 @@ function getMsBuildForTargets(selectedTargets, buildConfig, allMsBuildVersions)
         // prefer 12.  If not present, can't build this; error in the filterSupportedTargets function
         result = availableVersions['12.0'] || availableVersions['4.0'];
     } else {
-        // 14 can build Windows 10, Windows 8.1, and Windows Phone 8.1, so resolve to 14 if available, else 12
-        result = (availableVersions['14.0'] || availableVersions['12.0']);
+        // 15 and 14 can build Windows 10, Windows 8.1, and Windows Phone 8.1, so resolve to those if available, else 12
+        result = (availableVersions['15.0'] || availableVersions['14.0'] || availableVersions['12.0']);
     }
 
     return result;
@@ -525,6 +525,10 @@ function msBuild14TargetsFilter(target) {
     return target === projFiles.win || target === projFiles.phone || target === projFiles.win10;
 }
 
+function msBuild15TargetsFilter(target) {
+    return target === projFiles.win || target === projFiles.phone || target === projFiles.win10;
+}
+
 function filterSupportedTargets (targets, msbuild) {
     if (!targets || targets.length === 0) {
         events.emit('warn', 'No build targets are specified.');
@@ -534,7 +538,8 @@ function filterSupportedTargets (targets, msbuild) {
     var targetFilters = {
         '4.0': msBuild4TargetsFilter,
         '12.0': msBuild12TargetsFilter,
-        '14.0': msBuild14TargetsFilter
+        '14.0': msBuild14TargetsFilter,
+        '15.0': msBuild15TargetsFilter
     };
 
     var filter = targetFilters[msbuild.version];


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org