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

CB-11244: Setup Api.js to support multiple builders based on project structure

Browse Source
This commit is contained in:
Joe Bowser 2017-05-31 10:23:35 -07:00
parent bd4ddcdedd
commit 28ebbb8f02
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/templates/cordova/Api.js vendored
View File

@ -58,6 +58,7 @@ function setupEvents(externalEventEmitter) {
function Api(platform, platformRootDir, events) { function Api(platform, platformRootDir, events) {
this.platform = PLATFORM; this.platform = PLATFORM;
this.root = path.resolve(__dirname, '..'); this.root = path.resolve(__dirname, '..');
this.builder = "gradle";
setupEvents(events); setupEvents(events);
@ -81,6 +82,7 @@ function Api(platform, platformRootDir, events) {
// XXX Override some locations for Android Studio projects // XXX Override some locations for Android Studio projects
if(AndroidStudio.isAndroidStudioProject(self.root) === true) { if(AndroidStudio.isAndroidStudioProject(self.root) === true) {
selfEvents.emit('log', 'Android Studio project detected'); selfEvents.emit('log', 'Android Studio project detected');
this.builder="studio";
this.android_studio = true; this.android_studio = true;
this.locations.configXml = path.join(self.root, 'app/src/main/res/xml/config.xml'); this.locations.configXml = path.join(self.root, 'app/src/main/res/xml/config.xml');
this.locations.strings = path.join(self.root, 'app/src/main/res/xml/strings.xml'); this.locations.strings = path.join(self.root, 'app/src/main/res/xml/strings.xml');
@ -257,7 +259,8 @@ Api.prototype.addPlugin = function (plugin, installOptions) {
if (plugin.getFrameworks(this.platform).length === 0) return; if (plugin.getFrameworks(this.platform).length === 0) return;
selfEvents.emit('verbose', 'Updating build files since android plugin contained <framework>'); selfEvents.emit('verbose', 'Updating build files since android plugin contained <framework>');
require('./lib/builders/builders').getBuilder('gradle').prepBuildFiles(); //This should pick the correct builder, not just get gradle
require('./lib/builders/builders').getBuilder(this.builder).prepBuildFiles();
}.bind(this)) }.bind(this))
// CB-11022 Return truthy value to prevent running prepare after // CB-11022 Return truthy value to prevent running prepare after
.thenResolve(true); .thenResolve(true);
@ -290,7 +293,7 @@ Api.prototype.removePlugin = function (plugin, uninstallOptions) {
if (plugin.getFrameworks(this.platform).length === 0) return; if (plugin.getFrameworks(this.platform).length === 0) return;
selfEvents.emit('verbose', 'Updating build files since android plugin contained <framework>'); selfEvents.emit('verbose', 'Updating build files since android plugin contained <framework>');
require('./lib/builders/builders').getBuilder('gradle').prepBuildFiles(); require('./lib/builders/builders').getBuilder(this.builder).prepBuildFiles();
}.bind(this)) }.bind(this))
// CB-11022 Return truthy value to prevent running prepare after // CB-11022 Return truthy value to prevent running prepare after
.thenResolve(true); .thenResolve(true);