github/cordova-android
4
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2026-04-23 00:00:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-3445 Copy gradle wrapper in build instead of create

Browse Source 
This should play nicer with updates to the android SDK.
This commit is contained in:
Andrew Grieve
2014-08-18 14:51:10 -04:00
parent 36eab713a1
commit ca8bb75b40
3 changed files with 19 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/templates/cordova/lib/build.js
Vendored
+19
View File
@@ -51,6 +51,24 @@ function hasCustomRules() {
return fs.existsSync(path.join(ROOT, 'custom_rules.xml'));
}
// Copy the gradle wrapper files on each build so that:
// A) We don't require the Android SDK at project creation time, and
// B) So that they are always up-to-date.
function copyGradleWrapper() {
var projectPath = ROOT;
// check_reqs ensures that this is set.
var sdkDir = process.env['ANDROID_HOME'];
var wrapperDir = path.join(sdkDir, 'tools', 'templates', 'gradle', 'wrapper');
if (process.platform == 'win32') {
shell.cp('-f', path.join(wrapperDir, 'gradlew.bat'), projectPath);
} else {
shell.cp('-f', path.join(wrapperDir, 'gradlew'), projectPath);
}
shell.rm('-rf', path.join(projectPath, 'gradle', 'wrapper'));
shell.mkdir('-p', path.join(projectPath, 'gradle'));
shell.cp('-r', path.join(wrapperDir, 'gradle', 'wrapper'), path.join(projectPath, 'gradle'));
}
module.exports.builders = {
ant: {
getArgs: function(cmd) {
@@ -129,6 +147,7 @@ module.exports.builders = {
var builder = this;
var wrapper = path.join(ROOT, 'gradlew');
var args = builder.getArgs('build');
copyGradleWrapper();
return Q().then(function() {
return spawn(wrapper, args);
}).then(function() {