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 2014/04/24 23:13:29 UTC
[6/7] git commit: fixing empty merges
fixing empty merges
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/93c65780
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/93c65780
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/93c65780
Branch: refs/heads/browserify
Commit: 93c65780a96818b21346d210c7d74bd28f66f94e
Parents: 7e05089
Author: Anis Kadri <an...@apache.org>
Authored: Thu Apr 24 14:12:05 2014 -0700
Committer: Anis Kadri <an...@apache.org>
Committed: Thu Apr 24 14:12:05 2014 -0700
----------------------------------------------------------------------
src/platforms/ios.js | 6 +++---
src/prepare.js | 3 ++-
src/util/prepare-namespace.js | 8 ++++++--
3 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/93c65780/src/platforms/ios.js
----------------------------------------------------------------------
diff --git a/src/platforms/ios.js b/src/platforms/ios.js
index 9631e64..16808a0 100644
--- a/src/platforms/ios.js
+++ b/src/platforms/ios.js
@@ -153,9 +153,9 @@ module.exports = {
// there is now double caching of iOS project files.
// Remove the cache here when install can handle
// a list of plugins at once.
- if (cachedProjectFiles[project_dir]) {
- return cachedProjectFiles[project_dir];
- }
+ // if (cachedProjectFiles[project_dir]) {
+ // return cachedProjectFiles[project_dir];
+ // }
// grab and parse pbxproj
// we don't want CordovaLib's xcode project
var project_files = glob.sync(path.join(project_dir, '*.xcodeproj', 'project.pbxproj'));
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/93c65780/src/prepare.js
----------------------------------------------------------------------
diff --git a/src/prepare.js b/src/prepare.js
index 9940dc1..9710569 100644
--- a/src/prepare.js
+++ b/src/prepare.js
@@ -27,7 +27,8 @@ var platform_modules = require('./platforms'),
wp7 = require('./platforms/wp7'),
wp8 = require('./platforms/wp8'),
windows8 = require('./platforms/windows8'),
- common = require('./platforms/common');
+ common = require('./platforms/common'),
+ events = require('./events'),
fs = require('fs'),
shell = require('shelljs'),
util = require('util'),
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/93c65780/src/util/prepare-namespace.js
----------------------------------------------------------------------
diff --git a/src/util/prepare-namespace.js b/src/util/prepare-namespace.js
index 8c18b1f..a8a6e20 100644
--- a/src/util/prepare-namespace.js
+++ b/src/util/prepare-namespace.js
@@ -1,3 +1,5 @@
+var util = require('util');
+
// FIXME this is extremely guettho
module.exports = function(target, method) {
var old = target;
@@ -26,11 +28,13 @@ module.exports = function(target, method) {
object,
lastName
);
- } else if(method === "m") {
+ } else if(method === "m" && target !== "") {
return util.format(
"%s\n;require('cordova/builder').recursiveMerge(%s, module.exports);",
code,
- object
+ target
);
+ } else {
+ return "// no clobber or merges";
}
}