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 E51E111BB0 for ; Tue, 16 Sep 2014 19:15:28 +0000 (UTC) Received: (qmail 92215 invoked by uid 500); 16 Sep 2014 19:15:28 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 92120 invoked by uid 500); 16 Sep 2014 19:15:28 -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 92095 invoked by uid 99); 16 Sep 2014 19:15:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Sep 2014 19:15:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id D0CA0A16B4B; Tue, 16 Sep 2014 19:15:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agrieve@apache.org To: commits@cordova.apache.org Date: Tue, 16 Sep 2014 19:15:28 -0000 Message-Id: In-Reply-To: <0c71a2424dc74777ad917809ca2732f8@git.apache.org> References: <0c71a2424dc74777ad917809ca2732f8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] android commit: CB-7512 Fix gradle not copying all archs to out/ (broken by prev commit) CB-7512 Fix gradle not copying all archs to out/ (broken by prev commit) Project: http://git-wip-us.apache.org/repos/asf/cordova-android/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-android/commit/ac34bf1e Tree: http://git-wip-us.apache.org/repos/asf/cordova-android/tree/ac34bf1e Diff: http://git-wip-us.apache.org/repos/asf/cordova-android/diff/ac34bf1e Branch: refs/heads/master Commit: ac34bf1e54661bf5397846fc52800810fc1fb302 Parents: a5d300c Author: Andrew Grieve Authored: Tue Sep 16 15:14:40 2014 -0400 Committer: Andrew Grieve Committed: Tue Sep 16 15:14:40 2014 -0400 ---------------------------------------------------------------------- bin/templates/cordova/lib/build.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-android/blob/ac34bf1e/bin/templates/cordova/lib/build.js ---------------------------------------------------------------------- diff --git a/bin/templates/cordova/lib/build.js b/bin/templates/cordova/lib/build.js index 3224758..2e6a624 100644 --- a/bin/templates/cordova/lib/build.js +++ b/bin/templates/cordova/lib/build.js @@ -155,7 +155,6 @@ var builders = { process.exit(2); } var ret = candidates[0]; - console.log('Using apk: ' + ret); return [ret]; } }, @@ -256,9 +255,7 @@ var builders = { } return path.extname(candidate) == '.apk'; }); - var ret = candidates[0]; - console.log('Using apk: ' + ret); - return [ret]; + return candidates; } }, @@ -343,9 +340,14 @@ module.exports.run = function(options) { // are used by get_apk(). var outputDir = path.join(ROOT, 'out'); shell.mkdir('-p', outputDir); + var builtApks = []; for (var i=0; i < apkFiles.length; ++i) { - shell.cp('-f', apkFiles[i], path.join(outputDir, path.basename(apkFiles[i]))); + var dst = path.join(outputDir, path.basename(apkFiles[i])); + builtApks.push(dst); + shell.cp('-f', apkFiles[i], dst); } + console.log('Built the following APKs:\n' + builtApks.join('\n')); + return builtApks; }); };