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/07/25 17:44:32 UTC

[2/3] git commit: Update cordova repos instead of re-cloning them.

Update cordova repos instead of re-cloning them.

Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/d1b7c108
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/d1b7c108
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/d1b7c108

Branch: refs/heads/master
Commit: d1b7c1080179b7db58455827c3524d71f8251adf
Parents: 15fcefe
Author: Max Woghiren <ma...@gmail.com>
Authored: Mon Jul 21 12:30:27 2014 -0400
Committer: Max Woghiren <ma...@gmail.com>
Committed: Fri Jul 25 11:29:25 2014 -0400

----------------------------------------------------------------------
 master.cfg | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/d1b7c108/master.cfg
----------------------------------------------------------------------
diff --git a/master.cfg b/master.cfg
index cbaac34..61ea165 100644
--- a/master.cfg
+++ b/master.cfg
@@ -181,8 +181,10 @@ plugman_steps = [
 # The steps that are required for any platform just to get tools and source in place
 common_steps_1 = [
     ShellCommand(command=["rm","-rf","medic"],workdir='build',haltOnFailure=False,description='Medic Clean',descriptionDone='Medic Clean'),
-    ShellCommand(command=["rm","-rf","cordova-*"],workdir='build',haltOnFailure=False,description='Cordova Clean', descriptionDone='Cordova Clean'),
+    ShellCommand(command=["rm","-rf","cordova-coho"],workdir='build',haltOnFailure=False,description='COHO Clean', descriptionDone='COHO Clean'),
     ShellCommand(command=["rm","-rf","mobilespec"],workdir='build',haltOnFailure=False,description='Mobilespec Clean',descriptionDone='Mobilespec Clean'),
+    ShellCommand(command=["rm","-rf","cordova-lib"],workdir='build',haltOnFailure=False,description='Cordova-lib Clean',descriptionDone='Cordova-lib Clean'),
+    ShellCommand(command=["rm","-rf","cordova-cli/node_modules"],workdir='build',haltOnFailure=False,description='CLI node_modules Clean',descriptionDone='CLI node_modules Clean'),
     ShellCommand(command=["git","clone","-b",branches['TESTMASTER'],repos['TESTMASTER'],"medic"],workdir='build',haltOnFailure=True, description='Get Medic', descriptionDone='Get Medic'),
     # --production switch is used to speed up installation + fruitstrap dev dependency is not supported on Windows
     ShellCommand(command=["npm","install","--production"], workdir='build/medic',haltOnFailure=True,description='Install Medic',descriptionDone='Install Medic'),
@@ -235,6 +237,7 @@ if(build_ios) :
     factory_IOS_master.addStep(ShellCommand(command=["rm","-rf","~/.cordova/lib/ios"],workdir='build',haltOnFailure=False,description='Remove cache',descriptionDone='Remove cache'))
     factory_IOS_master.addSteps(common_steps_1)
     factory_IOS_master.addStep(ShellCommand(command=["./cordova-coho/coho","repo-clone","-r","plugins","-r","mobile-spec","-r","ios","-r","cli","-r","js"],workdir='build',haltOnFailure=True,description='COHO Clone', descriptionDone='COHO Clone'))
+    factory_IOS_master.addStep(ShellCommand(command=["./cordova-coho/coho","repo-update","-r","plugins","-r","mobile-spec","-r","ios","-r","cli","-r","js"],workdir='build',haltOnFailure=True,description='COHO Update', descriptionDone='COHO Update'))
     factory_IOS_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master'))
     factory_IOS_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Platform->master',descriptionDone='Platform->master'))
     factory_IOS_master.addSteps(common_steps_mobilespec_1)
@@ -251,6 +254,7 @@ if(build_android) :
     factory_Android_master.addStep(ShellCommand(command=["rm","-rf","~/.cordova/lib/android"],workdir='build',haltOnFailure=False,description='Remove cache',descriptionDone='Remove cache'))
     factory_Android_master.addSteps(common_steps_1)
     factory_Android_master.addStep(ShellCommand(command=["./cordova-coho/coho","repo-clone","-r","plugins","-r","mobile-spec","-r","android","-r","cli","-r","js"],workdir='build',haltOnFailure=True,description='COHO Clone', descriptionDone='COHO Clone'))
+    factory_Android_master.addStep(ShellCommand(command=["./cordova-coho/coho","repo-update","-r","plugins","-r","mobile-spec","-r","android","-r","cli","-r","js"],workdir='build',haltOnFailure=True,description='COHO Update', descriptionDone='COHO Update'))
     factory_Android_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master'))
     factory_Android_master.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Platform->master',descriptionDone='Platform->master'))
 #   factory_Android_master.addStep(ShellCommand(command=[shellCmd,shellRunParam,'[ -f "package.json" ] && npm install'],workdir='build/cordova-android/bin',haltOnFailure=True,description='NPM Install', descriptionDone='NPM Install'))
@@ -268,6 +272,7 @@ if(build_wp8) :
     factory_wp8.addStep(ShellCommand(command=["rm","-rf","%userprofile%/.cordova/lib/wp"],workdir='build',haltOnFailure=False,description='Remove cache',descriptionDone='Remove cache'))
     factory_wp8.addSteps(common_steps_1)
     factory_wp8.addStep(ShellCommand(command=["node","./cordova-coho/coho","repo-clone","-r","plugins","-r","mobile-spec","-r","wp8","-r","js"],workdir='build',haltOnFailure=True,description='COHO Clone', descriptionDone='COHO Clone'))
+    factory_wp8.addStep(ShellCommand(command=["node","./cordova-coho/coho","repo-update","-r","plugins","-r","mobile-spec","-r","wp8","-r","js"],workdir='build',haltOnFailure=True,description='COHO Update', descriptionDone='COHO Update'))
     # TODO find the way to specify cli branch to clone for COHO, currently use step below
     factory_wp8.addStep(ShellCommand(command=["git","clone","-b",branches['CLI'],repos['CLI'],"cordova-cli"],workdir='build',haltOnFailure=True, description='Get CLI', descriptionDone='Get CLI'))
     factory_wp8.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master'))
@@ -289,6 +294,7 @@ if(build_windows8) :
     factory_windows8.addStep(ShellCommand(command=["rm","-rf","%userprofile%/.cordova/lib/windows8"],workdir='build',haltOnFailure=False,description='Remove cache',descriptionDone='Remove cache'))
     factory_windows8.addSteps(common_steps_1)
     factory_windows8.addStep(ShellCommand(command=["node","./cordova-coho/coho","repo-clone","-r","plugins","-r","mobile-spec","-r","windows","-r","js"],workdir='build',haltOnFailure=True,description='COHO Clone', descriptionDone='COHO Clone'))
+    factory_windows8.addStep(ShellCommand(command=["node","./cordova-coho/coho","repo-update","-r","plugins","-r","mobile-spec","-r","windows","-r","js"],workdir='build',haltOnFailure=True,description='COHO Update', descriptionDone='COHO Update'))
     # TODO find the way to specify cli branch to clone for COHO, currently use step below
     factory_windows8.addStep(ShellCommand(command=["git","clone","-b",branches['CLI'],repos['CLI'],"cordova-cli"],workdir='build',haltOnFailure=True, description='Get CLI', descriptionDone='Get CLI'))
     factory_windows8.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Plugins->master',descriptionDone='Plugins->master'))
@@ -308,6 +314,7 @@ if(build_blackberry) :
     factory_BlackBerry.addStep(ShellCommand(command=["rm","-rf","~/.cordova/lib/blackberry10"],workdir='build',haltOnFailure=False,description='Remove cache',descriptionDone='Remove cache'))
     factory_BlackBerry.addSteps(common_steps_1)
     factory_BlackBerry.addStep(ShellCommand(command=["./cordova-coho/coho","repo-clone","-r plugins","-r","mobile-spec","-r","blackberry","-r","cli","-r","js"],workdir='build',haltOnFailure=True,description='COHO Clone', descriptionDone='COHO Clone'))
+    factory_BlackBerry.addStep(ShellCommand(command=["./cordova-coho/coho","repo-update","-r plugins","-r","mobile-spec","-r","blackberry","-r","cli","-r","js"],workdir='build',haltOnFailure=True,description='COHO Update', descriptionDone='COHO Update'))
     factory_BlackBerry.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLUGIN","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Plugins->dev',descriptionDone='Plugins->dev'))
     factory_BlackBerry.addStep(ShellCommand(command=["node","medic/checkout.js","--path=../../../repos.json","--cat=PLATFORM","--releasebranch="+branch_release],workdir='build',haltOnFailure=False,description='Platform->master',descriptionDone='Platform->master'))
     factory_BlackBerry.addSteps(common_steps_mobilespec_1)