cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [1/2] cordova-lib git commit: CB-8244 Pass options object to platform handlers in plugman (commit attempt #2)
Date Thu, 08 Jan 2015 19:20:08 GMT
Repository: cordova-lib
Updated Branches:
  refs/heads/master 0f5dbaffa -> 60aa96965


CB-8244 Pass options object to platform handlers in plugman (commit attempt #2)


Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/676d8d6b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/676d8d6b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/676d8d6b

Branch: refs/heads/master
Commit: 676d8d6b9f48b074d62cc5bed3e0b17cc61c3d0a
Parents: 0f5dbaf
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Mon Jan 5 15:20:39 2015 -0500
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Thu Jan 8 11:03:21 2015 -0500

----------------------------------------------------------------------
 .../spec-plugman/install-browserify.spec.js     |  2 +-
 cordova-lib/spec-plugman/install.spec.js        |  2 +-
 cordova-lib/spec-plugman/platforms/ios.spec.js  | 66 ++++++++++----------
 .../spec-plugman/platforms/windows8.spec.js     |  8 +--
 cordova-lib/spec-plugman/platforms/wp8.spec.js  |  8 +--
 cordova-lib/src/plugman/install.js              | 20 +++---
 .../src/plugman/platforms/amazon-fireos.js      | 20 +++---
 cordova-lib/src/plugman/platforms/android.js    | 20 +++---
 .../src/plugman/platforms/blackberry10.js       | 20 +++---
 cordova-lib/src/plugman/platforms/browser.js    | 20 +++---
 cordova-lib/src/plugman/platforms/firefoxos.js  | 20 +++---
 cordova-lib/src/plugman/platforms/ios.js        | 20 +++---
 cordova-lib/src/plugman/platforms/tizen.js      | 20 +++---
 cordova-lib/src/plugman/platforms/ubuntu.js     | 20 +++---
 cordova-lib/src/plugman/platforms/windows.js    | 20 +++---
 cordova-lib/src/plugman/platforms/wp8.js        | 20 +++---
 cordova-lib/src/plugman/uninstall.js            | 20 +++---
 17 files changed, 163 insertions(+), 163 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/spec-plugman/install-browserify.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/install-browserify.spec.js b/cordova-lib/spec-plugman/install-browserify.spec.js
index 356b7a4..1897011 100644
--- a/cordova-lib/spec-plugman/install-browserify.spec.js
+++ b/cordova-lib/spec-plugman/install-browserify.spec.js
@@ -211,7 +211,7 @@ describe('install', function() {
         it('should queue up actions as appropriate for that plugin and call process on the action stack',
            function() {
                 expect(results['actions_callCount']).toEqual(3);
-                expect(results['actions_create']).toEqual([jasmine.any(Function), [jasmine.any(Object), path.join(plugins_install_dir, dummy_id), project, dummy_id], jasmine.any(Function), [jasmine.any(Object), project, dummy_id]]);
+                expect(results['actions_create']).toEqual([jasmine.any(Function), [jasmine.any(Object), path.join(plugins_install_dir, dummy_id), project, dummy_id, jasmine.any(Object)], jasmine.any(Function), [jasmine.any(Object), project, dummy_id, jasmine.any(Object)]]);
         });
 
         it('should check version if plugin has engine tag', function(){

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/spec-plugman/install.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/install.spec.js b/cordova-lib/spec-plugman/install.spec.js
index 7b83d2a..ae560cf 100644
--- a/cordova-lib/spec-plugman/install.spec.js
+++ b/cordova-lib/spec-plugman/install.spec.js
@@ -208,7 +208,7 @@ describe('install', function() {
         it('should queue up actions as appropriate for that plugin and call process on the action stack',
            function() {
                 expect(results['actions_callCount']).toEqual(3);
-                expect(results['actions_create']).toEqual([jasmine.any(Function), [jasmine.any(Object), path.join(plugins_install_dir, dummy_id), project, dummy_id], jasmine.any(Function), [jasmine.any(Object), project, dummy_id]]);
+                expect(results['actions_create']).toEqual([jasmine.any(Function), [jasmine.any(Object), path.join(plugins_install_dir, dummy_id), project, dummy_id, jasmine.any(Object)], jasmine.any(Function), [jasmine.any(Object), project, dummy_id, jasmine.any(Object)]]);
         });
 
         it('should check version if plugin has engine tag', function(){

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/spec-plugman/platforms/ios.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/platforms/ios.spec.js b/cordova-lib/spec-plugman/platforms/ios.spec.js
index 9c19d59..4a22ff7 100644
--- a/cordova-lib/spec-plugman/platforms/ios.spec.js
+++ b/cordova-lib/spec-plugman/platforms/ios.spec.js
@@ -140,7 +140,7 @@ describe('ios project handler', function() {
             it('should throw if source-file src cannot be found', function() {
                 var source = copyArray(invalid_source);
                 expect(function() {
-                    ios['source-file'].install(source[1], faultyplugin, temp, faulty_id, proj_files);
+                    ios['source-file'].install(source[1], faultyplugin, temp, faulty_id, null, proj_files);
                 }).toThrow('cannot find "' + path.resolve(faultyplugin, 'src/ios/FaultyPluginCommand.m') + '" ios <source-file>');
             });
             it('should throw if source-file target already exists', function() {
@@ -149,38 +149,38 @@ describe('ios project handler', function() {
                 shell.mkdir('-p', path.dirname(target));
                 fs.writeFileSync(target, 'some bs', 'utf-8');
                 expect(function() {
-                    ios['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+                    ios['source-file'].install(source[0], dummyplugin, temp, dummy_id, null, proj_files);
                 }).toThrow('target destination "' + target + '" already exists');
             });
             it('should call into xcodeproj\'s addSourceFile appropriately when element has no target-dir', function() {
                 var source = copyArray(valid_source).filter(function(s) { return s.attrib['target-dir'] == undefined});
                 var spy = spyOn(proj_files.xcode, 'addSourceFile');
-                ios['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+                ios['source-file'].install(source[0], dummyplugin, temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith(slashJoin('Plugins', dummy_id, 'DummyPluginCommand.m'), {});
             });
             it('should call into xcodeproj\'s addSourceFile appropriately when element has a target-dir', function() {
                 var source = copyArray(valid_source).filter(function(s) { return s.attrib['target-dir'] != undefined});
                 var spy = spyOn(proj_files.xcode, 'addSourceFile');
-                ios['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+                ios['source-file'].install(source[0], dummyplugin, temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith(slashJoin('Plugins', dummy_id, 'targetDir', 'TargetDirTest.m'), {});
             });
             it('should cp the file to the right target location when element has no target-dir', function() {
                 var source = copyArray(valid_source).filter(function(s) { return s.attrib['target-dir'] == undefined});
                 var spy = spyOn(shell, 'cp');
-                ios['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+                ios['source-file'].install(source[0], dummyplugin, temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith(path.join(dummyplugin, 'src', 'ios', 'DummyPluginCommand.m'), path.join(temp, 'SampleApp', 'Plugins', dummy_id, 'DummyPluginCommand.m'));
             });
             it('should cp the file to the right target location when element has a target-dir', function() {
                 var source = copyArray(valid_source).filter(function(s) { return s.attrib['target-dir'] != undefined});
                 var spy = spyOn(shell, 'cp');
-                ios['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+                ios['source-file'].install(source[0], dummyplugin, temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith(path.join(dummyplugin, 'src', 'ios', 'TargetDirTest.m'), path.join(temp, 'SampleApp', 'Plugins', dummy_id, 'targetDir', 'TargetDirTest.m'));
             });
             it('should call into xcodeproj\'s addFramework appropriately when element has framework=true set', function() {
                 var source = copyArray(valid_source).filter(function(s) { return s.attrib['framework'] == "true"});
                 spyOn(proj_files.xcode, 'addSourceFile');
                 var spy = spyOn(proj_files.xcode, 'addFramework');
-                ios['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+                ios['source-file'].install(source[0], dummyplugin, temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith(path.join('SampleApp', 'Plugins', dummy_id, 'SourceWithFramework.m'), {weak:false});
             });
         });
@@ -189,7 +189,7 @@ describe('ios project handler', function() {
             it('should throw if header-file src cannot be found', function() {
                 var headers = copyArray(invalid_headers);
                 expect(function() {
-                    ios['header-file'].install(headers[1], faultyplugin, temp, faulty_id, proj_files);
+                    ios['header-file'].install(headers[1], faultyplugin, temp, faulty_id, null, proj_files);
                 }).toThrow('cannot find "' + path.resolve(faultyplugin, 'src/ios/FaultyPluginCommand.h') + '" ios <header-file>');
             });
             it('should throw if header-file target already exists', function() {
@@ -198,31 +198,31 @@ describe('ios project handler', function() {
                 shell.mkdir('-p', path.dirname(target));
                 fs.writeFileSync(target, 'some bs', 'utf-8');
                 expect(function() {
-                    ios['header-file'].install(headers[0], dummyplugin, temp, dummy_id, proj_files);
+                    ios['header-file'].install(headers[0], dummyplugin, temp, dummy_id, null, proj_files);
                 }).toThrow('target destination "' + target + '" already exists');
             });
             it('should call into xcodeproj\'s addHeaderFile appropriately when element has no target-dir', function() {
                 var headers = copyArray(valid_headers).filter(function(s) { return s.attrib['target-dir'] == undefined});
                 var spy = spyOn(proj_files.xcode, 'addHeaderFile');
-                ios['header-file'].install(headers[0], dummyplugin, temp, dummy_id,  proj_files);
+                ios['header-file'].install(headers[0], dummyplugin, temp, dummy_id,  null, proj_files);
                 expect(spy).toHaveBeenCalledWith(slashJoin('Plugins', dummy_id, 'DummyPluginCommand.h'));
             });
             it('should call into xcodeproj\'s addHeaderFile appropriately when element a target-dir', function() {
                 var headers = copyArray(valid_headers).filter(function(s) { return s.attrib['target-dir'] != undefined});
                 var spy = spyOn(proj_files.xcode, 'addHeaderFile');
-                ios['header-file'].install(headers[0], dummyplugin, temp, dummy_id, proj_files);
+                ios['header-file'].install(headers[0], dummyplugin, temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith(slashJoin('Plugins', dummy_id, 'targetDir', 'TargetDirTest.h'));
             });
             it('should cp the file to the right target location when element has no target-dir', function() {
                 var headers = copyArray(valid_headers).filter(function(s) { return s.attrib['target-dir'] == undefined});
                 var spy = spyOn(shell, 'cp');
-                ios['header-file'].install(headers[0], dummyplugin, temp, dummy_id, proj_files);
+                ios['header-file'].install(headers[0], dummyplugin, temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith(path.join(dummyplugin, 'src', 'ios', 'DummyPluginCommand.h'), path.join(temp, 'SampleApp', 'Plugins', dummy_id, 'DummyPluginCommand.h'));
             });
             it('should cp the file to the right target location when element has a target-dir', function() {
                 var headers = copyArray(valid_headers).filter(function(s) { return s.attrib['target-dir'] != undefined});
                 var spy = spyOn(shell, 'cp');
-                ios['header-file'].install(headers[0], dummyplugin, temp, dummy_id, proj_files);
+                ios['header-file'].install(headers[0], dummyplugin, temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith(path.join(dummyplugin, 'src', 'ios', 'TargetDirTest.h'), path.join(temp, 'SampleApp', 'Plugins', dummy_id, 'targetDir', 'TargetDirTest.h'));
             });
         });
@@ -231,7 +231,7 @@ describe('ios project handler', function() {
             it('should throw if resource-file src cannot be found', function() {
                 var resources = copyArray(invalid_resources);
                 expect(function() {
-                    ios['resource-file'].install(resources[0], faultyplugin, temp, "pluginid", proj_files);
+                    ios['resource-file'].install(resources[0], faultyplugin, temp, "pluginid", null, proj_files);
                 }).toThrow('cannot find "' + path.resolve(faultyplugin, 'src/ios/IDontExist.bundle') + '" ios <resource-file>');
             });
             it('should throw if resource-file target already exists', function() {
@@ -240,19 +240,19 @@ describe('ios project handler', function() {
                 shell.mkdir('-p', path.dirname(target));
                 fs.writeFileSync(target, 'some bs', 'utf-8');
                 expect(function() {
-                    ios['resource-file'].install(resources[0], dummyplugin, temp, "pluginid",proj_files);
+                    ios['resource-file'].install(resources[0], dummyplugin, temp, "pluginid",null, proj_files);
                 }).toThrow('target destination "' + target + '" already exists');
             });
             it('should call into xcodeproj\'s addResourceFile', function() {
                 var resources = copyArray(valid_resources);
                 var spy = spyOn(proj_files.xcode, 'addResourceFile');
-                ios['resource-file'].install(resources[0], dummyplugin, temp, "pluginid", proj_files);
+                ios['resource-file'].install(resources[0], dummyplugin, temp, "pluginid", null, proj_files);
                 expect(spy).toHaveBeenCalledWith(path.join('Resources', 'DummyPlugin.bundle'));
             });
             it('should cp the file to the right target location', function() {
                 var resources = copyArray(valid_resources);
                 var spy = spyOn(shell, 'cp');
-                ios['resource-file'].install(resources[0], dummyplugin, temp, "pluginid", proj_files);
+                ios['resource-file'].install(resources[0], dummyplugin, temp, "pluginid", null, proj_files);
                 expect(spy).toHaveBeenCalledWith('-R', path.join(dummyplugin, 'src', 'ios', 'DummyPlugin.bundle'), path.join(temp, 'SampleApp', 'Resources'));
             });
         });
@@ -260,7 +260,7 @@ describe('ios project handler', function() {
             it('should throw if framework src cannot be found', function() {
                 var frameworks = copyArray(invalid_custom_frameworks);
                 expect(function() {
-                    ios['framework'].install(frameworks[0], faultyplugin, temp, dummy_id, proj_files);
+                    ios['framework'].install(frameworks[0], faultyplugin, temp, dummy_id, null, proj_files);
                 }).toThrow('cannot find "' + path.resolve(faultyplugin, 'src/ios/NonExistantCustomFramework.framework') + '" ios <framework>');
             });
             it('should throw if framework target already exists', function() {
@@ -268,19 +268,19 @@ describe('ios project handler', function() {
                 var target = path.join(temp, 'SampleApp/Plugins/com.phonegap.plugins.dummyplugin/Custom.framework');
                 shell.mkdir('-p', target);
                 expect(function() {
-                    ios['framework'].install(frameworks[0], dummyplugin, temp, dummy_id, proj_files);
+                    ios['framework'].install(frameworks[0], dummyplugin, temp, dummy_id, null, proj_files);
                 }).toThrow('target destination "' + target + '" already exists');
             });
             it('should call into xcodeproj\'s addFramework', function() {
                 var frameworks = copyArray(valid_custom_frameworks);
                 var spy = spyOn(proj_files.xcode, 'addFramework');
-                ios['framework'].install(frameworks[0], dummyplugin, temp, dummy_id, proj_files);
+                ios['framework'].install(frameworks[0], dummyplugin, temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith(path.normalize('SampleApp/Plugins/com.phonegap.plugins.dummyplugin/Custom.framework'), {customFramework:true});
             });
             it('should cp the file to the right target location', function() {
                 var frameworks = copyArray(valid_custom_frameworks);
                 var spy = spyOn(shell, 'cp');
-                ios['framework'].install(frameworks[0], dummyplugin, temp, dummy_id, proj_files);
+                ios['framework'].install(frameworks[0], dummyplugin, temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith('-R', path.join(dummyplugin, 'src', 'ios', 'Custom.framework'),
                                                  path.join(temp, 'SampleApp/Plugins/com.phonegap.plugins.dummyplugin'));
             });
@@ -318,14 +318,14 @@ describe('ios project handler', function() {
                 var source = copyArray(valid_source).filter(function(s) { return s.attrib['target-dir'] == undefined});
                 shell.cp('-rf', ios_config_xml_project, temp);
                 var spy = spyOn(proj_files.xcode, 'removeSourceFile');
-                ios['source-file'].uninstall(source[0], temp, dummy_id, proj_files);
+                ios['source-file'].uninstall(source[0], temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith(slashJoin('Plugins', dummy_id, 'DummyPluginCommand.m'));
             });
             it('should call into xcodeproj\'s removeSourceFile appropriately when element a target-dir', function(){
                 var source = copyArray(valid_source).filter(function(s) { return s.attrib['target-dir'] != undefined});
                 shell.cp('-rf', ios_config_xml_project, temp);
                 var spy = spyOn(proj_files.xcode, 'removeSourceFile');
-                ios['source-file'].uninstall(source[0], temp, dummy_id, proj_files);
+                ios['source-file'].uninstall(source[0], temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith(slashJoin('Plugins', dummy_id, 'targetDir', 'TargetDirTest.m'));
             });
             it('should rm the file from the right target location when element has no target-dir', function(){
@@ -333,7 +333,7 @@ describe('ios project handler', function() {
                 shell.cp('-rf', ios_config_xml_project, temp);
 
                 var spy = spyOn(shell, 'rm');
-                ios['source-file'].uninstall(source[0], temp, dummy_id, proj_files);
+                ios['source-file'].uninstall(source[0], temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith('-rf', path.join(temp, 'SampleApp', 'Plugins', dummy_id, 'DummyPluginCommand.m'));
             });
             it('should rm the file from the right target location when element has a target-dir', function(){
@@ -341,7 +341,7 @@ describe('ios project handler', function() {
                 shell.cp('-rf', ios_config_xml_project, temp);
                 var spy = spyOn(shell, 'rm');
 
-                ios['source-file'].uninstall(source[0], temp, dummy_id, proj_files);
+                ios['source-file'].uninstall(source[0], temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith('-rf', path.join(temp, 'SampleApp', 'Plugins', dummy_id, 'targetDir', 'TargetDirTest.m'));
             });
             it('should call into xcodeproj\'s removeFramework appropriately when element framework=true set', function(){
@@ -349,7 +349,7 @@ describe('ios project handler', function() {
                 shell.cp('-rf', ios_config_xml_project, temp);
                 var spy = spyOn(proj_files.xcode, 'removeFramework');
 
-                ios['source-file'].uninstall(source[0], temp, dummy_id, proj_files);
+                ios['source-file'].uninstall(source[0], temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith(path.join('SampleApp', 'Plugins', dummy_id, 'SourceWithFramework.m'));
             });
         });
@@ -362,7 +362,7 @@ describe('ios project handler', function() {
                 var headers = copyArray(valid_headers).filter(function(s) { return s.attrib['target-dir'] == undefined});
                 var spy = spyOn(proj_files.xcode, 'removeHeaderFile');
 
-                ios['header-file'].uninstall(headers[0], temp, dummy_id, proj_files);
+                ios['header-file'].uninstall(headers[0], temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith(slashJoin('Plugins', dummy_id, 'DummyPluginCommand.h'));
             });
             it('should call into xcodeproj\'s removeHeaderFile appropriately when element a target-dir', function(){
@@ -370,14 +370,14 @@ describe('ios project handler', function() {
 
                 var spy = spyOn(proj_files.xcode, 'removeHeaderFile');
 
-                ios['header-file'].uninstall(headers[0], temp, dummy_id, proj_files);
+                ios['header-file'].uninstall(headers[0], temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith(slashJoin('Plugins', dummy_id, 'targetDir', 'TargetDirTest.h'));
             });
             it('should rm the file from the right target location', function(){
                 var headers = copyArray(valid_headers).filter(function(s) { return s.attrib['target-dir'] != undefined});
                 var spy = spyOn(shell, 'rm');
 
-                ios['header-file'].uninstall(headers[0], temp, dummy_id, proj_files);
+                ios['header-file'].uninstall(headers[0], temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith('-rf', path.join(temp, 'SampleApp', 'Plugins', dummy_id, 'targetDir', 'TargetDirTest.h'));
             });
         });
@@ -390,14 +390,14 @@ describe('ios project handler', function() {
                 var resources = copyArray(valid_resources);
                 var spy = spyOn(proj_files.xcode, 'removeResourceFile');
 
-                ios['resource-file'].uninstall(resources[0], temp, "pluginid", proj_files);
+                ios['resource-file'].uninstall(resources[0], temp, "pluginid", null, proj_files);
                 expect(spy).toHaveBeenCalledWith(path.join('Resources', 'DummyPlugin.bundle'));
             });
             it('should rm the file from the right target location', function(){
                 var resources = copyArray(valid_resources);
                 var spy = spyOn(shell, 'rm');
 
-                ios['resource-file'].uninstall(resources[0], temp, "pluginid", proj_files);
+                ios['resource-file'].uninstall(resources[0], temp, "pluginid", null, proj_files);
                 expect(spy).toHaveBeenCalledWith('-rf', path.join(temp, 'SampleApp', 'Resources', 'DummyPlugin.bundle'));
             });
         });
@@ -409,14 +409,14 @@ describe('ios project handler', function() {
                 var frameworks = copyArray(valid_custom_frameworks);
                 var spy = spyOn(proj_files.xcode, 'removeFramework');
 
-                ios['framework'].uninstall(frameworks[0], temp, dummy_id, proj_files);
+                ios['framework'].uninstall(frameworks[0], temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith(path.join(temp, 'SampleApp/Plugins/com.phonegap.plugins.dummyplugin/Custom.framework'), {customFramework:true});
             });
             it('should rm the file from the right target location', function(){
                 var frameworks = copyArray(valid_custom_frameworks);
                 var spy = spyOn(shell, 'rm');
 
-                ios['framework'].uninstall(frameworks[0], temp, dummy_id, proj_files);
+                ios['framework'].uninstall(frameworks[0], temp, dummy_id, null, proj_files);
                 expect(spy).toHaveBeenCalledWith('-rf', path.join(temp, 'SampleApp/Plugins/com.phonegap.plugins.dummyplugin/Custom.framework'));
             });
         });

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/spec-plugman/platforms/windows8.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/platforms/windows8.spec.js b/cordova-lib/spec-plugman/platforms/windows8.spec.js
index fd550e9..0358749 100644
--- a/cordova-lib/spec-plugman/platforms/windows8.spec.js
+++ b/cordova-lib/spec-plugman/platforms/windows8.spec.js
@@ -107,13 +107,13 @@ describe('windows8 project handler', function() {
             it('should copy stuff from one location to another by calling common.copyFile', function() {
                 var source = copyArray(valid_source);
                 var s = spyOn(common, 'copyFile');
-                windows8['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+                windows8['source-file'].install(source[0], dummyplugin, temp, dummy_id, null, proj_files);
                 expect(s).toHaveBeenCalledWith(dummyplugin, 'src/windows8/dummer.js', temp, path.join('plugins', 'com.phonegap.plugins.dummyplugin', 'dummer.js'));
             });
             it('should throw if source-file src cannot be found', function() {
                 var source = copyArray(invalid_source);
                 expect(function() {
-                    windows8['source-file'].install(source[1], faultyplugin, temp, faulty_id, proj_files);
+                    windows8['source-file'].install(source[1], faultyplugin, temp, faulty_id, null, proj_files);
                 }).toThrow('"' + path.resolve(faultyplugin, 'src/windows8/NotHere.js') + '" not found!');
             });
             it('should throw if source-file target already exists', function() {
@@ -122,7 +122,7 @@ describe('windows8 project handler', function() {
                 shell.mkdir('-p', path.dirname(target));
                 fs.writeFileSync(target, 'some bs', 'utf-8');
                 expect(function() {
-                    windows8['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+                    windows8['source-file'].install(source[0], dummyplugin, temp, dummy_id, null, proj_files);
                 }).toThrow('"' + target + '" already exists!');
             });
         });
@@ -143,7 +143,7 @@ describe('windows8 project handler', function() {
                 install('windows8', temp, dummyplugin, plugins_dir, {})
                 .then(function() {
                     var source = copyArray(valid_source);
-                    windows8['source-file'].uninstall(source[0], temp, dummy_id, proj_files);
+                    windows8['source-file'].uninstall(source[0], temp, dummy_id, null, proj_files);
                     expect(s).toHaveBeenCalledWith(temp, path.join('plugins',  'com.phonegap.plugins.dummyplugin', 'dummer.js'));
                     done();
                 });

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/spec-plugman/platforms/wp8.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-plugman/platforms/wp8.spec.js b/cordova-lib/spec-plugman/platforms/wp8.spec.js
index 6679445..ca4c1f5 100644
--- a/cordova-lib/spec-plugman/platforms/wp8.spec.js
+++ b/cordova-lib/spec-plugman/platforms/wp8.spec.js
@@ -106,13 +106,13 @@ describe('wp8 project handler', function() {
             it('should copy stuff from one location to another by calling common.copyFile', function() {
                 var source = copyArray(valid_source);
                 var s = spyOn(common, 'copyFile');
-                wp8['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+                wp8['source-file'].install(source[0], dummyplugin, temp, dummy_id, null, proj_files);
                 expect(s).toHaveBeenCalledWith(dummyplugin, 'src/wp8/DummyPlugin.cs', temp, path.join('Plugins', 'com.phonegap.plugins.dummyplugin', 'DummyPlugin.cs'));
             });
             it('should throw if source-file src cannot be found', function() {
                 var source = copyArray(invalid_source);
                 expect(function() {
-                    wp8['source-file'].install(source[1], faultyplugin, temp, faulty_id, proj_files);
+                    wp8['source-file'].install(source[1], faultyplugin, temp, faulty_id, null, proj_files);
                 }).toThrow('"' + path.resolve(faultyplugin, 'src/wp8/NotHere.cs') + '" not found!');
             });
             it('should throw if source-file target already exists', function() {
@@ -121,7 +121,7 @@ describe('wp8 project handler', function() {
                 shell.mkdir('-p', path.dirname(target));
                 fs.writeFileSync(target, 'some bs', 'utf-8');
                 expect(function() {
-                    wp8['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files);
+                    wp8['source-file'].install(source[0], dummyplugin, temp, dummy_id, null, proj_files);
                 }).toThrow('"' + target + '" already exists!');
             });
         });
@@ -158,7 +158,7 @@ describe('wp8 project handler', function() {
                 install('wp8', temp, dummyplugin, plugins_dir, {})
                 .then(function() {
                     var source = copyArray(valid_source);
-                    wp8['source-file'].uninstall(source[0], temp, dummy_id, proj_files);
+                    wp8['source-file'].uninstall(source[0], temp, dummy_id, null, proj_files);
                     expect(s).toHaveBeenCalledWith(temp, path.join('Plugins', 'com.phonegap.plugins.dummyplugin', 'DummyPlugin.cs'));
                     done();
                 });

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/src/plugman/install.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/install.js b/cordova-lib/src/plugman/install.js
index c71b8b7..7aa7837 100644
--- a/cordova-lib/src/plugman/install.js
+++ b/cordova-lib/src/plugman/install.js
@@ -552,37 +552,37 @@ function handleInstall(actions, pluginInfo, platform, project_dir, plugins_dir,
         // queue up native stuff
         sourceFiles && sourceFiles.forEach(function(item) {
             actions.push(actions.createAction(handler['source-file'].install,
-                                              [item, plugin_dir, project_dir, pluginInfo.id],
+                                              [item, plugin_dir, project_dir, pluginInfo.id, options],
                                               handler['source-file'].uninstall,
-                                              [item, project_dir, pluginInfo.id]));
+                                              [item, project_dir, pluginInfo.id, options]));
         });
 
         headerFiles && headerFiles.forEach(function(item) {
             actions.push(actions.createAction(handler['header-file'].install,
-                                             [item, plugin_dir, project_dir, pluginInfo.id],
+                                             [item, plugin_dir, project_dir, pluginInfo.id, options],
                                              handler['header-file'].uninstall,
-                                             [item, project_dir, pluginInfo.id]));
+                                             [item, project_dir, pluginInfo.id, options]));
         });
 
         resourceFiles && resourceFiles.forEach(function(item) {
             actions.push(actions.createAction(handler['resource-file'].install,
-                                              [item, plugin_dir, project_dir, pluginInfo.id],
+                                              [item, plugin_dir, project_dir, pluginInfo.id, options],
                                               handler['resource-file'].uninstall,
-                                              [item, project_dir, pluginInfo.id]));
+                                              [item, project_dir, pluginInfo.id, options]));
         });
         // CB-5238 custom frameworks only
         frameworkFiles && frameworkFiles.forEach(function(item) {
             actions.push(actions.createAction(handler['framework'].install,
-                                             [item, plugin_dir, project_dir, pluginInfo.id],
+                                             [item, plugin_dir, project_dir, pluginInfo.id, options],
                                              handler['framework'].uninstall,
-                                             [item, project_dir, pluginInfo.id]));
+                                             [item, project_dir, pluginInfo.id, options]));
         });
 
         libFiles && libFiles.forEach(function(item) {
             actions.push(actions.createAction(handler['lib-file'].install,
-                                                [item, plugin_dir, project_dir, pluginInfo.id],
+                                                [item, plugin_dir, project_dir, pluginInfo.id, options],
                                                 handler['lib-file'].uninstall,
-                                                [item, project_dir, pluginInfo.id]));
+                                                [item, project_dir, pluginInfo.id, options]));
 
         });
     }

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/src/plugman/platforms/amazon-fireos.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/amazon-fireos.js b/cordova-lib/src/plugman/platforms/amazon-fireos.js
index 3b03d8e..636e249 100644
--- a/cordova-lib/src/plugman/platforms/amazon-fireos.js
+++ b/cordova-lib/src/plugman/platforms/amazon-fireos.js
@@ -45,49 +45,49 @@ module.exports = {
         return mDoc._root.attrib['package'];
     },
     'source-file':{
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             var dest = path.join(source_el.attrib['target-dir'], path.basename(source_el.attrib['src']));
             common.copyFile(plugin_dir, source_el.attrib['src'], project_dir, dest);
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             var dest = path.join(source_el.attrib['target-dir'], path.basename(source_el.attrib['src']));
             common.deleteJava(project_dir, dest);
         }
     },
     'header-file': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'header-fileinstall is not supported for amazon-fireos');
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             events.emit('verbose', 'header-file.uninstall is not supported for amazon-fireos');
         }
     },
     'lib-file':{
-        install:function(lib_el, plugin_dir, project_dir, plugin_id) {
+        install:function(lib_el, plugin_dir, project_dir, plugin_id, options) {
             var src = lib_el.attrib.src;
             var dest = path.join('libs', path.basename(src));
             common.copyFile(plugin_dir, src, project_dir, dest);
         },
-        uninstall:function(lib_el, project_dir, plugin_id) {
+        uninstall:function(lib_el, project_dir, plugin_id, options) {
             var src = lib_el.attrib.src;
             var dest = path.join('libs', path.basename(src));
             common.removeFile(project_dir, dest);
         }
     },
     'resource-file':{
-        install:function(el, plugin_dir, project_dir, plugin_id) {
+        install:function(el, plugin_dir, project_dir, plugin_id, options) {
             var src = el.attrib.src;
             var target = el.attrib.target;
             events.emit('verbose', 'Copying resource file ' + src + ' to ' + target);
             common.copyFile(plugin_dir, src, project_dir, target);
         },
-        uninstall:function(el, project_dir, plugin_id) {
+        uninstall:function(el, project_dir, plugin_id, options) {
             var target = el.attrib.target;
             common.removeFile(project_dir, target);
         }
     },
     'framework': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             var src = source_el.attrib.src;
             var custom = source_el.attrib.custom;
             if (!src) throw new Error('src not specified in framework element');
@@ -115,7 +115,7 @@ module.exports = {
                 projectConfig.addSubProject(parentDir, subDir);
             }
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             var src = source_el.attrib.src;
             var custom = source_el.attrib.custom;
             if (!src) throw new Error('src not specified in framework element');

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/src/plugman/platforms/android.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/android.js b/cordova-lib/src/plugman/platforms/android.js
index 2073c50..0657af7 100644
--- a/cordova-lib/src/plugman/platforms/android.js
+++ b/cordova-lib/src/plugman/platforms/android.js
@@ -51,7 +51,7 @@ module.exports = {
         return packageName.substring(lastDotIndex + 1);
     },
     'source-file':{
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             var src = source_el.attrib['src'];
             if (!src) {
                 throw new CordovaError('<source-file> element is missing "src" attribute: ' + source_el);
@@ -64,45 +64,45 @@ module.exports = {
 
             common.copyNewFile(plugin_dir, src, project_dir, dest);
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             var dest = path.join(source_el.attrib['target-dir'], path.basename(source_el.attrib['src']));
             common.deleteJava(project_dir, dest);
         }
     },
     'header-file': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'header-file.install is not supported for android');
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             events.emit('verbose', 'header-file.uninstall is not supported for android');
         }
     },
     'lib-file':{
-        install:function(lib_el, plugin_dir, project_dir, plugin_id) {
+        install:function(lib_el, plugin_dir, project_dir, plugin_id, options) {
             var src = lib_el.attrib.src;
             var dest = path.join('libs', path.basename(src));
             common.copyFile(plugin_dir, src, project_dir, dest);
         },
-        uninstall:function(lib_el, project_dir, plugin_id) {
+        uninstall:function(lib_el, project_dir, plugin_id, options) {
             var src = lib_el.attrib.src;
             var dest = path.join('libs', path.basename(src));
             common.removeFile(project_dir, dest);
         }
     },
     'resource-file':{
-        install:function(el, plugin_dir, project_dir, plugin_id) {
+        install:function(el, plugin_dir, project_dir, plugin_id, options) {
             var src = el.attrib.src;
             var target = el.attrib.target;
             events.emit('verbose', 'Copying resource file ' + src + ' to ' + target);
             common.copyFile(plugin_dir, src, project_dir, path.normalize(target));
         },
-        uninstall:function(el, project_dir, plugin_id) {
+        uninstall:function(el, project_dir, plugin_id, options) {
             var target = el.attrib.target;
             common.removeFile(project_dir, path.normalize(target));
         }
     },
     'framework': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             var src = source_el.attrib.src;
             var custom = source_el.attrib.custom;
             if (!src) throw new CordovaError('src not specified in <framework>: ' + source_el);
@@ -130,7 +130,7 @@ module.exports = {
                 projectConfig.addSubProject(parentDir, subDir);
             }
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             var src = source_el.attrib.src;
             var custom = source_el.attrib.custom;
             if (!src) throw new CordovaError('src not specified in <framework>: ' + source_el);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/src/plugman/platforms/blackberry10.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/blackberry10.js b/cordova-lib/src/plugman/platforms/blackberry10.js
index 9411f9f..008b7e7 100644
--- a/cordova-lib/src/plugman/platforms/blackberry10.js
+++ b/cordova-lib/src/plugman/platforms/blackberry10.js
@@ -40,7 +40,7 @@ module.exports = {
         return widget_doc._root.attrib['id'];
     },
     'source-file':{
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             var src = source_el.attrib['src'];
             var target = source_el.attrib['target-dir'] || plugin_id;
             TARGETS.forEach(function(arch) {
@@ -49,7 +49,7 @@ module.exports = {
                 common.copyNewFile(plugin_dir, src, project_dir, dest);
             });
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             var src = source_el.attrib['src'];
             var target = source_el.attrib['target-dir'] || plugin_id;
             TARGETS.forEach(function(arch) {
@@ -59,21 +59,21 @@ module.exports = {
         }
     },
     'header-file': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'header-file.install is not supported for blackberry');
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             events.emit('verbose', 'header-file.uninstall is not supported for blackberry');
         }
     },
     'lib-file':{
-        install:function(lib_el, plugin_dir, project_dir, plugin_id) {
+        install:function(lib_el, plugin_dir, project_dir, plugin_id, options) {
             var src = lib_el.attrib.src;
             var arch = lib_el.attrib.arch;
             var dest = path.join('native', arch, 'plugins', 'jnext', path.basename(src));
             common.copyFile(plugin_dir, src, project_dir, dest);
         },
-        uninstall:function(lib_el, project_dir, plugin_id) {
+        uninstall:function(lib_el, project_dir, plugin_id, options) {
             var src = lib_el.attrib.src;
             var arch = lib_el.attrib.arch;
             var dest = path.join('native', arch, 'plugins', 'jnext', path.basename(src));
@@ -81,18 +81,18 @@ module.exports = {
         }
     },
     'resource-file':{
-        install:function(el, plugin_dir, project_dir, plugin_id) {
+        install:function(el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'resource-file.install is not supported for blackberry');
         },
-        uninstall:function(el, project_dir, plugin_id) {
+        uninstall:function(el, project_dir, plugin_id, options) {
             events.emit('verbose', 'resource-file.uninstall is not supported for blackberry');
         }
     },
     'framework': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'framework.install is not supported for blackberry');
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             events.emit('verbose', 'framework.uninstall is not supported for blackberry');
         }
     }

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/src/plugman/platforms/browser.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/browser.js b/cordova-lib/src/plugman/platforms/browser.js
index 32158e4..9774005 100644
--- a/cordova-lib/src/plugman/platforms/browser.js
+++ b/cordova-lib/src/plugman/platforms/browser.js
@@ -55,44 +55,44 @@ module.exports = {
         return widget_doc._root.attrib['id'];
     },
     'source-file':{
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             var dest = path.join(source_el.attrib['target-dir'], path.basename(source_el.attrib['src']));
             common.copyFile(plugin_dir, source_el.attrib['src'], project_dir, dest);
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             var dest = path.join(source_el.attrib['target-dir'], path.basename(source_el.attrib['src']));
             common.removeFile(project_dir, dest);
         }
     },
     'header-file': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'header-fileinstall is not supported for browser');
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             events.emit('verbose', 'header-file.uninstall is not supported for browser');
         }
     },
     'resource-file':{
-        install:function(el, plugin_dir, project_dir, plugin_id) {
+        install:function(el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'resource-file.install is not supported for browser');
         },
-        uninstall:function(el, project_dir, plugin_id) {
+        uninstall:function(el, project_dir, plugin_id, options) {
             events.emit('verbose', 'resource-file.uninstall is not supported for browser');
         }
     },
     'framework': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'framework.install is not supported for browser');
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             events.emit('verbose', 'framework.uninstall is not supported for browser');
         }
     },
     'lib-file': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'lib-file.install is not supported for browser');
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             events.emit('verbose', 'lib-file.uninstall is not supported for browser');
         }
     }

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/src/plugman/platforms/firefoxos.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/firefoxos.js b/cordova-lib/src/plugman/platforms/firefoxos.js
index 7d8d8f6..00d5aa6 100644
--- a/cordova-lib/src/plugman/platforms/firefoxos.js
+++ b/cordova-lib/src/plugman/platforms/firefoxos.js
@@ -55,44 +55,44 @@ module.exports = {
         return widget_doc._root.attrib['id'];
     },
     'source-file':{
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             var dest = path.join(source_el.attrib['target-dir'], path.basename(source_el.attrib['src']));
             common.copyFile(plugin_dir, source_el.attrib['src'], project_dir, dest);
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             var dest = path.join(source_el.attrib['target-dir'], path.basename(source_el.attrib['src']));
             common.removeFile(project_dir, dest);
         }
     },
     'header-file': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'header-fileinstall is not supported for firefoxos');
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             events.emit('verbose', 'header-file.uninstall is not supported for firefoxos');
         }
     },
     'resource-file':{
-        install:function(el, plugin_dir, project_dir, plugin_id) {
+        install:function(el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'resource-file.install is not supported for firefoxos');
         },
-        uninstall:function(el, project_dir, plugin_id) {
+        uninstall:function(el, project_dir, plugin_id, options) {
             events.emit('verbose', 'resource-file.uninstall is not supported for firefoxos');
         }
     },
     'framework': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'framework.install is not supported for firefoxos');
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             events.emit('verbose', 'framework.uninstall is not supported for firefoxos');
         }
     },
     'lib-file': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'lib-file.install is not supported for firefoxos');
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             events.emit('verbose', 'lib-file.uninstall is not supported for firefoxos');
         }
     }

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/src/plugman/platforms/ios.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/ios.js b/cordova-lib/src/plugman/platforms/ios.js
index 1b4a2a0..e67c3b3 100644
--- a/cordova-lib/src/plugman/platforms/ios.js
+++ b/cordova-lib/src/plugman/platforms/ios.js
@@ -41,7 +41,7 @@ module.exports = {
         return plist.parse(fs.readFileSync(plist_file, 'utf8')).CFBundleIdentifier;
     },
     'source-file':{
-        install:function(source_el, plugin_dir, project_dir, plugin_id, project) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options, project) {
             var src = source_el.attrib['src'];
             var srcFile = path.resolve(plugin_dir, src);
             var targetDir = path.resolve(project.plugins_dir, plugin_id, getRelativeDir(source_el));
@@ -66,7 +66,7 @@ module.exports = {
             shell.mkdir('-p', targetDir);
             shell.cp(srcFile, destFile);
         },
-        uninstall:function(source_el, project_dir, plugin_id, project) {
+        uninstall:function(source_el, project_dir, plugin_id, options, project) {
             var src = source_el.attrib['src'];
             var targetDir = path.resolve(project.plugins_dir, plugin_id, getRelativeDir(source_el));
             var destFile = path.resolve(targetDir, path.basename(src));
@@ -89,7 +89,7 @@ module.exports = {
         }
     },
     'header-file':{
-        install:function(header_el, plugin_dir, project_dir, plugin_id, project) {
+        install:function(header_el, plugin_dir, project_dir, plugin_id, options, project) {
             var src = header_el.attrib['src'];
             var srcFile = path.resolve(plugin_dir, src);
             var targetDir = path.resolve(project.plugins_dir, plugin_id, getRelativeDir(header_el));
@@ -104,7 +104,7 @@ module.exports = {
             shell.mkdir('-p', targetDir);
             shell.cp(srcFile, destFile);
         },
-        uninstall:function(header_el, project_dir, plugin_id, project) {
+        uninstall:function(header_el, project_dir, plugin_id, options, project) {
             var src = header_el.attrib['src'];
             var targetDir = path.resolve(project.plugins_dir, plugin_id, getRelativeDir(header_el));
             var destFile = path.resolve(targetDir, path.basename(src));
@@ -120,7 +120,7 @@ module.exports = {
         }
     },
     'resource-file':{
-        install:function(resource_el, plugin_dir, project_dir, plugin_id, project) {
+        install:function(resource_el, plugin_dir, project_dir, plugin_id, options, project) {
             var src = resource_el.attrib['src'],
                 srcFile = path.resolve(plugin_dir, src),
                 destFile = path.resolve(project.resources_dir, path.basename(src));
@@ -129,7 +129,7 @@ module.exports = {
             project.xcode.addResourceFile(path.join('Resources', path.basename(src)));
             shell.cp('-R', srcFile, project.resources_dir);
         },
-        uninstall:function(resource_el, project_dir, plugin_id, project) {
+        uninstall:function(resource_el, project_dir, plugin_id, options, project) {
             var src = resource_el.attrib['src'],
                 destFile = path.resolve(project.resources_dir, path.basename(src));
             project.xcode.removeResourceFile(path.join('Resources', path.basename(src)));
@@ -137,7 +137,7 @@ module.exports = {
         }
     },
     'framework':{ // CB-5238 custom frameworks only
-        install:function(framework_el, plugin_dir, project_dir, plugin_id, project) {
+        install:function(framework_el, plugin_dir, project_dir, plugin_id, options, project) {
             var src = framework_el.attrib['src'],
                 custom = framework_el.attrib['custom'],
                 srcFile = path.resolve(plugin_dir, src),
@@ -150,7 +150,7 @@ module.exports = {
             var project_relative = path.relative(project_dir, targetDir);
             project.xcode.addFramework(project_relative, {customFramework: true});
         },
-        uninstall:function(framework_el, project_dir, plugin_id, project) {
+        uninstall:function(framework_el, project_dir, plugin_id, options, project) {
             var src = framework_el.attrib['src'],
                 targetDir = path.resolve(project.plugins_dir, plugin_id, path.basename(src));
             project.xcode.removeFramework(targetDir, {customFramework: true});
@@ -158,10 +158,10 @@ module.exports = {
         }
     },
     'lib-file': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'lib-file.install is not supported for ios');
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             events.emit('verbose', 'lib-file.uninstall is not supported for ios');
         }
     },

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/src/plugman/platforms/tizen.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/tizen.js b/cordova-lib/src/plugman/platforms/tizen.js
index ed12c0b..f471b13 100644
--- a/cordova-lib/src/plugman/platforms/tizen.js
+++ b/cordova-lib/src/plugman/platforms/tizen.js
@@ -52,23 +52,23 @@ module.exports = {
         return widget_doc._root.attrib['id'];
     },
     'source-file':{
-        install: function(source_el, plugin_dir, project_dir, plugin_id) {},
-        uninstall: function(source_el, project_dir, plugin_id) {}
+        install: function(source_el, plugin_dir, project_dir, plugin_id, options) {},
+        uninstall: function(source_el, project_dir, plugin_id, options) {}
     },
     'header-file': {
-        install: function(source_el, plugin_dir, project_dir, plugin_id) {},
-        uninstall: function(source_el, project_dir, plugin_id) {}
+        install: function(source_el, plugin_dir, project_dir, plugin_id, options) {},
+        uninstall: function(source_el, project_dir, plugin_id, options) {}
     },
     'resource-file':{
-        install: function(source_el, plugin_dir, project_dir, plugin_id) {},
-        uninstall: function(source_el, project_dir, plugin_id) {}
+        install: function(source_el, plugin_dir, project_dir, plugin_id, options) {},
+        uninstall: function(source_el, project_dir, plugin_id, options) {}
     },
     'framework': {
-        install: function(source_el, plugin_dir, project_dir, plugin_id) {},
-        uninstall: function(source_el, project_dir, plugin_id) {}
+        install: function(source_el, plugin_dir, project_dir, plugin_id, options) {},
+        uninstall: function(source_el, project_dir, plugin_id, options) {}
     },
     'lib-file': {
-        install: function(source_el, plugin_dir, project_dir, plugin_id) {},
-        uninstall: function(source_el, project_dir, plugin_id) {}
+        install: function(source_el, plugin_dir, project_dir, plugin_id, options) {},
+        uninstall: function(source_el, project_dir, plugin_id, options) {}
     }
 };

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/src/plugman/platforms/ubuntu.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/ubuntu.js b/cordova-lib/src/plugman/platforms/ubuntu.js
index bf2665b..d16a8e7 100644
--- a/cordova-lib/src/plugman/platforms/ubuntu.js
+++ b/cordova-lib/src/plugman/platforms/ubuntu.js
@@ -50,14 +50,14 @@ module.exports = {
         return widget_doc._root.attrib['id'];
     },
     'source-file':{
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             var dest = path.join('build', 'src', 'plugins', plugin_id, path.basename(source_el.attrib.src));
             common.copyFile(plugin_dir, source_el.attrib.src, project_dir, dest);
 
             var cmake = path.join(project_dir, 'build', 'CMakeLists.txt');
             shell.exec('touch ' + cmake);
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             var dest = path.join(project_dir, 'build', 'src', 'plugins', plugin_id);
             shell.rm(path.join(dest, path.basename(source_el.attrib.src)));
 
@@ -66,7 +66,7 @@ module.exports = {
         }
     },
     'header-file':{
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             var dest = path.join('build', 'src', 'plugins', plugin_id, path.basename(source_el.attrib.src));
             common.copyFile(plugin_dir, source_el.attrib.src, project_dir, dest);
 
@@ -80,7 +80,7 @@ module.exports = {
 
             fs.writeFileSync(plugins, src);
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             var dest = path.join(project_dir, 'build', 'src', 'plugins', plugin_id);
             shell.rm(path.join(dest, path.basename(source_el.attrib.src)));
 
@@ -96,13 +96,13 @@ module.exports = {
         }
     },
     'resource-file':{
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             var dest = path.join('qml', path.basename(source_el.attrib.src));
             if (source_el.attrib['target-dir'])
                 dest = path.join(source_el.attrib['target-dir'], path.basename(source_el.attrib.src));
             common.copyFile(plugin_dir, source_el.attrib.src, project_dir, dest);
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             var dest = path.join(project_dir, 'qml');
             if (source_el.attrib['target-dir'])
                 dest = path.join(project_dir, source_el.attrib['target-dir']);
@@ -110,18 +110,18 @@ module.exports = {
         }
     },
     'framework': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'framework.install is not supported for ubuntu');
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             events.emit('verbose', 'framework.uninstall is not supported for ubuntu');
         }
     },
     'lib-file': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'lib-file.install is not supported for ubuntu');
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             events.emit('verbose', 'lib-file.uninstall is not supported for ubuntu');
         }
     }

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/src/plugman/platforms/windows.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/windows.js b/cordova-lib/src/plugman/platforms/windows.js
index c9cd5dc..30994af 100644
--- a/cordova-lib/src/plugman/platforms/windows.js
+++ b/cordova-lib/src/plugman/platforms/windows.js
@@ -59,7 +59,7 @@ module.exports = {
         return new jsproj(path.join(project_dir, project_files[0]));
     },
     'source-file': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id, project_file) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options, project_file) {
             var targetDir = source_el.attrib['target-dir'] || '';
             var dest = path.join('plugins', plugin_id, targetDir, path.basename(source_el.attrib['src']));
 
@@ -67,7 +67,7 @@ module.exports = {
             // add reference to this file to jsproj.
             project_file.addSourceFile(dest);
         },
-        uninstall:function(source_el, project_dir, plugin_id, project_file) {
+        uninstall:function(source_el, project_dir, plugin_id, options, project_file) {
             var dest = path.join('plugins', plugin_id,
                                  source_el.attrib['target-dir'] || '',
                                  path.basename(source_el.attrib['src']));
@@ -77,33 +77,33 @@ module.exports = {
         }
     },
     'header-file': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'header-fileinstall is not supported for Windows 8');
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             events.emit('verbose', 'header-file.uninstall is not supported for Windows 8');
         }
     },
     'resource-file':{
-        install:function(el, plugin_dir, project_dir, plugin_id, project_file) {
+        install:function(el, plugin_dir, project_dir, plugin_id, options, project_file) {
             events.emit('verbose', 'resource-file is not supported for Windows 8');
         },
-        uninstall:function(el, project_dir, plugin_id, project_file) {
+        uninstall:function(el, project_dir, plugin_id, options, project_file) {
         }
     },
     'lib-file': {
-        install:function(el, plugin_dir, project_dir, plugin_id, project_file) {
+        install:function(el, plugin_dir, project_dir, plugin_id, options, project_file) {
             var inc  = el.attrib['Include'];
             project_file.addSDKRef(inc);
         },
-        uninstall:function(el, project_dir, plugin_id, project_file) {
+        uninstall:function(el, project_dir, plugin_id, options, project_file) {
             events.emit('verbose', 'windows8 lib-file uninstall :: ' + plugin_id);
             var inc = el.attrib['Include'];
             project_file.removeSDKRef(inc);
         }
     },
     'framework': {
-        install:function(el, plugin_dir, project_dir, plugin_id, project_file) {
+        install:function(el, plugin_dir, project_dir, plugin_id, options, project_file) {
             events.emit('verbose', 'windows8 framework install :: ' + plugin_id);
 
             var src = el.attrib['src'];
@@ -123,7 +123,7 @@ module.exports = {
             }
 
         },
-        uninstall:function(el, project_dir, plugin_id, project_file) {
+        uninstall:function(el, project_dir, plugin_id, options, project_file) {
             events.emit('verbose', 'windows8 framework uninstall :: ' + plugin_id  );
 
             var src = el.attrib['src'];

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/src/plugman/platforms/wp8.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/platforms/wp8.js b/cordova-lib/src/plugman/platforms/wp8.js
index 996a04d..a641feb 100644
--- a/cordova-lib/src/plugman/platforms/wp8.js
+++ b/cordova-lib/src/plugman/platforms/wp8.js
@@ -46,14 +46,14 @@ module.exports = {
         return new csproj(path.join(project_dir, project_files[0]));
     },
     'source-file':{
-        install:function(source_el, plugin_dir, project_dir, plugin_id, project_file) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options, project_file) {
             var dest = path.join('Plugins', plugin_id, source_el.attrib['target-dir'] ? source_el.attrib['target-dir'] : '', path.basename(source_el.attrib['src']));
 
             common.copyNewFile(plugin_dir, source_el.attrib['src'], project_dir, dest);
             // add reference to this file to csproj.
             project_file.addSourceFile(dest);
         },
-        uninstall:function(source_el, project_dir, plugin_id, project_file) {
+        uninstall:function(source_el, project_dir, plugin_id, options, project_file) {
             var dest = path.join('Plugins', plugin_id, source_el.attrib['target-dir'] ? source_el.attrib['target-dir'] : '', path.basename(source_el.attrib['src']));
             common.removeFile(project_dir, dest);
             // remove reference to this file from csproj.
@@ -61,23 +61,23 @@ module.exports = {
         }
     },
     'header-file': {
-        install:function(source_el, plugin_dir, project_dir, plugin_id) {
+        install:function(source_el, plugin_dir, project_dir, plugin_id, options) {
             events.emit('verbose', 'header-file.install is not supported for wp8');
         },
-        uninstall:function(source_el, project_dir, plugin_id) {
+        uninstall:function(source_el, project_dir, plugin_id, options) {
             events.emit('verbose', 'header-file.uninstall is not supported for wp8');
         }
     },
     'resource-file':{
-        install:function(el, plugin_dir, project_dir, plugin_id, project_file) {
+        install:function(el, plugin_dir, project_dir, plugin_id, options, project_file) {
             events.emit('verbose', 'resource-file.install is not supported for wp8');
         },
-        uninstall:function(el, project_dir, plugin_id, project_file) {
+        uninstall:function(el, project_dir, plugin_id, options, project_file) {
             events.emit('verbose', 'resource-file.uninstall is not supported for wp8');
         }
     },
     'framework':{
-        install:function(el, plugin_dir, project_dir, plugin_id, project_file) {
+        install:function(el, plugin_dir, project_dir, plugin_id, options, project_file) {
             events.emit('verbose', 'wp8 framework install :: ' + plugin_id  );
 
             var src = el.attrib['src'];
@@ -92,7 +92,7 @@ module.exports = {
             project_file.addReference(dest);
 
         },
-        uninstall:function(el, project_dir, plugin_id, project_file) {
+        uninstall:function(el, project_dir, plugin_id, options, project_file) {
             events.emit('verbose', 'wp8 framework uninstall :: ' + plugin_id  );
 
             var src = el.attrib['src'];
@@ -107,12 +107,12 @@ module.exports = {
         }
     },
     'lib-file': {
-        install:function(el, plugin_dir, project_dir, plugin_id, project_file) {
+        install:function(el, plugin_dir, project_dir, plugin_id, options, project_file) {
             events.emit('verbose', 'wp8 lib-file install :: ' + plugin_id);
             var inc  = el.attrib['Include'];
             project_file.addSDKRef(inc);
         },
-        uninstall:function(el, project_dir, plugin_id, project_file) {
+        uninstall:function(el, project_dir, plugin_id, options, project_file) {
             events.emit('verbose', 'wp8 lib-file uninstall :: ' + plugin_id);
             var inc = el.attrib['Include'];
             project_file.removeSDKRef(inc);

http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/676d8d6b/cordova-lib/src/plugman/uninstall.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/uninstall.js b/cordova-lib/src/plugman/uninstall.js
index 5cdc4a8..7335b60 100644
--- a/cordova-lib/src/plugman/uninstall.js
+++ b/cordova-lib/src/plugman/uninstall.js
@@ -307,38 +307,38 @@ function handleUninstall(actions, platform, plugin_id, plugin_et, project_dir, w
         // queue up native stuff
         sourceFiles && sourceFiles.forEach(function(source) {
             actions.push(actions.createAction(handler['source-file'].uninstall,
-                                             [source, project_dir, plugin_id],
+                                             [source, project_dir, plugin_id, options],
                                              handler['source-file'].install,
-                                             [source, plugin_dir, project_dir, plugin_id]));
+                                             [source, plugin_dir, project_dir, plugin_id, options]));
         });
 
         headerFiles && headerFiles.forEach(function(header) {
             actions.push(actions.createAction(handler['header-file'].uninstall,
-                                             [header, project_dir, plugin_id],
+                                             [header, project_dir, plugin_id, options],
                                              handler['header-file'].install,
-                                             [header, plugin_dir, project_dir, plugin_id]));
+                                             [header, plugin_dir, project_dir, plugin_id, options]));
         });
 
         resourceFiles && resourceFiles.forEach(function(resource) {
             actions.push(actions.createAction(handler['resource-file'].uninstall,
-                                              [resource, project_dir, plugin_id],
+                                              [resource, project_dir, plugin_id, options],
                                               handler['resource-file'].install,
-                                              [resource, plugin_dir, project_dir]));
+                                              [resource, plugin_dir, project_dir, options]));
         });
 
         // CB-5238 custom frameworks only
         frameworkFiles && frameworkFiles.forEach(function(framework) {
             actions.push(actions.createAction(handler['framework'].uninstall,
-                                              [framework, project_dir, plugin_id],
+                                              [framework, project_dir, plugin_id, options],
                                               handler['framework'].install,
-                                              [framework, plugin_dir, project_dir]));
+                                              [framework, plugin_dir, project_dir, options]));
         });
 
         libFiles && libFiles.forEach(function(source) {
             actions.push(actions.createAction(handler['lib-file'].uninstall,
-                                              [source, project_dir, plugin_id],
+                                              [source, project_dir, plugin_id, options],
                                               handler['lib-file'].install,
-                                              [source, plugin_dir, project_dir, plugin_id]));
+                                              [source, plugin_dir, project_dir, plugin_id, options]));
         });
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message