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 2014/05/23 08:35:24 UTC
[1/2] git commit: CB-6732 [WP8] Fix "MSBuild 64 bit is not supported"
build error
Repository: cordova-wp8
Updated Branches:
refs/heads/master a31f822b0 -> 18ec1c3af
CB-6732 [WP8] Fix "MSBuild 64 bit is not supported" build error
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/14d13715
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/14d13715
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/14d13715
Branch: refs/heads/master
Commit: 14d13715f206c7125de06fe81c16659af6a3d1dc
Parents: a31f822
Author: sgrebnov <v-...@microsoft.com>
Authored: Thu May 22 09:53:58 2014 +0400
Committer: sgrebnov <v-...@microsoft.com>
Committed: Thu May 22 09:53:58 2014 +0400
----------------------------------------------------------------------
wp8/template/cordova/lib/build.js | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/14d13715/wp8/template/cordova/lib/build.js
----------------------------------------------------------------------
diff --git a/wp8/template/cordova/lib/build.js b/wp8/template/cordova/lib/build.js
index 2039a41..b250762 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;
@@ -107,11 +111,14 @@ function get_solution_name(path) {
// 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");
}
[2/2] git commit: wp8.1 and the IE11 WebBrowser control do not
support execScript, moving to 'eval'
Posted by pu...@apache.org.
wp8.1 and the IE11 WebBrowser control do not support execScript, moving to 'eval'
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/18ec1c3a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/18ec1c3a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/18ec1c3a
Branch: refs/heads/master
Commit: 18ec1c3af674007e48bf34dcdf3fc7ee0be8ba10
Parents: 14d1371
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Thu May 22 23:34:48 2014 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Thu May 22 23:34:48 2014 -0700
----------------------------------------------------------------------
wp8/template/cordovalib/ConsoleHelper.cs | 2 +-
wp8/template/cordovalib/CordovaView.xaml.cs | 4 ++--
wp8/template/cordovalib/OrientationHelper.cs | 6 +++---
wp8/template/cordovalib/XHRHelper.cs | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/18ec1c3a/wp8/template/cordovalib/ConsoleHelper.cs
----------------------------------------------------------------------
diff --git a/wp8/template/cordovalib/ConsoleHelper.cs b/wp8/template/cordovalib/ConsoleHelper.cs
index 92cf0c9..6bb52cc 100644
--- a/wp8/template/cordovalib/ConsoleHelper.cs
+++ b/wp8/template/cordovalib/ConsoleHelper.cs
@@ -42,7 +42,7 @@ namespace WPCordovaClassLib.CordovaLib
cons.error = cons.error || function(msg) { exec('ERROR:' + msg ); };
})(window);";
- Browser.InvokeScript("execScript", new string[] { script });
+ Browser.InvokeScript("eval", new string[] { script });
}
void OnServiceClosing(object sender, ClosingEventArgs e)
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/18ec1c3a/wp8/template/cordovalib/CordovaView.xaml.cs
----------------------------------------------------------------------
diff --git a/wp8/template/cordovalib/CordovaView.xaml.cs b/wp8/template/cordovalib/CordovaView.xaml.cs
index 74de7d2..d190c29 100644
--- a/wp8/template/cordovalib/CordovaView.xaml.cs
+++ b/wp8/template/cordovalib/CordovaView.xaml.cs
@@ -387,7 +387,7 @@ namespace WPCordovaClassLib
string nativeReady = "(function(){ cordova.require('cordova/channel').onNativeReady.fire()})();";
try
{
- CordovaBrowser.InvokeScript("execScript", new string[] { nativeReady });
+ CordovaBrowser.InvokeScript("eval", new string[] { nativeReady });
}
catch (Exception /*ex*/)
{
@@ -397,7 +397,7 @@ namespace WPCordovaClassLib
string appExitHandler = "(function(){navigator.app = navigator.app || {}; navigator.app.exitApp= function(){cordova.exec(null,null,'CoreEvents','__exitApp',[]); }})();";
try
{
- CordovaBrowser.InvokeScript("execScript", new string[] { appExitHandler });
+ CordovaBrowser.InvokeScript("eval", new string[] { appExitHandler });
}
catch (Exception /*ex*/)
{
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/18ec1c3a/wp8/template/cordovalib/OrientationHelper.cs
----------------------------------------------------------------------
diff --git a/wp8/template/cordovalib/OrientationHelper.cs b/wp8/template/cordovalib/OrientationHelper.cs
index 5a298b2..299f9dd 100644
--- a/wp8/template/cordovalib/OrientationHelper.cs
+++ b/wp8/template/cordovalib/OrientationHelper.cs
@@ -72,7 +72,7 @@ namespace WPCordovaClassLib.Cordova
try
{
- Browser.InvokeScript("execScript", new string[] { jsCallback });
+ Browser.InvokeScript("eval", new string[] { jsCallback });
}
catch (Exception)
{
@@ -106,14 +106,14 @@ namespace WPCordovaClassLib.Cordova
try
{
- Browser.InvokeScript("execScript", new string[] { jsCallback });
+ Browser.InvokeScript("eval", new string[] { jsCallback });
jsCallback = "var evt = document.createEvent('HTMLEvents');";
jsCallback += "evt.initEvent( 'orientationchange', true, false );";
jsCallback += "window.dispatchEvent(evt);";
jsCallback += "if(window.onorientationchange){window.onorientationchange(evt);}";
- Browser.InvokeScript("execScript", new string[] {jsCallback});
+ Browser.InvokeScript("eval", new string[] {jsCallback});
}
catch (Exception)
{
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/18ec1c3a/wp8/template/cordovalib/XHRHelper.cs
----------------------------------------------------------------------
diff --git a/wp8/template/cordovalib/XHRHelper.cs b/wp8/template/cordovalib/XHRHelper.cs
index e2d4593..d1651c3 100644
--- a/wp8/template/cordovalib/XHRHelper.cs
+++ b/wp8/template/cordovalib/XHRHelper.cs
@@ -255,7 +255,7 @@ namespace WPCordovaClassLib.CordovaLib
})(window, document); ";
- Browser.InvokeScript("execScript", new string[] { script });
+ Browser.InvokeScript("eval", new string[] { script });
}
public bool HandleCommand(string commandStr)