From ff2e2f12db30ece316733ea3668dbf021c6aa5e9 Mon Sep 17 00:00:00 2001 From: rzaitov Date: Fri, 1 Nov 2013 13:09:38 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=8B=20?= =?UTF-8?q?=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8=20=D0=B8=20=D0=BE=D1=87?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/IosSteps.txt | 2 ++ scripts/StepRunner/StepsRunner.py | 15 ++++++++++++++- scripts/settings.txt | 2 +- scripts/taskRunner.py | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/scripts/IosSteps.txt b/scripts/IosSteps.txt index f50d531..a83f11a 100644 --- a/scripts/IosSteps.txt +++ b/scripts/IosSteps.txt @@ -1,2 +1,4 @@ inside 'BuildSample/BuildSample.sln' remove NotCompileApp project +clean 'BuildSample/BuildSample.sln' for 'Release|iPhone' +build 'BuildSample/BuildSample.sln' for 'Release|iPhone' sh echo hello from Rustam \ No newline at end of file diff --git a/scripts/StepRunner/StepsRunner.py b/scripts/StepRunner/StepsRunner.py index d584d2b..f051f21 100644 --- a/scripts/StepRunner/StepsRunner.py +++ b/scripts/StepRunner/StepsRunner.py @@ -1,12 +1,19 @@ +from CommandBuilders.CleanBuildCommandBuilder import CleanBuildCommandBuilder from CommandBuilders.RemoveProjectCommandBuilder import RemoveProjectCommandBuilder from CommandBuilders.ShCommandBuilder import ShCommandBuilder class StepsRunner: - def __init__(self): + def __init__(self, config): + assert config is not None + self.shCommandBuilder = ShCommandBuilder() self.removeProjectBuilder = RemoveProjectCommandBuilder() + buildUtilPath = config['build_tool'] + self.cleanBuilder = CleanBuildCommandBuilder(buildUtilPath, 'clean') + self.buildBuilder = CleanBuildCommandBuilder(buildUtilPath, 'build') + def run(self, content): assert content is not None @@ -28,6 +35,12 @@ class StepsRunner: elif self.removeProjectBuilder.isRemoveProject(line): cmd = self.removeProjectBuilder.getCommandFor(line) cmd.execute() + elif self.cleanBuilder.isCleanBuild(line): + cmd = self.cleanBuilder.getCommandFor(line) + cmd.execute() + elif self.buildBuilder.isCleanBuild(line): + cmd = self.buildBuilder.getCommandFor(line) + cmd.execute() else: msg = "unrecognised step. Line: '{0}'".format(line) raise Exception(msg) \ No newline at end of file diff --git a/scripts/settings.txt b/scripts/settings.txt index c80f5db..a7e69ea 100644 --- a/scripts/settings.txt +++ b/scripts/settings.txt @@ -12,5 +12,5 @@ ios.steps = 'scripts/IosSteps.txt' ios.appstore.build_ready = 'true' ios.appstore.app_name = 'CoolApp' -ios.staging.build_ready = 'true' +#ios.staging.build_ready = 'true' ios.staging.app_name = 'CoolApp staging' diff --git a/scripts/taskRunner.py b/scripts/taskRunner.py index e24df71..1da1d76 100644 --- a/scripts/taskRunner.py +++ b/scripts/taskRunner.py @@ -24,7 +24,7 @@ class TaskRunner: def runConfig(self, config): content = self.getStepsContent(config) - stepsRunner = StepsRunner() + stepsRunner = StepsRunner(config) stepsRunner.run(content) def getStepsContent(self, config):