You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2016/03/04 01:36:07 UTC
[29/50] cordova-paramedic git commit: fix merge issues
fix merge issues
Project: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/commit/be9e6f25
Tree: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/tree/be9e6f25
Diff: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/diff/be9e6f25
Branch: refs/heads/master
Commit: be9e6f25269ede13ed8a1f7a9b42884c36ceecbb
Parents: ede1cee f3f58e7
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Sat Mar 21 00:53:27 2015 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Sat Mar 21 00:53:27 2015 -0700
----------------------------------------------------------------------
main.js | 18 ++++++++++++++----
package.json | 9 +++++----
2 files changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-paramedic/blob/be9e6f25/main.js
----------------------------------------------------------------------
diff --cc main.js
index 312dc26,c47d448..ee97e65
--- a/main.js
+++ b/main.js
@@@ -56,37 -54,39 +57,43 @@@ function init()
}
function createTempProject() {
+ TMP_FOLDER = tmp.dirSync();
+ tmp.setGracefulCleanup();
+
console.log("cordova-paramedic :: creating temp project");
- shell.exec('cordova create ' + TEMP_PROJECT_PATH);
- shell.cd(TEMP_PROJECT_PATH);
+ shell.exec('cordova create ' + TMP_FOLDER.name);
+ shell.cd(TMP_FOLDER.name);
}
-function installPlugins() {
-
+function installSinglePlugin(plugin) {
console.log("cordova-paramedic :: installing " + plugin);
+
+ var pluginPath = path.resolve(storedCWD, plugin);
- var installExitCode = shell.exec('cordova plugin add ' + plugin,
+ var installExitCode = shell.exec('cordova plugin add ' + pluginPath,
{silent:true}).code;
- if(installExitCode != 0) {
+ if(installExitCode !== 0) {
console.error('Failed to install plugin : ' + plugin);
cleanUpAndExitWithCode(1);
return;
}
+}
- if(!JustBuild) {
- // we only install the test stuff if needed
- console.log("cordova-paramedic :: installing " + path.join(pluginPath,'tests'));
- installExitCode = shell.exec('cordova plugin add ' + path.join(pluginPath,'tests'),
- {silent:true}).code;
- if(installExitCode != 0) {
- console.error('Failed to find /tests/ for plugin : ' + plugin);
- cleanUpAndExitWithCode(1);
- return;
++
+function installPlugins() {
+
+ for(var n = 0; n < plugins.length; n++) {
+
+ var plugin = plugins[n];
+ installSinglePlugin(plugin);
+
+ if(!JustBuild) {
+ installSinglePlugin(path.join(plugin,"tests"));
}
+ }
+
+ if(!JustBuild) {
console.log("cordova-paramedic :: installing plugin-test-framework");
installExitCode = shell.exec('cordova plugin add https://github.com/apache/cordova-plugin-test-framework',
{silent:true}).code;
http://git-wip-us.apache.org/repos/asf/cordova-paramedic/blob/be9e6f25/package.json
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org