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

CB-12524: Test distributing a wrapper in the framework directory

Browse Source
This commit is contained in:
Joe Bowser
2017-03-06 15:03:32 -08:00
parent 7d5afdebe1
commit b2664bc469
5 changed files with 265 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/lib/create.js
+3
View File
@@ -87,6 +87,9 @@ function copyJsAndLibrary(projectPath, shared, projectName) {
shell.cp('-f', path.join(ROOT, 'framework', 'build.gradle'), nestedCordovaLibPath);
shell.cp('-f', path.join(ROOT, 'framework', 'cordova.gradle'), nestedCordovaLibPath);
shell.cp('-r', path.join(ROOT, 'framework', 'src'), nestedCordovaLibPath);
shell.cp('-f', path.join(ROOT, 'framework', 'gradlew'), nestedCordovaLibPath);
shell.cp('-r', path.join(ROOT, 'framework', 'gradle'), nestedCordovaLibPath);
}
}
bin/templates/cordova/lib/builders/GradleBuilder.js
Vendored
+6 -12
View File
@@ -154,22 +154,16 @@ GradleBuilder.prototype.prepBuildFiles = function() {
});
buildGradle = buildGradle.replace(/(PLUGIN GRADLE EXTENSIONS START)[\s\S]*(\/\/ PLUGIN GRADLE EXTENSIONS END)/, '$1\n' + includeList + '$2');
fs.writeFileSync(path.join(this.root, 'build.gradle'), buildGradle);
//Q sucks!!
return Q.when();
};
GradleBuilder.prototype.prepEnv = function(opts) {
var self = this;
return check_reqs.check_gradle()
.then(function() {
return self.prepBuildFiles();
}).then(function() {
// Copy the gradle wrapper on each build so that:
// A) we don't require the Android SDK at project creation time, and
// B) we always use the SDK's latest version of it.
// check_reqs ensures that this is set.
/*jshint -W069 */
var sdkDir = process.env['ANDROID_HOME'];
/*jshint +W069 */
var wrapperDir = path.join(sdkDir, 'tools', 'templates', 'gradle', 'wrapper');
return self.prepBuildFiles().then(function() {
// We now copy the gradle out of the framework
// This is a dirty patch to get the build working
var wrapperDir = path.join(self.root, 'CordovaLib');
if (process.platform == 'win32') {
shell.rm('-f', path.join(self.root, 'gradlew.bat'));
shell.cp(path.join(wrapperDir, 'gradlew.bat'), self.root);