commit aa2bfb157d1c992de5fd0593eda959284a870cfa
author sgrebnov <v-segreb@microsoft.com> Thu May 22 09:53:58 2014 +0400
committer Jesse MacFadyen <purplecabbage@gmail.com> Thu May 22 01:25:07 2014 -0700
tree 2faff4a2ac099c6990f91f28a21ee8bfaa6af7c9
parent 59184cbaa01680a2d70ae48bc49e7c2a1ff9ccda

CB-6732 [WP8] Fix "MSBuild 64 bit is not supported" build error

wp8/template/cordova/lib/build.js

diff --git a/wp8/template/cordova/lib/build.js b/wp8/template/cordova/lib/build.js
index a46329b..e6610c6 100644
--- a/wp8/template/cordova/lib/build.js
+++ b/wp8/template/cordova/lib/build.js
@@ -20,6 +20,10 @@
 
 var fso = WScript.CreateObject('Scripting.FileSystemObject');
 var wscript_shell = WScript.CreateObject("WScript.Shell");
+var procEnv = wscript_shell.Environment("Process");
+// possible values and additional details: http://msdn.microsoft.com/en-us/library/aa384274.aspx
+var procArchitecture = procEnv("PROCESSOR_ARCHITECTURE").toLowerCase();
+var is64Mode = procArchitecture && procArchitecture != 'x86';
 
 var args = WScript.Arguments;
 
@@ -108,11 +112,14 @@
 
 // returns full path to msbuild tools required to build the project
 function getMSBuildToolsPath() {
+    // WP8 requires x86 version of MSBuild, CB-6732
+    var regRoot = is64Mode ? 'HKLM\\SOFTWARE\\Wow6432Node' : 'HKLM\\SOFTWARE';
+
     // use the latest version of the msbuild tools available on this machine
     var toolsVersions = ['12.0','4.0'];          // for WP8 we REQUIRE 4.0 !!!
     for (idx in toolsVersions) {
         try {
-            return wscript_shell.RegRead('HKLM\\SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\' + toolsVersions[idx] + '\\MSBuildToolsPath');
+            return wscript_shell.RegRead(regRoot + '\\Microsoft\\MSBuild\\ToolsVersions\\' + toolsVersions[idx] + '\\MSBuildToolsPath');
         } catch (err) {
             Log("toolsVersion " + idx + " is not supported");
         }