From 3d8281865ffa2d0c54e7c0886e3c926df515e923 Mon Sep 17 00:00:00 2001 From: Byoungro So Date: Tue, 1 Mar 2016 23:23:19 -0800 Subject: [PATCH 1/2] CB-10673 added --force-copying-src option --- cordova-lib/src/cordova/platform.js | 3 ++- cordova-lib/src/cordova/plugin.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js index 2dff59414..36e0aa1ea 100644 --- a/cordova-lib/src/cordova/platform.js +++ b/cordova-lib/src/cordova/platform.js @@ -654,7 +654,8 @@ function installPluginsForNewPlatform(platform, projectRoot, opts) { // NOTE: there is another code path for plugin installation (see CB-10274 and the // related PR: https://github.com/apache/cordova-lib/pull/360) so we need to // specify the option below in both places - usePlatformWww: true + usePlatformWww: true, + forceCopyingSrc: opts.forceCopyingSrc }; // Get plugin variables from fetch.json if have any and pass them as cli_variables to plugman diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js index 35819c315..28c8236d8 100644 --- a/cordova-lib/src/cordova/plugin.js +++ b/cordova-lib/src/cordova/plugin.js @@ -192,7 +192,8 @@ module.exports = function plugin(command, targets, opts) { // and files from 'platform_www' merged into 'www'. Thus we need to persist these // files platform_www directory, so they'll be applied to www on each prepare. usePlatformWww: true, - nohooks: opts.nohooks + nohooks: opts.nohooks, + forceCopyingSrc: opts.forceCopyingSrc }; events.emit('verbose', 'Calling plugman.install on plugin "' + pluginInfo.dir + '" for platform "' + platform); From d54a384e0fa1b07211d23929688dcbf86dc760df Mon Sep 17 00:00:00 2001 From: Byoungro So Date: Thu, 3 Mar 2016 23:01:50 -0800 Subject: [PATCH 2/2] CB-10673 changed the option to --force --- cordova-lib/src/cordova/platform.js | 2 +- cordova-lib/src/cordova/plugin.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js index 36e0aa1ea..4e6799d50 100644 --- a/cordova-lib/src/cordova/platform.js +++ b/cordova-lib/src/cordova/platform.js @@ -655,7 +655,7 @@ function installPluginsForNewPlatform(platform, projectRoot, opts) { // related PR: https://github.com/apache/cordova-lib/pull/360) so we need to // specify the option below in both places usePlatformWww: true, - forceCopyingSrc: opts.forceCopyingSrc + force: opts.force }; // Get plugin variables from fetch.json if have any and pass them as cli_variables to plugman diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js index 28c8236d8..e495201da 100644 --- a/cordova-lib/src/cordova/plugin.js +++ b/cordova-lib/src/cordova/plugin.js @@ -193,7 +193,7 @@ module.exports = function plugin(command, targets, opts) { // files platform_www directory, so they'll be applied to www on each prepare. usePlatformWww: true, nohooks: opts.nohooks, - forceCopyingSrc: opts.forceCopyingSrc + force: opts.force }; events.emit('verbose', 'Calling plugman.install on plugin "' + pluginInfo.dir + '" for platform "' + platform);