You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2014/12/01 14:01:38 UTC
[2/2] cordova-medic git commit: CB-8099 Removed unnecessary steps
from master.cfg
CB-8099 Removed unnecessary steps from master.cfg
Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/0ba57fd9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/0ba57fd9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/0ba57fd9
Branch: refs/heads/master
Commit: 0ba57fd979f0d28f8b9150f117f135dd9c0951fa
Parents: 1cf7ef4
Author: maria.bukharina <ma...@akvelon.com>
Authored: Fri Nov 28 17:39:27 2014 +0300
Committer: maria.bukharina <ma...@akvelon.com>
Committed: Fri Nov 28 17:39:27 2014 +0300
----------------------------------------------------------------------
master.cfg | 35 ++++++-----------------------------
1 file changed, 6 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/0ba57fd9/master.cfg
----------------------------------------------------------------------
diff --git a/master.cfg b/master.cfg
index 0bf05ed..40dee09 100644
--- a/master.cfg
+++ b/master.cfg
@@ -203,21 +203,7 @@ class PlatformTestBase(object):
ShellCommand(command=["node", "medic/checkout.js", "--path=medic/repos.json", "--cat=" + platform, "--releasebranch=" + branch_release], workdir='build', haltOnFailure=True, description='Clone Platform'),
ShellCommand(command=["node", "medic/checkout.js", "--path=medic/repos.json", "--cat=JS", "--releasebranch=" + branch_release], workdir='build', haltOnFailure=True, description='Clone JS')
]
-
- def create_app_steps(self):
- return [
- ShellCommand(command=["node", "cordova-cli/bin/cordova", "create", "mobilespec", "org.apache.mobilespec", "mobilespec", "--link-to=./cordova-mobile-spec/www"], workdir='build', haltOnFailure=True, description='CLI Create'),
- ShellCommand(command=["node", "medic/writejson.js", "--branch=master"], workdir='build', haltOnFailure=True, description='Write json')
- ]
-
- def platform_add_steps(self):
- platform = self.platform
- # required by coho tools to correctly resolve repo location
- if platform == "blackberry10":
- platform = "blackberry"
- platformPath = "../cordova-" + platform
- return [ShellCommand(command=["../cordova-cli/bin/cordova", "platform", "add", platformPath], workdir='build/mobilespec', haltOnFailure=True, description='Platform Add')]
-
+
def build_cordovajs_steps(self):
return [
ShellCommand(command=["npm", "install"], workdir='build/cordova-js', description='Install Grunt'),
@@ -225,10 +211,14 @@ class PlatformTestBase(object):
]
def prepare_mobilespec_steps(self):
+ platform = self.platform
+ # required by coho tools to correctly resolve repo location
+ if platform == "blackberry10":
+ platform = "blackberry"
return [
ShellCommand(command=["npm", "install"], workdir='build/cordova-mobile-spec/createmobilespec', haltOnFailure=True, description='Install createmobilespec'),
ShellCommand(command=["cordova-coho/coho", "npm-link"], workdir='build', haltOnFailure=True, description='COHO npm-link'),
- ShellCommand(command=["cordova-mobile-spec/createmobilespec/createmobilespec", "--" + self.platform, "mobilespec"], workdir='build', haltOnFailure=True, description='Run createmobilespec'),
+ ShellCommand(command=["cordova-mobile-spec/createmobilespec/createmobilespec", "--" + platform, "mobilespec"], workdir='build', haltOnFailure=True, description='Run createmobilespec'),
ShellCommand(command=["node", "../cordova-cli/bin/cordova", "plugin", "add", "../medic/cordova-plugin-medic"], workdir='build/mobilespec', haltOnFailure=True, description='Medic plugin add'),
ShellCommand(command=["node", "medic/updateconfig.js", "--" + self.platform], workdir='build', haltOnFailure=True, description='Update config')
]
@@ -248,25 +238,12 @@ class PlatformTestBase(object):
steps.extend(self.repos_clone_steps())
steps.extend(cli_steps)
steps.extend(plugman_steps)
- steps.extend(self.create_app_steps())
- steps.extend(self.platform_add_steps())
steps.extend(self.build_cordovajs_steps())
steps.extend(self.prepare_mobilespec_steps())
steps.extend(self.copy_cordovajs_steps())
steps.extend(self.deploy_steps())
return steps
- def get_build_steps(self):
- steps = []
- steps.extend(self.init_workspace_steps())
- steps.extend(self.repos_clone_steps())
- steps.extend(cli_steps)
- steps.extend(self.create_app_steps())
- steps.extend(self.platform_add_steps())
- steps.extend(self.build_platform_step())
- return steps
-
-
class PlatformTest_iOS(PlatformTestBase):
def __init__(self):
super(PlatformTest_iOS, self).__init__('ios')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org