You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ni...@apache.org on 2016/03/08 07:51:12 UTC
cordova-windows git commit: CB-10673 fixed conflicting plugin install
issue with overlapped with --force option. This closes #154
Repository: cordova-windows
Updated Branches:
refs/heads/master 60cca717a -> ff4ee9392
CB-10673 fixed conflicting plugin install issue with overlapped <source-tag> with --force option. This closes #154
Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/ff4ee939
Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/ff4ee939
Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/ff4ee939
Branch: refs/heads/master
Commit: ff4ee93924206d6810e883647754db78228bd5c5
Parents: 60cca71
Author: Byoungro So <by...@intel.com>
Authored: Fri Feb 26 22:34:29 2016 -0800
Committer: Nikhil Khandelwal <ni...@microsoft.com>
Committed: Mon Mar 7 22:51:03 2016 -0800
----------------------------------------------------------------------
template/cordova/lib/PluginHandler.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/ff4ee939/template/cordova/lib/PluginHandler.js
----------------------------------------------------------------------
diff --git a/template/cordova/lib/PluginHandler.js b/template/cordova/lib/PluginHandler.js
index 27726ea..4e031f6 100644
--- a/template/cordova/lib/PluginHandler.js
+++ b/template/cordova/lib/PluginHandler.js
@@ -36,7 +36,11 @@ var handlers = {
'source-file': {
install:function(obj, plugin, project, options) {
var dest = path.join('plugins', plugin.id, obj.targetDir || '', path.basename(obj.src));
- copyNewFile(plugin.dir, obj.src, project.root, dest);
+ if (options && options.force) {
+ copyFile(plugin.dir, obj.src, project.root, dest);
+ } else {
+ copyNewFile(plugin.dir, obj.src, project.root, dest);
+ }
// add reference to this file to jsproj.
project.addSourceFile(dest);
},
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org