You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2016/03/29 13:56:16 UTC

[1/3] cordova-lib git commit: CB-10908 Reload the config.xml before writing the saved plugin

Repository: cordova-lib
Updated Branches:
  refs/heads/6.1.x 96f89aa21 -> 7fb6855e8


CB-10908 Reload the config.xml before writing the saved plugin

This closes #415


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

Branch: refs/heads/6.1.x
Commit: 9d54bd094a089f80725c22d2bb6d310d9266b645
Parents: 96f89aa
Author: dubeejw <jw...@us.ibm.com>
Authored: Fri Mar 18 15:19:26 2016 -0400
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Tue Mar 29 13:25:23 2016 +0300

----------------------------------------------------------------------
 cordova-lib/src/cordova/plugin.js | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/9d54bd09/cordova-lib/src/cordova/plugin.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/plugin.js b/cordova-lib/src/cordova/plugin.js
index 46b84be..b4d47dc 100644
--- a/cordova-lib/src/cordova/plugin.js
+++ b/cordova-lib/src/cordova/plugin.js
@@ -194,6 +194,8 @@ module.exports = function plugin(command, targets, opts) {
                                     spec: src ? src : '~' + pluginInfo.version
                                 };
 
+                                xml = cordova_util.projectConfig(projectRoot);
+                                cfg = new ConfigParser(xml);
                                 cfg.removePlugin(pluginInfo.id);
                                 cfg.addPlugin(attributes, opts.cli_variables);
                                 cfg.write();


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


[3/3] cordova-lib git commit: Updated RELEASENOTES.md for release 6.1.1

Posted by an...@apache.org.
Updated RELEASENOTES.md for release 6.1.1


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

Branch: refs/heads/6.1.x
Commit: 7fb6855e8154f90e568bec7793746fc0ba5a01e8
Parents: b15a9fd
Author: Vladimir Kotikov <v-...@microsoft.com>
Authored: Tue Mar 29 14:23:21 2016 +0300
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Tue Mar 29 14:28:54 2016 +0300

----------------------------------------------------------------------
 cordova-lib/RELEASENOTES.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/7fb6855e/cordova-lib/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/cordova-lib/RELEASENOTES.md b/cordova-lib/RELEASENOTES.md
index c6019db..3fbdcf7 100644
--- a/cordova-lib/RELEASENOTES.md
+++ b/cordova-lib/RELEASENOTES.md
@@ -20,7 +20,11 @@
 -->
 # Cordova-lib Release Notes
 
-### 6.1.1 (Mar 17, 2016)
+### 6.1.1 (Mar 29, 2016)
+* CB-10961 Error no such file or directory adding ios platform when plugins present or required
+* CB-10908 Reload the config.xml before writing the saved plugin
+
+### 6.1.0 (Mar 17, 2016)
 * CB-10902 updated pinned platforms
 * CB-10808 revert npm install for templates
 * CB-10808 CLI Support templates with subdirectory


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


[2/3] cordova-lib git commit: CB-10961 Error no such file or directory adding ios platform when plugins present or required

Posted by an...@apache.org.
CB-10961 Error no such file or directory adding ios platform when plugins present or required

This closes #416


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

Branch: refs/heads/6.1.x
Commit: b15a9fdcb928b2b3504fd408d30f7b72900f4d74
Parents: 9d54bd0
Author: Carlos Santana <cs...@gmail.com>
Authored: Fri Mar 25 16:17:01 2016 -0400
Committer: Vladimir Kotikov <v-...@microsoft.com>
Committed: Tue Mar 29 13:25:40 2016 +0300

----------------------------------------------------------------------
 cordova-lib/src/cordova/platform.js | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b15a9fdc/cordova-lib/src/cordova/platform.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js
index 2ea8c01..db6f53c 100644
--- a/cordova-lib/src/cordova/platform.js
+++ b/cordova-lib/src/cordova/platform.js
@@ -19,6 +19,7 @@
 
 var config            = require('./config'),
     cordova           = require('./cordova'),
+    prepare           = require('./prepare'),
     cordova_util      = require('./util'),
     ConfigParser      = require('cordova-common').ConfigParser,
     fs                = require('fs'),
@@ -181,6 +182,9 @@ function addHelper(cmd, hooksRunner, projectRoot, targets, opts) {
                     PlatformApi.updatePlatform.bind(null, destination, options, events);
 
                 return promise()
+                .then(function () {
+                    return prepare.preparePlatforms([platform], projectRoot, { searchpath: opts.searchpath });
+                })
                 .then(function() {
                     if (cmd == 'add') {
                         return installPluginsForNewPlatform(platform, projectRoot, opts);


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