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 2013/11/05 02:03:42 UTC
[1/3] git commit: Fixes the invalid pattern used to test msbuild
availability
Updated Branches:
refs/heads/master 254883a62 -> 8ba1f65d5
Fixes the invalid pattern used to test msbuild availability
As discussed in https://github.com/apache/cordova-wp8/pull/12 the
previous pattern was not detecting the msbuid installation in some
localised versions of .net framework. This pattern works with all the
msbuild outputs highlited in that discussion.
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/70ec222a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/70ec222a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/70ec222a
Branch: refs/heads/master
Commit: 70ec222abbec57789c8f62b1c76010638a9cae82
Parents: 7c88c66
Author: kScope <ni...@gmail.com>
Authored: Wed Oct 16 11:37:25 2013 +0200
Committer: kScope <ni...@gmail.com>
Committed: Wed Oct 16 11:37:25 2013 +0200
----------------------------------------------------------------------
wp7/bin/check_reqs.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/70ec222a/wp7/bin/check_reqs.js
----------------------------------------------------------------------
diff --git a/wp7/bin/check_reqs.js b/wp7/bin/check_reqs.js
index 2b10e8c..d74d3bf 100644
--- a/wp7/bin/check_reqs.js
+++ b/wp7/bin/check_reqs.js
@@ -80,7 +80,7 @@ function SystemRequiermentsMet() {
var cmd = 'msbuild -version'
var fail_msg = 'The command `msbuild` failed. Make sure you have the latest Windows Phone SDKs installed, AND have the latest .NET framework added to your path (i.e C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319).'
var output = check_command(cmd, fail_msg);
- var msversion = output.match(/\.NET\sFramework\,\sversion\s4\.0/i);
+ var msversion = output.match(/Microsoft\s\(R\)\s+Build\sEngine\s[a-z]+\s4\.0\.30319/i);
if (!msversion) {
Log('Please install the .NET Framwork v4.0.30319 (in the latest windows phone SDK\'s).', true);
Log('Make sure the "msbuild" command in your path is pointing to v4.0.30319 of msbuild as well (inside C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319).', true);
[2/3] git commit: Fixes the invalid pattern used to test msbuild
availability
Posted by pu...@apache.org.
Fixes the invalid pattern used to test msbuild availability
As discussed in https://github.com/apache/cordova-wp8/pull/12 the
previous pattern was not detecting the msbuid installation in some
localised versions of .net framework. This pattern works with all the
msbuild outputs highlited in that discussion.
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/6cc3c162
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/6cc3c162
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/6cc3c162
Branch: refs/heads/master
Commit: 6cc3c162cd2e932d875a4c1e4ef49bbefa1327cf
Parents: 70ec222
Author: kScope <ni...@gmail.com>
Authored: Wed Oct 16 11:43:00 2013 +0200
Committer: kScope <ni...@gmail.com>
Committed: Wed Oct 16 11:43:00 2013 +0200
----------------------------------------------------------------------
wp8/bin/check_reqs.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/6cc3c162/wp8/bin/check_reqs.js
----------------------------------------------------------------------
diff --git a/wp8/bin/check_reqs.js b/wp8/bin/check_reqs.js
index 58d16cf..c4cd654 100644
--- a/wp8/bin/check_reqs.js
+++ b/wp8/bin/check_reqs.js
@@ -80,7 +80,7 @@ function SystemRequiermentsMet() {
var cmd = 'msbuild -version'
var fail_msg = 'The command `msbuild` failed. Make sure you have the latest Windows Phone SDKs installed, AND have the latest .NET framework added to your path (i.e C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319).'
var output = check_command(cmd, fail_msg);
- var msversion = output.match(/\.NET\sFramework\,\sversion\s4\.0/i);
+ var msversion = output.match(/Microsoft\s\(R\)\s+Build\sEngine\s[a-z]+\s4\.0\.30319/i);
if (!msversion) {
Log('Please install the .NET Framwork v4.0.30319 (in the latest windows phone SDK\'s).', true);
Log('Make sure the "msbuild" command in your path is pointing to v4.0.30319 of msbuild as well (inside C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319).', true);
[3/3] git commit: Merge branch 'master' of
https://github.com/kScope/cordova-wp8
Posted by pu...@apache.org.
Merge branch 'master' of https://github.com/kScope/cordova-wp8
Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/8ba1f65d
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/8ba1f65d
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/8ba1f65d
Branch: refs/heads/master
Commit: 8ba1f65d5e56f57b939553df3b8bd90ec63c8fec
Parents: 254883a 6cc3c16
Author: purplecabbage <pu...@gmail.com>
Authored: Mon Nov 4 16:26:25 2013 -0800
Committer: purplecabbage <pu...@gmail.com>
Committed: Mon Nov 4 16:26:25 2013 -0800
----------------------------------------------------------------------
wp7/bin/check_reqs.js | 2 +-
wp8/bin/check_reqs.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------