github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-02-26 12:03:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.0.x (gradle fix)

Browse Source
This commit is contained in:
Andrew Grieve 2014-09-16 15:15:11 -04:00
commit 6bdc01290d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/templates/cordova/lib/build.js vendored
View File

@ -155,7 +155,6 @@ var builders = {
process.exit(2); process.exit(2);
} }
var ret = candidates[0]; var ret = candidates[0];
console.log('Using apk: ' + ret);
return [ret]; return [ret];
} }
}, },
@ -256,9 +255,7 @@ var builders = {
} }
return path.extname(candidate) == '.apk'; return path.extname(candidate) == '.apk';
}); });
var ret = candidates[0]; return candidates;
console.log('Using apk: ' + ret);
return [ret];
} }
}, },
@ -343,9 +340,14 @@ module.exports.run = function(options) {
// are used by get_apk(). // are used by get_apk().
var outputDir = path.join(ROOT, 'out'); var outputDir = path.join(ROOT, 'out');
shell.mkdir('-p', outputDir); shell.mkdir('-p', outputDir);
var builtApks = [];
for (var i=0; i < apkFiles.length; ++i) { 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;
}); });
}; };