You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by fi...@apache.org on 2013/01/10 22:26:21 UTC

git commit: Fix for CB-2074: problem when running in iPad 6.0 simulator. Empty space, multiline elements in .plist files cannot exist. Bumping to 2.3.3

Updated Branches:
  refs/heads/master bbb3e6429 -> 4f9eebe86
Updated Tags:  refs/tags/2.3.3 [created] 4f9eebe86


Fix for CB-2074: problem when running in iPad 6.0 simulator. Empty space, multiline elements in .plist files cannot exist. Bumping to 2.3.3


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

Branch: refs/heads/master
Commit: 4f9eebe86c02c64a38c76ddf8c18386d17f62fe9
Parents: bbb3e64
Author: Fil Maj <ma...@gmail.com>
Authored: Thu Jan 10 13:28:33 2013 -0800
Committer: Fil Maj <ma...@gmail.com>
Committed: Thu Jan 10 13:28:33 2013 -0800

----------------------------------------------------------------------
 package.json               |    2 +-
 src/metadata/ios_parser.js |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/4f9eebe8/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index e744c4b..990e043 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "preferGlobal": "true",
   "description": "Cordova command line interface tool",
   "main": "cordova",

http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/4f9eebe8/src/metadata/ios_parser.js
----------------------------------------------------------------------
diff --git a/src/metadata/ios_parser.js b/src/metadata/ios_parser.js
index 03ee168..61b23e2 100644
--- a/src/metadata/ios_parser.js
+++ b/src/metadata/ios_parser.js
@@ -33,7 +33,7 @@ module.exports.prototype = {
         var infoPlist = plist.parseFileSync(plistFile);
         infoPlist['CFBundleIdentifier'] = pkg;
         var info_contents = plist.build(infoPlist);
-        info_contents = info_contents.replace(/<string>\s*<\/string>/,'<string></string>');
+        info_contents = info_contents.replace(/<string>[\s\r\n]*<\/string>/g,'<string></string>');
         fs.writeFileSync(plistFile, info_contents, 'utf-8');
 
         // Update whitelist