Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2EA74200C8F for ; Fri, 26 May 2017 01:15:45 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2D3EF160BD5; Thu, 25 May 2017 23:15:45 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 73528160BCA for ; Fri, 26 May 2017 01:15:44 +0200 (CEST) Received: (qmail 75053 invoked by uid 500); 25 May 2017 23:15:43 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 75044 invoked by uid 99); 25 May 2017 23:15:43 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 May 2017 23:15:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8C7E4DFC2E; Thu, 25 May 2017 23:15:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shazron@apache.org To: commits@cordova.apache.org Message-Id: <7ca9e66783ec4bf1a777ca3d7d95d804@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ios commit: CB-8980: Ensure copied resource-files are cleaned Date: Thu, 25 May 2017 23:15:43 +0000 (UTC) archived-at: Thu, 25 May 2017 23:15:45 -0000 Repository: cordova-ios Updated Branches: refs/heads/master d7ec584f7 -> a9532aed0 CB-8980: Ensure copied resource-files are cleaned This closes #309 Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/a9532aed Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/a9532aed Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/a9532aed Branch: refs/heads/master Commit: a9532aed061ede7f322ab4d6843dcb8e235fce9e Parents: d7ec584 Author: Darryl Pogue Authored: Fri Apr 21 00:10:04 2017 -0700 Committer: Shazron Abdullah Committed: Thu May 25 16:15:17 2017 -0700 ---------------------------------------------------------------------- bin/templates/scripts/cordova/lib/prepare.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/a9532aed/bin/templates/scripts/cordova/lib/prepare.js ---------------------------------------------------------------------- diff --git a/bin/templates/scripts/cordova/lib/prepare.js b/bin/templates/scripts/cordova/lib/prepare.js index c02c187..973074e 100644 --- a/bin/templates/scripts/cordova/lib/prepare.js +++ b/bin/templates/scripts/cordova/lib/prepare.js @@ -495,7 +495,7 @@ function updateFileResources(cordovaProject, locations) { function cleanFileResources(projectRoot, projectConfig, locations) { const platformDir = path.relative(projectRoot, locations.root); - const files = projectConfig.getFileResources('ios'); + const files = projectConfig.getFileResources('ios', true); if (files.length > 0) { events.emit('verbose', 'Cleaning resource files at ' + platformDir); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org