Merge branch 'BS-29'

scripts/IosSetupSteps.txt

@@ -1,4 +1,4 @@
-restore from backup
+restore from backup					# восстанавливаем из бэкапа (исходники от сборки предыдущей конфигурации могут быть модифицированными)
 create backup for 'BuildSample'
 
 inside 'BuildSample/BuildSample.sln' remove NotCompileApp project

scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py

@@ -16,7 +16,7 @@ class InsideRemoveParser(LineParser):
 		filePathRegexp = r"'(?P<file>[./ a-zA-Z]+\.{0})'".format(self.__extension)
 		projectNameRegexp = r'(?P<project>[.a-zA-Z]+)'
 
-		regexpSource = self.startsWith('inside') + filePathRegexp + self.keywordToken('remove') + projectNameRegexp + self.endsWith('project')
+		regexpSource = self.startsWith('inside') + filePathRegexp + self.keywordToken('remove') + projectNameRegexp + self.spaceEndsWith('project')
 		regexp = re.compile(regexpSource, re.UNICODE)
 
 		match = regexp.match(line)

scripts/TouchinBuild/parsers/LineParser.py

@@ -18,10 +18,14 @@ class LineParser:
 		assert keyword is not None
 		return r'^' + keyword + r'\s+'
 
-	def endsWith(self, keyword):
+	def spaceEndsWith(self, keyword):
 		assert keyword is not None
 		return r'\s+' + keyword + '$'
 
+	def endsWith(self, keyword):
+		assert keyword is not None
+		return keyword + '$'
+
 	def than(self, keyword):
 		assert keyword is not None
 		return keyword + r'\s+'

scripts/TouchinBuild/parsers/ParserBackup/RestoreBackupParser.py

@@ -10,7 +10,7 @@ class RestoreBackupParser(LineParser):
 	def parseLine(self, line):
 		assert line is not None
 
-		regexpSource = r'restore from backup\s*'
+		regexpSource = self.startsWith('restore') + self.than('from') + self.endsWith('backup')
 		regexp = re.compile(regexpSource, re.UNICODE)
 
 		match = regexp.match(line)

scripts/TouchinBuild/taskRunner.py

@@ -47,8 +47,8 @@ class TaskRunner:
 		self.textPreprocessor.addProcessor(macroResolver)
 
 		self.linePreprocessor = TextConveyorPreprocessor()
-		self.linePreprocessor.addProcessor(lineStripper)
 		self.linePreprocessor.addProcessor(commentRemover)
+		self.linePreprocessor.addProcessor(lineStripper)
 
 	def run(self):
 		rawSettings = self.settingsProvider.fetchSettings()