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

CB-12169: Check for build directory before running a clean

Browse Source
This commit is contained in:
Joe Bowser 2016-11-21 14:41:14 -08:00 committed by Steve Gill
parent e856613787
commit c2ddd2da7f
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,6 +72,7 @@ function Api(platform, platformRootDir, events) {
defaultConfigXml: path.join(self.root, 'cordova/defaults.xml'), defaultConfigXml: path.join(self.root, 'cordova/defaults.xml'),
strings: path.join(self.root, 'res/values/strings.xml'), strings: path.join(self.root, 'res/values/strings.xml'),
manifest: path.join(self.root, 'AndroidManifest.xml'), manifest: path.join(self.root, 'AndroidManifest.xml'),
build: path.join(self.root, 'build'),
// NOTE: Due to platformApi spec we need to return relative paths here // NOTE: Due to platformApi spec we need to return relative paths here
cordovaJs: 'bin/templates/project/assets/www/cordova.js', cordovaJs: 'bin/templates/project/assets/www/cordova.js',
cordovaJsSrc: 'cordova-js-src' cordovaJsSrc: 'cordova-js-src'
@ -241,11 +242,12 @@ Api.prototype.addPlugin = function (plugin, installOptions) {
// Do some basic argument parsing // Do some basic argument parsing
var opts = {}; var opts = {};
// Skip cleaning prepared files when not invoking via cordova CLI. // Skip cleaning prepared files when not invoking via cordova CLI.
opts.noPrepare = true; opts.noPrepare = true;
if(!(AndroidStudio.isAndroidStudioProject(self.root))) if(!AndroidStudio.isAndroidStudioProject(self.root) && !project.isClean()) {
return self.clean(opts); return self.clean(opts);
}
}) })
.then(function () { .then(function () {
return PluginManager.get(self.platform, self.locations, project) return PluginManager.get(self.platform, self.locations, project)
@ -396,6 +398,8 @@ Api.prototype.clean = function(cleanOptions) {
}); });
}; };
/** /**
* Performs a requirements check for current platform. Each platform defines its * Performs a requirements check for current platform. Each platform defines its
* own set of requirements, which should be resolved before platform can be * own set of requirements, which should be resolved before platform can be

9
bin/templates/cordova/lib/AndroidProject.js vendored
View File

@ -197,5 +197,14 @@ AndroidProject.prototype.getUninstaller = function (type) {
return pluginHandlers.getUninstaller(type); return pluginHandlers.getUninstaller(type);
}; };
/*
* This checks if an Android project is clean or has old build artifacts
*/
AndroidProject.prototype.isClean = function() {
var build_path = path.join(this.projectDir, "build");
//If the build directory doesn't exist, it's clean
return !(fs.existsSync(build_path));
};
module.exports = AndroidProject; module.exports = AndroidProject;