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 9C42610CC7 for ; Fri, 11 Apr 2014 19:46:35 +0000 (UTC) Received: (qmail 79339 invoked by uid 500); 11 Apr 2014 19:46:35 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 79318 invoked by uid 500); 11 Apr 2014 19:46:34 -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 77424 invoked by uid 99); 11 Apr 2014 19:46:20 -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:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BE30498B408; 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:52 -0000 Message-Id: <1402b40c3e6a4651a60f6250a84ad1e6@git.apache.org> In-Reply-To: <5ae104e14fc54c2cafb6c1196725e493@git.apache.org> References: <5ae104e14fc54c2cafb6c1196725e493@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [36/50] [abbrv] git commit: Revert "CB-6414 Fixes the issue where two config.xml munges exist, it will still write the correct config.xml output" Revert "CB-6414 Fixes the issue where two config.xml munges exist, it will still write the correct config.xml output" This reverts commit 57a5eaa1357f1f70d85437b9bb2d8f322bc39bc2. Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/8551e964 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/8551e964 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/8551e964 Branch: refs/heads/browserify Commit: 8551e964901099ababdd4a0fe37eb22390b082b5 Parents: 57a5eaa Author: Steven Gill Authored: Thu Apr 10 16:41:42 2014 -0700 Committer: Steven Gill Committed: Thu Apr 10 16:41:42 2014 -0700 ---------------------------------------------------------------------- src/util/config-changes.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/8551e964/src/util/config-changes.js ---------------------------------------------------------------------- diff --git a/src/util/config-changes.js b/src/util/config-changes.js index 6ebcd2a..d09fcf1 100644 --- a/src/util/config-changes.js +++ b/src/util/config-changes.js @@ -132,7 +132,7 @@ PlatformMunger.prototype.apply_file_munge = PlatformMunger_apply_file_munge; function PlatformMunger_apply_file_munge(file, munge, remove) { var self = this; var xml_child; - + if ( file === 'framework' && self.platform === 'ios' ) { // ios pbxproj file var pbxproj = self.config_keeper.get(self.project_dir, self.platform, 'framework'); @@ -274,11 +274,6 @@ function reapply_global_munge () { ); continue; } - if (file == 'config.xml') { - file = resolveConfigFilePath(self.project_dir, self.platform, file); - file = path.relative(self.project_dir, file); - } - // 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]); }