Skip to content
Permalink
Browse files
fixing empty merges
  • Loading branch information
Anis Kadri committed Apr 24, 2014
1 parent 7e05089 commit 93c65780a96818b21346d210c7d74bd28f66f94e
Showing 3 changed files with 11 additions and 6 deletions.
@@ -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'));
@@ -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'),
@@ -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";
}
}

0 comments on commit 93c6578

Please sign in to comment.