Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 48DEDDF14 for ; Thu, 10 Jan 2013 21:26:22 +0000 (UTC) Received: (qmail 21727 invoked by uid 500); 10 Jan 2013 21:26:22 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 21705 invoked by uid 500); 10 Jan 2013 21:26:22 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: callback-dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 21698 invoked by uid 99); 10 Jan 2013 21:26:22 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Jan 2013 21:26:22 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E7C48179EF; Thu, 10 Jan 2013 21:26:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: filmaj@apache.org To: commits@cordova.apache.org X-Mailer: ASF-Git Admin Mailer Subject: 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 Message-Id: <20130110212621.E7C48179EF@tyr.zones.apache.org> Date: Thu, 10 Jan 2013 21:26:21 +0000 (UTC) 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 Authored: Thu Jan 10 13:28:33 2013 -0800 Committer: Fil Maj 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(/\s*<\/string>/,''); + info_contents = info_contents.replace(/[\s\r\n]*<\/string>/g,''); fs.writeFileSync(plistFile, info_contents, 'utf-8'); // Update whitelist