Repository: cordova-medic Updated Branches: refs/heads/master 15fcefece -> faeed8d2e
Removed an unnecessary block of steps. config.xml is no longer inside the www directory, so it doesn't need to be copied anymore. Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/6d3d7200 Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/6d3d7200 Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/6d3d7200 Branch: refs/heads/master Commit: 6d3d7200950232963366cde7c3222b679aa03bbb Parents: 15fcefe Author: Max Woghiren <[email protected]> Authored: Mon Jul 21 12:32:22 2014 -0400 Committer: Max Woghiren <[email protected]> Committed: Fri Jul 25 11:25:43 2014 -0400 ---------------------------------------------------------------------- master.cfg | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/6d3d7200/master.cfg ---------------------------------------------------------------------- diff --git a/master.cfg b/master.cfg index cbaac34..48c3f21 100644 --- a/master.cfg +++ b/master.cfg @@ -212,16 +212,6 @@ common_steps_mobilespec_2 = [ ShellCommand(command=["node", "../cordova-cli/bin/cordova","prepare"],workdir='build/mobilespec',haltOnFailure=True,description='CLI Prepare',descriptionDone='CLI Prepare') ] -# added to handle the moved config.xml (up one directory) -common_steps_mobilespec_2M = [ - ShellCommand(command=["node", "../cordova-cli/bin/cordova","plugin","add","../cordova-mobile-spec/dependencies-plugin","--searchpath",".." ],workdir='build/mobilespec',haltOnFailure=True,description='Plugin add',descriptionDone='Plugin add'), - ShellCommand(command=["node", "../cordova-cli/bin/cordova", "plugin", "add", "../medic/cordova-plugin-medic"],workdir='build/mobilespec',haltOnFailure=True,description='Medic plugin add',descriptionDone='Medic plugin add'), - ShellCommand(command=["rm","-rf","mobilespec/www"],workdir='build',haltOnFailure=False,description='Remove www',descriptionDone='Remove www'), - ShellCommand(command=["node", "-e", "require('fs').symlinkSync('../cordova-mobile-spec/www','www','dir')"], workdir='build/mobilespec',haltOnFailure=True,description='Link www', descriptionDone='Link www'), - ShellCommand(command=["cp","mobilespec/www/config.xml","mobilespec/config.xml"],workdir='build',haltOnFailure=False,description='Copy config',descriptionDone='Copy config'), - ShellCommand(command=["node", "../cordova-cli/bin/cordova","prepare"],workdir='build/mobilespec',haltOnFailure=True,description='CLI Prepare',descriptionDone='CLI Prepare') -] - # The steps to build just the js common_steps_js = [ ShellCommand(command=["npm","install"], workdir='build/cordova-js',description='Install Grunt',descriptionDone='Install Grunt'), @@ -241,7 +231,7 @@ if(build_ios) : factory_IOS_master.addStep(ShellCommand(command=["node","medic/writejson.js","--branch=master"],workdir='build',haltOnFailure=True, description='Write json',descriptionDone='Write json')) factory_IOS_master.addStep(ShellCommand(command=["../cordova-cli/bin/cordova","platform","add","ios"],workdir='build/mobilespec',haltOnFailure=True, description='Platform Add',descriptionDone='Platform Add')) factory_IOS_master.addSteps(common_steps_js) - factory_IOS_master.addSteps(common_steps_mobilespec_2M) + factory_IOS_master.addSteps(common_steps_mobilespec_2) factory_IOS_master.addStep(ShellCommand(command=["cp","-f","cordova-js/pkg/cordova.ios.js","mobilespec/platforms/ios/platform_www/cordova.js"],workdir='build',haltOnFailure=True,description='Copy JS',descriptionDone='Copy JS')) factory_IOS_master.addStep(ShellCommand(command=["node", "medic/build_ios.js"], workdir='build', timeout=600,description='Deploy IOS',descriptionDone='Deploy IOS',name='Deploy IOS')) c['builders'].append(BuilderConfig(name="IOS_Master",slavenames=["ios-slave"],factory=factory_IOS_master)) @@ -258,7 +248,7 @@ if(build_android) : factory_Android_master.addStep(ShellCommand(command=["node","medic/writejson.js","--branch=master"],workdir='build',haltOnFailure=True, description='Write json',descriptionDone='Write json')) factory_Android_master.addStep(ShellCommand(command=["../cordova-cli/bin/cordova","platform","add","android"],workdir='build/mobilespec',haltOnFailure=True, description='Platform Add',descriptionDone='Platform Add')) factory_Android_master.addSteps(common_steps_js) - factory_Android_master.addSteps(common_steps_mobilespec_2M) + factory_Android_master.addSteps(common_steps_mobilespec_2) factory_Android_master.addStep(ShellCommand(command=["cp","-f","cordova-js/pkg/cordova.android.js","mobilespec/platforms/android/platform_www/cordova.js"],workdir='build',haltOnFailure=True,description='Copy JS',descriptionDone='Copy JS')) factory_Android_master.addStep(ShellCommand(command=["node", "medic/build_android.js"], workdir='build', timeout=600,description='Deploy Android',descriptionDone='Deploy Android',name='Deploy Android')) c['builders'].append(BuilderConfig(name="Android_Master",slavenames=["android-slave"],factory=factory_Android_master)) @@ -314,7 +304,7 @@ if(build_blackberry) : factory_BlackBerry.addStep(ShellCommand(command=["node","medic/writejson.js","--branch=master"],workdir='build',haltOnFailure=True, description='Write json',descriptionDone='Write json')) factory_BlackBerry.addStep(ShellCommand(command=["../cordova-cli/bin/cordova","platform","add","blackberry10"],workdir='build/mobilespec',haltOnFailure=True, description='Platform Add',descriptionDone='Platform Add')) factory_BlackBerry.addSteps(common_steps_js) - factory_BlackBerry.addSteps(common_steps_mobilespec_2M) + factory_BlackBerry.addSteps(common_steps_mobilespec_2) factory_BlackBerry.addSteps(ShellCommand(command=["node", "../cordova-cli/bin/cordova", "plugin", "rm", "org.apache.cordova.core.medic"],workdir='build/mobilespec',haltOnFailure=True,description='Medic plugin add',descriptionDone='Medic plugin removed')), factory_BlackBerry.addStep(ShellCommand(command=["cp", "-f", "cordova-js/pkg/cordova.blackberry10.js", "mobilespec/platforms/blackberry10/platform_www/cordova.js"],workdir='build',haltOnFailure=True,description='Copy JS',descriptionDone='Copy JS')) factory_BlackBerry.addStep(ShellCommand(command=["cp", "platforms/blackberry10/www/config.xml", "./config.xml"],workdir='build/mobilespec',haltOnFailure=True,description='Plugin add',descriptionDone='Replace config.xml'))
