cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tim...@apache.org
Subject git commit: Update regex to handle international version strings
Date Tue, 29 Oct 2013 21:49:39 GMT
Updated Branches:
  refs/heads/master 5db89fb6c -> befa33002


Update regex to handle international version strings


Project: http://git-wip-us.apache.org/repos/asf/cordova-wp8/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-wp8/commit/befa3300
Tree: http://git-wip-us.apache.org/repos/asf/cordova-wp8/tree/befa3300
Diff: http://git-wip-us.apache.org/repos/asf/cordova-wp8/diff/befa3300

Branch: refs/heads/master
Commit: befa33002dc46636ee2fb5be9087b57c5de11b64
Parents: 5db89fb
Author: timkim <timk@adobe.com>
Authored: Tue Oct 29 14:49:09 2013 -0700
Committer: timkim <timk@adobe.com>
Committed: Tue Oct 29 14:49:09 2013 -0700

----------------------------------------------------------------------
 wp7/template/cordova/lib/win_sdk_version.js | 2 +-
 wp8/template/cordova/lib/win_sdk_version.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/befa3300/wp7/template/cordova/lib/win_sdk_version.js
----------------------------------------------------------------------
diff --git a/wp7/template/cordova/lib/win_sdk_version.js b/wp7/template/cordova/lib/win_sdk_version.js
index 734ba4e..773e140 100644
--- a/wp7/template/cordova/lib/win_sdk_version.js
+++ b/wp7/template/cordova/lib/win_sdk_version.js
@@ -65,7 +65,7 @@ function getSdkVersion() {
     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 = '';
-	var msversion_reg = /\.NET\sFramework\,\sversion\s\d+\.\d+\.\d+/g;
+	var msversion_reg = /\.NET\sFramework\,\s[a-z]+\s\d+\.\d+\.\d+/gi;
 	if(msversion_reg.test(output)){
 		msversion = output.match(msversion_reg)[0].match(/\d+\.\d+\.\d+/g);
 		Log(msversion);

http://git-wip-us.apache.org/repos/asf/cordova-wp8/blob/befa3300/wp8/template/cordova/lib/win_sdk_version.js
----------------------------------------------------------------------
diff --git a/wp8/template/cordova/lib/win_sdk_version.js b/wp8/template/cordova/lib/win_sdk_version.js
index 734ba4e..773e140 100644
--- a/wp8/template/cordova/lib/win_sdk_version.js
+++ b/wp8/template/cordova/lib/win_sdk_version.js
@@ -65,7 +65,7 @@ function getSdkVersion() {
     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 = '';
-	var msversion_reg = /\.NET\sFramework\,\sversion\s\d+\.\d+\.\d+/g;
+	var msversion_reg = /\.NET\sFramework\,\s[a-z]+\s\d+\.\d+\.\d+/gi;
 	if(msversion_reg.test(output)){
 		msversion = output.match(msversion_reg)[0].match(/\d+\.\d+\.\d+/g);
 		Log(msversion);


Mime
View raw message