You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2015/10/26 22:55:20 UTC
[1/3] cordova-windows git commit: CB-9565: Build failure for Windows
10. This error is a result of using x64 Node and an incompatibility with x64
msbuild;
the .NET Native compiler is x86 only (for where it can run). As a result, when
msbuild-x64 tries
Repository: cordova-windows
Updated Branches:
refs/heads/master a28491ddd -> bd87ef2ef
CB-9565: Build failure for Windows 10. This error is a result of using
x64 Node and an incompatibility with x64 msbuild; the .NET Native compiler
is x86 only (for where it can run). As a result, when msbuild-x64 tries
to use it, it fails. This works around the issue by running x86 instead.
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/8ea8a719
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/8ea8a719
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/8ea8a719
Branch: refs/heads/master
Commit: 8ea8a719848e296e2cd54b2c5479160a9467046c
Parents: ea18891
Author: Rob Paveza <Ro...@microsoft.com>
Authored: Tue Sep 22 10:39:19 2015 -0700
Committer: Rob Paveza <Ro...@microsoft.com>
Committed: Tue Sep 22 10:42:38 2015 -0700
----------------------------------------------------------------------
template/cordova/lib/MSBuildTools.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/8ea8a719/template/cordova/lib/MSBuildTools.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index 4d109c7..05c8cda 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -77,7 +77,13 @@ function checkMSBuildVersion(version) {
// fetch msbuild path from 'reg' output
var path = /MSBuildToolsPath\s+REG_SZ\s+(.*)/i.exec(output);
if (path) {
- deferred.resolve(new MSBuildTools(version, path[1]));
+ path = path[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' && path.indexOf('amd64')) {
+ path = require('path').join(path, '..');
+ }
+ deferred.resolve(new MSBuildTools(version, path));
return;
}
deferred.resolve(null); // not found
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/3] cordova-windows git commit: Merge branch 'CB-9565' of
https://github.com/MSOpenTech/cordova-windows into CB-9565
Posted by pu...@apache.org.
Merge branch 'CB-9565' of https://github.com/MSOpenTech/cordova-windows into CB-9565
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/c36052ba
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/c36052ba
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/c36052ba
Branch: refs/heads/master
Commit: c36052ba44c412b3927940361aae04dd7ddf124b
Parents: a28491d 8ea8a71
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Mon Oct 26 14:34:19 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Mon Oct 26 14:34:19 2015 -0700
----------------------------------------------------------------------
template/cordova/lib/MSBuildTools.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/3] cordova-windows git commit: fix logic error
Posted by pu...@apache.org.
fix logic error
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/bd87ef2e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/bd87ef2e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/bd87ef2e
Branch: refs/heads/master
Commit: bd87ef2ef95fcc54e669141db8572935a47eb403
Parents: c36052b
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Mon Oct 26 14:37:31 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Mon Oct 26 14:37:31 2015 -0700
----------------------------------------------------------------------
template/cordova/lib/MSBuildTools.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/bd87ef2e/template/cordova/lib/MSBuildTools.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js
index 05c8cda..1742bfa 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -80,7 +80,7 @@ function checkMSBuildVersion(version) {
path = path[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' && path.indexOf('amd64')) {
+ if (version === '14.0' && path.indexOf('amd64') > -1) {
path = require('path').join(path, '..');
}
deferred.resolve(new MSBuildTools(version, path));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org