Return-Path: X-Original-To: apmail-cordova-dev-archive@www.apache.org Delivered-To: apmail-cordova-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 852DB18900 for ; Thu, 28 Apr 2016 20:58:08 +0000 (UTC) Received: (qmail 87011 invoked by uid 500); 28 Apr 2016 20:58:03 -0000 Delivered-To: apmail-cordova-dev-archive@cordova.apache.org Received: (qmail 86974 invoked by uid 500); 28 Apr 2016 20:58:03 -0000 Mailing-List: contact dev-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list dev@cordova.apache.org Received: (qmail 86963 invoked by uid 99); 28 Apr 2016 20:58:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Apr 2016 20:58:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E156EDFC6E; Thu, 28 Apr 2016 20:58:02 +0000 (UTC) From: vladimir-kotikov To: dev@cordova.apache.org Reply-To: dev@cordova.apache.org References: In-Reply-To: Subject: [GitHub] cordova-android pull request: CB-11117: Use FileUpdater to optimiz... Content-Type: text/plain Message-Id: <20160428205802.E156EDFC6E@git1-us-west.apache.org> Date: Thu, 28 Apr 2016 20:58:02 +0000 (UTC) Github user vladimir-kotikov commented on a diff in the pull request: https://github.com/apache/cordova-android/pull/295#discussion_r61501081 --- Diff: bin/templates/cordova/lib/prepare.js --- @@ -26,26 +26,43 @@ var AndroidManifest = require('./AndroidManifest'); var xmlHelpers = require('cordova-common').xmlHelpers; var CordovaError = require('cordova-common').CordovaError; var ConfigParser = require('cordova-common').ConfigParser; +var FileUpdater = require('cordova-common').FileUpdater; -module.exports.prepare = function (cordovaProject) { +module.exports.prepare = function (cordovaProject, options) { var self = this; + var platformResourcesDir = path.relative(cordovaProject.root, path.join(this.locations.root, 'res')); this._config = updateConfigFilesFrom(cordovaProject.projectConfig, this._munger, this.locations); // Update own www dir with project's www assets and plugins' assets and js-files - return Q.when(updateWwwFrom(cordovaProject, this.locations)) + return Q.when(updateWww.call(self, cordovaProject)) .then(function () { // update project according to config.xml changes. return updateProjectAccordingTo(self._config, self.locations); }) .then(function () { - handleIcons(cordovaProject.projectConfig, self.root); - handleSplashes(cordovaProject.projectConfig, self.root); + updateIcons.call(self, cordovaProject, platformResourcesDir); + updateSplashes.call(self, cordovaProject, platformResourcesDir); }) .then(function () { - events.emit('verbose', 'updated project successfully'); + events.emit('verbose', 'Prepared project successfully'); + }); +}; + +module.exports.clean = function (options) { + // Unfortunately the cordovaProject isn't passed into the clean() function, + // but the project root dir and config can be resolved here easily. --- End diff -- In fact there is no big difference between calling `gradle clean` and `cordova/clean.bat`but non-CLi workflow assumes that there is a contract between platform and user, according to which platform offers a set of shell scripts to control the aspects related to build system, and the `clean` is one of these scripts just as `build`, `run`, etc - you can find them inside of 'android/cordova' folder One of advantages of calling `clean` rather that `gradle clean` is that you might not have `gradle` available in path, but `clean` contains some logic (similar to build) to find gradle wrapper, and call it with appropriate arguments --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. --- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@cordova.apache.org For additional commands, e-mail: dev-help@cordova.apache.org