You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2014/04/11 02:02:18 UTC
[1/4] git commit: CB-6414 - fixes the issue where two config.xml
munges exists, it will still write the correct config.xml output
Repository: cordova-plugman
Updated Branches:
refs/heads/master 8551e9649 -> 28318d8ea
CB-6414 - fixes the issue where two config.xml munges exists, it will still write the correct config.xml output
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/39d412c6
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/39d412c6
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/39d412c6
Branch: refs/heads/master
Commit: 39d412c61574055d95c4fdd70478a5f9446bf191
Parents: 34ce31b
Author: Josh Bavari <jo...@raisemore.com>
Authored: Tue Apr 8 14:48:52 2014 -0500
Committer: Josh Bavari <jo...@raisemore.com>
Committed: Tue Apr 8 15:25:06 2014 -0500
----------------------------------------------------------------------
src/util/config-changes.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/39d412c6/src/util/config-changes.js
----------------------------------------------------------------------
diff --git a/src/util/config-changes.js b/src/util/config-changes.js
index d09fcf1..309ceb3 100644
--- a/src/util/config-changes.js
+++ b/src/util/config-changes.js
@@ -274,8 +274,13 @@ function reapply_global_munge () {
);
continue;
}
- // TODO: This is mostly file IO and can run in parallel since each file is independent.
- self.apply_file_munge(file, global_munge.files[file]);
+ if(file == 'config.xml') {
+ file = resolveConfigFilePath(self.project_dir, self.platform, file);
+ file = path.relative(self.project_dir, file);
+ console.log('New file: ' + file);
+ }
+
+ self.apply_file_munge(file, global_munge.files[file]);
}
}
[3/4] git commit: CB-6414 - fixes the config.xml issue with android
and ios, correcting the bug at the ConfigKeeper.get method
Posted by st...@apache.org.
CB-6414 - fixes the config.xml issue with android and ios, correcting the bug at the ConfigKeeper.get method
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/28e4052e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/28e4052e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/28e4052e
Branch: refs/heads/master
Commit: 28e4052ed0613a626da84696076eff6f430d349c
Parents: 70ff5bd
Author: Josh Bavari <jo...@raisemore.com>
Authored: Wed Apr 9 21:47:06 2014 -0500
Committer: Josh Bavari <jo...@raisemore.com>
Committed: Wed Apr 9 21:47:06 2014 -0500
----------------------------------------------------------------------
src/util/config-changes.js | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/28e4052e/src/util/config-changes.js
----------------------------------------------------------------------
diff --git a/src/util/config-changes.js b/src/util/config-changes.js
index 041183a..3ca7cc0 100644
--- a/src/util/config-changes.js
+++ b/src/util/config-changes.js
@@ -274,10 +274,6 @@ function reapply_global_munge () {
);
continue;
}
- if(file == 'config.xml') {
- file = resolveConfigFilePath(self.project_dir, self.platform, file);
- file = path.relative(self.project_dir, file);
- }
self.apply_file_munge(file, global_munge.files[file]);
}
@@ -390,7 +386,14 @@ function ConfigKeeper() {
ConfigKeeper.prototype.get = ConfigKeeper_get;
function ConfigKeeper_get(project_dir, platform, file) {
var self = this;
+
+ //This fixes a bug with older plugins - when specifying config xml instead of res/xml/config.xml
+ //https://issues.apache.org/jira/browse/CB-6414
+ if(file == 'config.xml' && platform == 'android'){
+ file = 'res/xml/config.xml';
+ }
var fake_path = path.join(project_dir, platform, file);
+
if (self._cached[fake_path]) {
return self._cached[fake_path];
}
[2/4] git commit: Removing console.log statement
Posted by st...@apache.org.
Removing console.log statement
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/70ff5bde
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/70ff5bde
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/70ff5bde
Branch: refs/heads/master
Commit: 70ff5bded716dbe2d2ce71df6473b31bbf6df8c4
Parents: 39d412c
Author: Josh Bavari <jo...@raisemore.com>
Authored: Tue Apr 8 15:26:24 2014 -0500
Committer: Josh Bavari <jo...@raisemore.com>
Committed: Tue Apr 8 15:26:33 2014 -0500
----------------------------------------------------------------------
src/util/config-changes.js | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/70ff5bde/src/util/config-changes.js
----------------------------------------------------------------------
diff --git a/src/util/config-changes.js b/src/util/config-changes.js
index 309ceb3..041183a 100644
--- a/src/util/config-changes.js
+++ b/src/util/config-changes.js
@@ -277,7 +277,6 @@ function reapply_global_munge () {
if(file == 'config.xml') {
file = resolveConfigFilePath(self.project_dir, self.platform, file);
file = path.relative(self.project_dir, file);
- console.log('New file: ' + file);
}
self.apply_file_munge(file, global_munge.files[file]);
[4/4] git commit: Merge branch 'master' of
https://github.com/jbavari/cordova-plugman
Posted by st...@apache.org.
Merge branch 'master' of https://github.com/jbavari/cordova-plugman
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/28318d8e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/28318d8e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/28318d8e
Branch: refs/heads/master
Commit: 28318d8eaaa5700ae500fdd9bcca72ffbd175a50
Parents: 8551e96 28e4052
Author: Steven Gill <st...@gmail.com>
Authored: Thu Apr 10 17:01:54 2014 -0700
Committer: Steven Gill <st...@gmail.com>
Committed: Thu Apr 10 17:01:54 2014 -0700
----------------------------------------------------------------------
src/util/config-changes.js | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------