You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ma...@apache.org on 2014/09/05 21:42:53 UTC
[4/5] spec commit: [CB-7470]createmobilespec.js --global /
--globalplugins shouldn't clear $HOME/.cordova/commonlibs
[CB-7469]createmobilespec.js --global is broken since the new plugin test
infrastructure was added
[CB-7470]createmobilespec.js --global / --globalplugins shouldn't clear $HOME/.cordova/commonlibs
[CB-7469]createmobilespec.js --global is broken since the new plugin test infrastructure was added
Updated script works on amazon-fireos as well with --global flag.
Project: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/commit/f2a8088c
Tree: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/tree/f2a8088c
Diff: http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/diff/f2a8088c
Branch: refs/heads/3.6.x
Commit: f2a8088cf1db732b8451aded698502e37eeb5502
Parents: 5ca83f3
Author: Archana Naik <na...@lab126.com>
Authored: Thu Sep 4 21:22:38 2014 -0700
Committer: Archana Naik <na...@lab126.com>
Committed: Thu Sep 4 21:22:38 2014 -0700
----------------------------------------------------------------------
createmobilespec/createmobilespec.js | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-mobile-spec/blob/f2a8088c/createmobilespec/createmobilespec.js
----------------------------------------------------------------------
diff --git a/createmobilespec/createmobilespec.js b/createmobilespec/createmobilespec.js
index 913ec53..77d0c98 100755
--- a/createmobilespec/createmobilespec.js
+++ b/createmobilespec/createmobilespec.js
@@ -226,7 +226,7 @@ shelljs.config.fatal = true;
if (argv.global || argv.globalplugins) {
// clean out cached platforms and plugins and app-hello-world
var home_dir = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
- shelljs.rm("-rf", path.join(home_dir, ".cordova"));
+ shelljs.rm("-rf", path.join(home_dir, ".cordova/npm_cache"));
shelljs.rm("-rf", path.join(home_dir, ".plugman"));
}
@@ -353,11 +353,12 @@ function installPlugins() {
couldNotFind('cordova-plugin-test-framework');
}
pushd(cli_project_dir);
+ // we do need local plugin-test-framework
+ console.log("Installing local test framework plugins...");
+ shelljs.exec(cli + " plugin add org.apache.cordova.test.whitelist org.apache.cordova.test.echo --searchpath " + mobile_spec_git_dir);
+ shelljs.exec(cli + " plugin add org.apache.cordova.test-framework --searchpath " + top_dir);
+
if (argv.globalplugins) {
- // but we do need local plugin-test-framework when using --globalplugins
- console.log("Installing local test framework plugins...");
- shelljs.exec(cli + " plugin add org.apache.cordova.test.whitelist org.apache.cordova.test.echo --searchpath " + mobile_spec_git_dir);
- shelljs.exec(cli + " plugin add org.apache.cordova.test-framework --searchpath " + top_dir);
shelljs.exec(cli + " plugin add " + path.join(mobile_spec_git_dir, "dependencies-plugin"));
} else {
shelljs.exec(cli + " plugin add " + path.join(mobile_spec_git_dir, "dependencies-plugin") + searchpath);