From ed9836fc27f64c2aa74cf6f5f56bc6584998ceb8 Mon Sep 17 00:00:00 2001
From: rzaitov <r-zaitov@yandex.ru>
Date: Thu, 14 Nov 2013 16:26:18 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B5=D0=B4=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6?=
 =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=D1=81=D1=8F=20=D1=84=D0=B0=D0=B9?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=BC=20=D1=81=20=D0=B4=D0=B5=D1=84=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=82=D0=BD=D1=8B=D0=BC=D0=B8=20=D1=88=D0=B0=D0=B3=D0=B0=D0=BC?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/TouchinBuild/taskRunner.py | 19 +++++++++++++------
 scripts/settings.txt               |  1 -
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/scripts/TouchinBuild/taskRunner.py b/scripts/TouchinBuild/taskRunner.py
index faa9fb3..d368254 100755
--- a/scripts/TouchinBuild/taskRunner.py
+++ b/scripts/TouchinBuild/taskRunner.py
@@ -26,17 +26,18 @@ scriptDir = os.path.dirname(scriptFilePath)
 
 
 class TaskRunner:
-	def __init__(self, settingsProvider, fileContentProvider, buildConfigProvider, linePreprocessor):
+	def __init__(self, settingsProvider, fileContentProvider, buildConfigProvider, linePreprocessor, defaults):
 		assert settingsProvider is not None
 		assert fileContentProvider is not None
 		assert buildConfigProvider is not None
 		assert linePreprocessor is not None
+		assert defaults is not None
 
 		self.settingsProvider = settingsProvider
 		self.fileContentProvider = fileContentProvider
 		self.configsProvider = buildConfigProvider
 		self.linePreprocessor = linePreprocessor
-
+		self.defaults = defaults
 
 		macroProcessor = MacroProcessor()
 		self.valueProvider = ValueProvider()
@@ -68,7 +69,7 @@ class TaskRunner:
 		stepsRunner.run(content)
 
 	def getStepsContent(self, config):
-		pathToSteps = config['steps']
+		pathToSteps = config.get('steps', self.defaults['steps'])
 
 		content = self.fileContentProvider.fetchContent(pathToSteps)
 		content = self.textPreprocessor.processText(content, self.textPreprocessor)
@@ -77,6 +78,12 @@ class TaskRunner:
 
 if __name__ == "__main__":
 
+	defaults = {
+		'settings': 'settings.txt',
+		'builder_path': scriptDir,
+		'steps': os.path.join(scriptDir, 'steps.txt')
+	}
+
 	parser = argparse.ArgumentParser()
 	parser.add_argument('--settings', required=False)
 	allArgs = parser.parse_known_args()
@@ -92,7 +99,7 @@ if __name__ == "__main__":
 	linePreprocessor.addProcessor(lineStripper)
 
 	# TODO:  перенести в корень комапановки
-	settingsPath = knownArgs.settings or 'settings.txt'
+	settingsPath = knownArgs.settings or defaults['settings']
 	fromFileSettingsProvider = FromFileSettingsProvider(settingsPath, linePreprocessor)
 	overrideWithCmdSetProvider = CmdArgsOverriderSettingsProvider(fromFileSettingsProvider, overrideArgs, linePreprocessor)
 
@@ -100,10 +107,10 @@ if __name__ == "__main__":
 
 	buildConfigProvider = BuildConfigProvider()
 	predefineBuildConfigProvider = PredefinedMacrosBuildConfigProvider(buildConfigProvider)
-	predefineBuildConfigProvider.addPredefineMacro('builder_path', scriptDir)
+	predefineBuildConfigProvider.addPredefineMacro('builder_path', defaults['builder_path'])
 
 	resolvedBuildConfigProvider = ResolvedBuildConfigProvider(predefineBuildConfigProvider)
 
 
-	runner = TaskRunner(overrideWithCmdSetProvider, fContentProvider, resolvedBuildConfigProvider, linePreprocessor)
+	runner = TaskRunner(overrideWithCmdSetProvider, fContentProvider, resolvedBuildConfigProvider, linePreprocessor, defaults)
 	runner.run()
\ No newline at end of file
diff --git a/scripts/settings.txt b/scripts/settings.txt
index d37a95d..9000946 100644
--- a/scripts/settings.txt
+++ b/scripts/settings.txt
@@ -6,7 +6,6 @@ project_name = CoolApp
 
 # ios platform settings
 ios.sln_config = Release|iPhone
-ios.steps = 'scripts/IosSteps.txt'
 ios.setup_steps = 'IosSetupSteps.txt'
 ios.assembly_name = 'CoolApp'