From 68b988daca5aef5a1138d9cd45a5802defa194ac Mon Sep 17 00:00:00 2001 From: rzaitov Date: Fri, 8 Nov 2013 13:57:30 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=B0=20?= =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D1=8F=D1=8E=D1=82=D1=81=D1=8F=20=D0=BA?= =?UTF-8?q?=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D0=B8,?= =?UTF-8?q?=20=D0=BF=D0=BE=D1=82=D0=BE=D0=BC=20=D0=BF=D1=80=D0=BE=D0=B8?= =?UTF-8?q?=D1=81=D1=85=D0=BE=D0=B4=D0=B8=D1=82=20=D1=83=D0=B4=D0=B0=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B5=D0=B4=D1=83=D1=89=D0=B8?= =?UTF-8?q?=D1=85=20=D0=BF=D1=80=D0=BE=D0=B1=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B?= =?UTF-8?q?=D1=85=20=D1=81=D0=B8=D0=BC=D0=B2=D0=BE=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/IosSetupSteps.txt | 2 +- .../TouchinBuild/parsers/InsideParser/InsideRemoveParser.py | 2 +- scripts/TouchinBuild/parsers/LineParser.py | 6 +++++- .../parsers/ParserBackup/RestoreBackupParser.py | 2 +- scripts/TouchinBuild/taskRunner.py | 2 +- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/IosSetupSteps.txt b/scripts/IosSetupSteps.txt index 66b0c12..307f904 100644 --- a/scripts/IosSetupSteps.txt +++ b/scripts/IosSetupSteps.txt @@ -1,4 +1,4 @@ -restore from backup +restore from backup # восстанавливаем из бэкапа (исходники от сборки предыдущей конфигурации могут быть модифицированными) create backup for 'BuildSample' inside 'BuildSample/BuildSample.sln' remove NotCompileApp project diff --git a/scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py b/scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py index 9618259..4c72539 100644 --- a/scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py +++ b/scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py @@ -16,7 +16,7 @@ class InsideRemoveParser(LineParser): filePathRegexp = r"'(?P[./ a-zA-Z]+\.{0})'".format(self.__extension) projectNameRegexp = r'(?P[.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) diff --git a/scripts/TouchinBuild/parsers/LineParser.py b/scripts/TouchinBuild/parsers/LineParser.py index d04d475..db0581e 100644 --- a/scripts/TouchinBuild/parsers/LineParser.py +++ b/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+' diff --git a/scripts/TouchinBuild/parsers/ParserBackup/RestoreBackupParser.py b/scripts/TouchinBuild/parsers/ParserBackup/RestoreBackupParser.py index 6357ed5..5a6c10f 100644 --- a/scripts/TouchinBuild/parsers/ParserBackup/RestoreBackupParser.py +++ b/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) diff --git a/scripts/TouchinBuild/taskRunner.py b/scripts/TouchinBuild/taskRunner.py index 7066182..bf6fdf8 100755 --- a/scripts/TouchinBuild/taskRunner.py +++ b/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()