cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From na...@apache.org
Subject [27/29] git commit: CB-7512 Fix gradle not copying all archs to out/ (broken by prev commit)
Date Thu, 02 Oct 2014 18:18:01 GMT
CB-7512 Fix gradle not copying all archs to out/ (broken by prev commit)


Project: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/commit/a13d4bd8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/tree/a13d4bd8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/diff/a13d4bd8

Branch: refs/heads/master
Commit: a13d4bd8adc82ba21cfa5cd7ef06878f2d30f922
Parents: 82fb93d
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Tue Sep 16 15:14:40 2014 -0400
Committer: Prabhjot Singh <prabhjos@amazon.com>
Committed: Wed Sep 17 22:56:41 2014 +0530

----------------------------------------------------------------------
 bin/templates/cordova/lib/build.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-amazon-fireos/blob/a13d4bd8/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;
     });
 };
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message