You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by dr...@apache.org on 2013/10/29 18:53:43 UTC
git commit: change to install plugman before cli
Updated Branches:
refs/heads/master 1116e91f9 -> b87400e04
change to install plugman before cli
Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/b87400e0
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/b87400e0
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/b87400e0
Branch: refs/heads/master
Commit: b87400e04d1c087e2cc9aa336f43aa94bf3b1260
Parents: 1116e91
Author: David Kemp <dr...@chromium.org>
Authored: Tue Oct 29 13:52:44 2013 -0400
Committer: David Kemp <dr...@chromium.org>
Committed: Tue Oct 29 13:52:44 2013 -0400
----------------------------------------------------------------------
master.cfg | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/b87400e0/master.cfg
----------------------------------------------------------------------
diff --git a/master.cfg b/master.cfg
index 6cf3335..626d4fe 100644
--- a/master.cfg
+++ b/master.cfg
@@ -132,10 +132,10 @@ from buildbot.config import BuilderConfig
cli_steps = [
ShellCommand(command=["/bin/sh","-c","rm -rf cordova-*"],workdir='build',haltOnFailure=False,description='Cordova Clean', descriptionDone='Cordova Clean'),
ShellCommand(command=["git","clone",repos['CLI'],"cordova-cli"],workdir='build',haltOnFailure=True,description='Get CLI',descriptionDone='Get CLI'),
- ShellCommand(command=["npm","install"],workdir='build/cordova-cli',haltOnFailure=True,description='Install CLI',descriptionDone='Install CLI'),
- ShellCommand(command=["rm","-rf","plugman"], workdir='build/cordova-cli/node_modules',haltOnFailure=True,description='Delete Plugman',descriptionDone='Delete Plugman'),
+ ShellCommand(command=["mkdir","node_modules"],workdir='build/cordova-cli',haltOnFailure=True,description='prepare Plugman',descriptionDone='Prepare Plugman'),
ShellCommand(command=["git","clone",repos['PLUGMAN'],"plugman"],workdir='build/cordova-cli/node_modules',haltOnFailure=True,description='Update Plugman',descriptionDone='Update Plugman'),
ShellCommand(command=["npm","install"], workdir='build/cordova-cli/node_modules/plugman',haltOnFailure=True,description='Install Plugman',descriptionDone='Install Plugman'),
+ ShellCommand(command=["npm","install"],workdir='build/cordova-cli',haltOnFailure=True,description='Install CLI',descriptionDone='Install CLI'),
ShellCommand(command=["npm","test"], workdir='build/cordova-cli',haltOnFailure=True,description='Test CLI',descriptionDone='Test CLI'),
]
@@ -160,10 +160,10 @@ common_steps_1 = [
# The steps for any platform before platform add
common_steps_mobilespec_1 = [
- ShellCommand(command=["npm","install"],workdir='build/cordova-cli',haltOnFailure=True,description='Install CLI',descriptionDone='Install CLI'),
- ShellCommand(command=["rm","-rf","plugman"], workdir='build/cordova-cli/node_modules',haltOnFailure=True,description='Delete Plugman',descriptionDone='Delete Plugman'),
+ ShellCommand(command=["mkdir","node_modules"],workdir='build/cordova-cli',haltOnFailure=True,description='prepare Plugman',descriptionDone='Prepare Plugman'),
ShellCommand(command=["git","clone",repos['PLUGMAN'],"plugman"],workdir='build/cordova-cli/node_modules',haltOnFailure=True,description='Update Plugman',descriptionDone='Update Plugman'),
ShellCommand(command=["npm","install"], workdir='build/cordova-cli/node_modules/plugman',haltOnFailure=True,description='Delete Plugman',descriptionDone='Delete Plugman'),
+ ShellCommand(command=["npm","install"],workdir='build/cordova-cli',haltOnFailure=True,description='Install CLI',descriptionDone='Install CLI'),
ShellCommand(command=["./cordova-cli/bin/cordova","create","mobilespec","org.apache.mobilespec","mobilespec"],workdir='build',haltOnFailure=True, description='CLI Create', descriptionDone='CLI Create')
]