cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From purplecabb...@apache.org
Subject [2/3] git commit: Fixes the invalid pattern used to test msbuild availability
Date Tue, 05 Nov 2013 01:03:43 GMT
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 <nicola.gargagli@gmail.com>
Authored: Wed Oct 16 11:43:00 2013 +0200
Committer: kScope <nicola.gargagli@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);


Mime
View raw message