You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by mm...@apache.org on 2014/06/20 19:52:20 UTC
git commit: CB-6709 Do not create merges/ folder when adding a
platform
Repository: cordova-lib
Updated Branches:
refs/heads/master c7f4f7fc1 -> 1cecf6aac
CB-6709 Do not create merges/ folder when adding a platform
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/1cecf6aa
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/1cecf6aa
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/1cecf6aa
Branch: refs/heads/master
Commit: 1cecf6aac771693e2ab3c2ae853cd7f4db0f0788
Parents: c7f4f7f
Author: Michal Mocny <mm...@gmail.com>
Authored: Fri Jun 20 13:46:50 2014 -0400
Committer: Michal Mocny <mm...@gmail.com>
Committed: Fri Jun 20 13:48:38 2014 -0400
----------------------------------------------------------------------
cordova-lib/spec-cordova/platform.spec.js | 1 -
cordova-lib/src/cordova/platform.js | 5 -----
2 files changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1cecf6aa/cordova-lib/spec-cordova/platform.spec.js
----------------------------------------------------------------------
diff --git a/cordova-lib/spec-cordova/platform.spec.js b/cordova-lib/spec-cordova/platform.spec.js
index d92a50c..76c9501 100644
--- a/cordova-lib/spec-cordova/platform.spec.js
+++ b/cordova-lib/spec-cordova/platform.spec.js
@@ -101,7 +101,6 @@ describe('platform end-to-end', function() {
}).then(function() {
// Check the platform add was successful.
expect(path.join(project, 'platforms', helpers.testPlatform)).toExist();
- expect(path.join(project, 'merges', helpers.testPlatform)).toExist();
expect(path.join(project, 'platforms', helpers.testPlatform, 'cordova')).toExist();
}).then(fullPlatformList) // Check for it in platform ls.
.then(function() {
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/1cecf6aa/cordova-lib/src/cordova/platform.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/cordova/platform.js b/cordova-lib/src/cordova/platform.js
index eefba91..3e32d5a 100644
--- a/cordova-lib/src/cordova/platform.js
+++ b/cordova-lib/src/cordova/platform.js
@@ -386,10 +386,6 @@ function supports(project_root, name) {
return platformParser.check_requirements(project_root);
}
-function createOverrides(projectRoot, target) {
- shell.mkdir('-p', path.join(cordova_util.appDir(projectRoot), 'merges', target));
-}
-
// Returns a promise.
function call_into_create(target, projectRoot, cfg, libDir, template_dir, opts) {
var output = path.join(projectRoot, 'platforms', target);
@@ -434,7 +430,6 @@ function call_into_create(target, projectRoot, cfg, libDir, template_dir, opts)
return require('./cordova').raw.prepare(target);
})
.then(function() {
- createOverrides(projectRoot, target);
// Install all currently installed plugins into this new platform.
var plugins_dir = path.join(projectRoot, 'plugins');
var plugins = cordova_util.findPlugins(plugins_dir);