You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by br...@apache.org on 2014/01/06 21:15:14 UTC
git commit: Files in merges must remain intact when removing platform
Updated Branches:
refs/heads/master de94f31c4 -> 40d6b9748
Files in merges must remain intact when removing platform
Project: http://git-wip-us.apache.org/repos/asf/cordova-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-cli/commit/40d6b974
Tree: http://git-wip-us.apache.org/repos/asf/cordova-cli/tree/40d6b974
Diff: http://git-wip-us.apache.org/repos/asf/cordova-cli/diff/40d6b974
Branch: refs/heads/master
Commit: 40d6b974844d5bf02ed370d313127bedfd23ea13
Parents: de94f31
Author: apla <do...@gmail.com>
Authored: Mon Jan 6 12:22:56 2014 +0400
Committer: Braden Shepherdson <br...@gmail.com>
Committed: Mon Jan 6 15:14:09 2014 -0500
----------------------------------------------------------------------
e2e/platform.spec.js | 1 -
spec/platform.spec.js | 3 ---
src/platform.js | 1 -
3 files changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/40d6b974/e2e/platform.spec.js
----------------------------------------------------------------------
diff --git a/e2e/platform.spec.js b/e2e/platform.spec.js
index 1e8dd0c..4ef09fd 100644
--- a/e2e/platform.spec.js
+++ b/e2e/platform.spec.js
@@ -108,7 +108,6 @@ describe('platform end-to-end', function() {
}).then(function() {
// It should be gone.
expect(path.join(project, 'platforms', helpers.testPlatform)).not.toExist();
- expect(path.join(project, 'merges', helpers.testPlatform)).not.toExist();
}).then(emptyPlatformList) // platform ls should be empty too.
.fail(function(err) {
expect(err).toBeUndefined();
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/40d6b974/spec/platform.spec.js
----------------------------------------------------------------------
diff --git a/spec/platform.spec.js b/spec/platform.spec.js
index 39a9553..72b8ea2 100644
--- a/spec/platform.spec.js
+++ b/spec/platform.spec.js
@@ -252,16 +252,13 @@ describe('platform command', function() {
it('should remove a supported and added platform', function(done) {
cordova.raw.platform('remove', 'android').then(function() {
expect(rm).toHaveBeenCalledWith('-rf', path.join(project_dir, 'platforms', 'android'));
- expect(rm).toHaveBeenCalledWith('-rf', path.join(project_dir, 'merges', 'android'));
}, fail).fin(done);
});
it('should be able to remove multiple platforms', function(done) {
cordova.raw.platform('remove', ['android', 'blackberry10']).then(function() {
expect(rm).toHaveBeenCalledWith('-rf', path.join(project_dir, 'platforms', 'android'));
- expect(rm).toHaveBeenCalledWith('-rf', path.join(project_dir, 'merges', 'android'));
expect(rm).toHaveBeenCalledWith('-rf', path.join(project_dir, 'platforms', 'blackberry10'));
- expect(rm).toHaveBeenCalledWith('-rf', path.join(project_dir, 'merges', 'blackberry10'));
}, fail).fin(done);
});
});
http://git-wip-us.apache.org/repos/asf/cordova-cli/blob/40d6b974/src/platform.js
----------------------------------------------------------------------
diff --git a/src/platform.js b/src/platform.js
index 31a9557..af770dd 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -94,7 +94,6 @@ module.exports = function platform(command, targets) {
.then(function() {
targets.forEach(function(target) {
shell.rm('-rf', path.join(projectRoot, 'platforms', target));
- shell.rm('-rf', path.join(cordova_util.appDir(projectRoot), 'merges', target));
var plugins_json = path.join(projectRoot, 'plugins', target + '.json');
if (fs.existsSync(plugins_json)) shell.rm(plugins_json);
});