Updated Branches: refs/heads/master 69f904f4e -> 2be13c758
[CB-3429] fix for bad referencing of framework + source files. bumped to 0.7.6. Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/2be13c75 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/2be13c75 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/2be13c75 Branch: refs/heads/master Commit: 2be13c75805318c4d16a1a94d6369979ae94ffeb Parents: 69f904f Author: Fil Maj <[email protected]> Authored: Fri May 17 22:23:31 2013 -0700 Committer: Fil Maj <[email protected]> Committed: Fri May 17 22:23:31 2013 -0700 ---------------------------------------------------------------------- README.md | 17 +++++++++-------- package.json | 2 +- spec/platforms/ios.spec.js | 4 ++-- src/platforms/ios.js | 7 +++++-- 4 files changed, 17 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/2be13c75/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 7145516..2574e17 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # plugman -A command line tool to distribute and package plugins for use with Apache Cordova, nee PhoneGap. +A command line tool to install and uninstall plugins for use with [Apache Cordova](http://cordova.io) projects. This document defines tool usage. ## Plugin Specification ---> [plugin.md](plugin.md) <-- +--> [plugin_spec.md](plugin_spec.md) <-- ## Quickstart @@ -18,6 +18,13 @@ This document defines tool usage. * Detail the dependencies and components of individual plugins * Allow code reuse between different target platforms +## Supported Platforms + +* iOS +* Android +* BlackBerry 10 +* Windows Phone 7 + ## Usage plugman --install --platform <ios|android|blackberry10|wp7|wp8> --project <directory> --plugin <name|url|path> [--plugins_dir <directory>] [--www <directory>] [--variable <name>=<value> [--variable <name>=<value> ...]] @@ -35,12 +42,6 @@ Other parameters: * `--www` defaults to the project's `www` folder location, but can be any directory that is to be used as cordova project application web assets. * `--variable` allows to specify certain variables at install time, necessary for certain plugins requiring API keys or other custom, user-defined parameters. Please see the [plugin specification](plugin_spec.md) for more information. -## Supported Platforms - -* iOS -* Android -* BlackBerry 10 -* Windows Phone 7 ## Example Plugins http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/2be13c75/package.json ---------------------------------------------------------------------- diff --git a/package.json b/package.json index fa2de8e..b92cb14 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Andrew Lunny <[email protected]>", "name": "plugman", "description": "install/uninstall Cordova plugins", - "version": "0.7.5", + "version": "0.7.6", "repository": { "type": "git", "url": "git://git-wip-us.apache.org/repos/asf/cordova-plugman.git" http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/2be13c75/spec/platforms/ios.spec.js ---------------------------------------------------------------------- diff --git a/spec/platforms/ios.spec.js b/spec/platforms/ios.spec.js index 7c50291..7d69338 100644 --- a/spec/platforms/ios.spec.js +++ b/spec/platforms/ios.spec.js @@ -158,7 +158,7 @@ describe('ios project handler', function() { spyOn(proj_files.xcode, 'addSourceFile'); var spy = spyOn(proj_files.xcode, 'addFramework'); ios['source-file'].install(source[0], dummyplugin, temp, dummy_id, proj_files); - expect(spy).toHaveBeenCalledWith(path.join('Plugins', dummy_id, 'SourceWithFramework.m'), {weak:false}); + expect(spy).toHaveBeenCalledWith(path.join('SampleApp', 'Plugins', dummy_id, 'SourceWithFramework.m'), {weak:false}); }); }); @@ -298,7 +298,7 @@ describe('ios project handler', function() { var spy = spyOn(proj_files.xcode, 'removeFramework'); ios['source-file'].uninstall(source[0], temp, dummy_id, proj_files); - expect(spy).toHaveBeenCalledWith(path.join('Plugins', dummy_id, 'SourceWithFramework.m')); + expect(spy).toHaveBeenCalledWith(path.join('SampleApp', 'Plugins', dummy_id, 'SourceWithFramework.m')); }); }); http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/2be13c75/src/platforms/ios.js ---------------------------------------------------------------------- diff --git a/src/platforms/ios.js b/src/platforms/ios.js index 827ae68..4163414 100644 --- a/src/platforms/ios.js +++ b/src/platforms/ios.js @@ -47,7 +47,8 @@ module.exports = { if (is_framework) { var weak = source_el.attrib['weak']; var opt = { weak: (weak == undefined || weak == null || weak != 'true' ? false : true ) }; - project.xcode.addFramework(project_ref, opt); + var project_relative = path.join(path.basename(project.xcode_path), project_ref); + project.xcode.addFramework(project_relative, opt); } shell.mkdir('-p', targetDir); shell.cp(srcFile, destFile); @@ -61,7 +62,8 @@ module.exports = { var project_ref = path.join('Plugins', path.relative(project.plugins_dir, destFile)); project.xcode.removeSourceFile(project_ref); if (is_framework) { - project.xcode.removeFramework(project_ref); + var project_relative = path.join(path.basename(project.xcode_path), project_ref); + project.xcode.removeFramework(project_relative); } shell.rm('-rf', destFile); @@ -158,6 +160,7 @@ module.exports = { plugins_dir:pluginsDir, resources_dir:resourcesDir, xcode:xcodeproj, + xcode_path:xcode_dir, pbx:pbxPath }; }
