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 5C1AE10CC9 for ; Fri, 11 Apr 2014 19:46:37 +0000 (UTC) Received: (qmail 79501 invoked by uid 500); 11 Apr 2014 19:46:37 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 79478 invoked by uid 500); 11 Apr 2014 19:46:36 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 77412 invoked by uid 99); 11 Apr 2014 19:46:19 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Apr 2014 19:46:19 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 96F4E98B400; Fri, 11 Apr 2014 19:46:18 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: anis@apache.org To: commits@cordova.apache.org Date: Fri, 11 Apr 2014 19:46:48 -0000 Message-Id: <2f9e8464241540b3999bc90e7e82f3ca@git.apache.org> In-Reply-To: <5ae104e14fc54c2cafb6c1196725e493@git.apache.org> References: <5ae104e14fc54c2cafb6c1196725e493@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [32/50] [abbrv] git commit: CB-6414 - fixes the issue where two config.xml munges exists, it will still write the correct config.xml output CB-6414 - fixes the issue where two config.xml munges exists, it will still write the correct config.xml output Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/39d412c6 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/39d412c6 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/39d412c6 Branch: refs/heads/browserify Commit: 39d412c61574055d95c4fdd70478a5f9446bf191 Parents: 34ce31b Author: Josh Bavari Authored: Tue Apr 8 14:48:52 2014 -0500 Committer: Josh Bavari Committed: Tue Apr 8 15:25:06 2014 -0500 ---------------------------------------------------------------------- src/util/config-changes.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/39d412c6/src/util/config-changes.js ---------------------------------------------------------------------- diff --git a/src/util/config-changes.js b/src/util/config-changes.js index d09fcf1..309ceb3 100644 --- a/src/util/config-changes.js +++ b/src/util/config-changes.js @@ -274,8 +274,13 @@ function reapply_global_munge () { ); continue; } - // TODO: This is mostly file IO and can run in parallel since each file is independent. - self.apply_file_munge(file, global_munge.files[file]); + if(file == 'config.xml') { + file = resolveConfigFilePath(self.project_dir, self.platform, file); + file = path.relative(self.project_dir, file); + console.log('New file: ' + file); + } + + self.apply_file_munge(file, global_munge.files[file]); } }