From 35ee02c6d846e984bb2b2b91489f8954a6adcd64 Mon Sep 17 00:00:00 2001 From: rzaitov Date: Thu, 14 Nov 2013 15:01:50 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B5=D1=84=D0=B8=D0=BA=D1=81=20?= =?UTF-8?q?=D0=BA=20=D0=BF=D1=80=D0=BE=D1=84=D0=B8=D0=BB=D1=8F=D0=BC=20?= =?UTF-8?q?=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D1=8F=D0=B5=D1=82?= =?UTF-8?q?=D1=81=D1=8F=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA?= =?UTF-8?q?=D0=BE=D0=B9=20project=5Fname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/TouchinBuild/Core/StepsRunner.py | 4 +++- scripts/TouchinBuild/Tests/ManualTests/install_profile.py | 2 +- .../UnitTests/InstallProfile/test_installProfileBuilder.py | 2 +- .../TouchinBuild/parsers/InsideParser/InsideRemoveParser.py | 5 ++++- .../TouchinBuild/parsers/InsideParser/InsideSetParser.py | 6 ++++-- scripts/TouchinBuild/parsers/RegexpBuilder.py | 3 +++ scripts/TouchinBuild/utils/IncludeProcessor.py | 1 - 7 files changed, 16 insertions(+), 7 deletions(-) diff --git a/scripts/TouchinBuild/Core/StepsRunner.py b/scripts/TouchinBuild/Core/StepsRunner.py index 4e5894b..7441b89 100644 --- a/scripts/TouchinBuild/Core/StepsRunner.py +++ b/scripts/TouchinBuild/Core/StepsRunner.py @@ -33,7 +33,9 @@ class StepsRunner: self.patchInfoPlistArray = PatchInfoPlistArrayCommandBuilder() self.copyBuilder = CopyCommandBuilder() self.testflightBuilder = TestflightCommandBuilder() - self.installProfileBuilder = InstallProfileCommandBuilder() + + profilePrefix = config['project_name'] + self.installProfileBuilder = InstallProfileCommandBuilder(profilePrefix) buildUtilPath = config['build_tool'] self.cleanBuilder = CleanBuildCommandBuilder(buildUtilPath, 'clean') diff --git a/scripts/TouchinBuild/Tests/ManualTests/install_profile.py b/scripts/TouchinBuild/Tests/ManualTests/install_profile.py index 1f588f6..e86e39c 100644 --- a/scripts/TouchinBuild/Tests/ManualTests/install_profile.py +++ b/scripts/TouchinBuild/Tests/ManualTests/install_profile.py @@ -2,7 +2,7 @@ from CommandBuilders.InstallProfileCommandBuilder import InstallProfileCommandBu line = "install profile 'BuildSample/BuildSample/Profiles/8F606DAE-F9C9-4A19-8EFF-34B990D76C28.mobileprovision'" -builder = InstallProfileCommandBuilder() +builder = InstallProfileCommandBuilder('BsProject') command = builder.getCommandFor(line) command.execute() \ No newline at end of file diff --git a/scripts/TouchinBuild/Tests/UnitTests/InstallProfile/test_installProfileBuilder.py b/scripts/TouchinBuild/Tests/UnitTests/InstallProfile/test_installProfileBuilder.py index 13c5656..063374a 100644 --- a/scripts/TouchinBuild/Tests/UnitTests/InstallProfile/test_installProfileBuilder.py +++ b/scripts/TouchinBuild/Tests/UnitTests/InstallProfile/test_installProfileBuilder.py @@ -13,4 +13,4 @@ class TestInstallProfileBuilder(unittest.TestCase): def test_dstPath(self): dstPath = self.builder.getDestinationPath('/Some/Path/MyProfile.ext') - self.assertEqual('~/Library/MobileDevice/Provisioning Profiles/{0}.MyProfile.ext'.format(self.prefix), dstPath) \ No newline at end of file + self.assertEqual('~/Library/MobileDevice/Provisioning Profiles/{0}.MyProfile.ext'.format(self.prefix), dstPath) diff --git a/scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py b/scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py index 435acd2..3ec570e 100644 --- a/scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py +++ b/scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py @@ -1,5 +1,6 @@ import re from parsers.InsideParser.InsideParserBase import InsideParserBase +from parsers.RegexpBuilder import RegexpBuilder class InsideRemoveParser(InsideParserBase): @@ -20,7 +21,9 @@ class InsideRemoveParser(InsideParserBase): filePathRegexp = r"'(?P[./ a-zA-Z]+\.{0})'".format(self.fileExt) projectNameRegexp = r'(?P[.a-zA-Z]+)' - regexpSource = self.startsWith('inside') + filePathRegexp + self.keywordToken('remove') + projectNameRegexp + self.spaceEndsWith('project') + rb = RegexpBuilder() + regexpSource = rb.startsWith('inside') + filePathRegexp + rb.keywordToken('remove') + projectNameRegexp + \ + rb.spaceEndsWith('project') regexp = re.compile(regexpSource, re.UNICODE) match = regexp.match(line) diff --git a/scripts/TouchinBuild/parsers/InsideParser/InsideSetParser.py b/scripts/TouchinBuild/parsers/InsideParser/InsideSetParser.py index 2c9f883..aadf89d 100644 --- a/scripts/TouchinBuild/parsers/InsideParser/InsideSetParser.py +++ b/scripts/TouchinBuild/parsers/InsideParser/InsideSetParser.py @@ -1,5 +1,6 @@ import re from parsers.InsideParser.InsideParserBase import InsideParserBase +from parsers.RegexpBuilder import RegexpBuilder class InsideSetParser(InsideParserBase): @@ -21,8 +22,9 @@ class InsideSetParser(InsideParserBase): keyRegexp = r'(?P[a-zA-Z]+)' valueRegexp = r"'(?P[^']+)'$" - regexpSource = self.startsWith('inside') + self.filePathRegexp + self.keywordToken('set') + keyRegexp + \ - self.keywordToken('to') + valueRegexp + rb = RegexpBuilder() + regexpSource = rb.startsWith('inside') + self.filePathRegexp + rb.keywordToken('set') + keyRegexp + \ + rb.keywordToken('to') + valueRegexp regexp = re.compile(regexpSource, re.UNICODE) match = regexp.match(line) diff --git a/scripts/TouchinBuild/parsers/RegexpBuilder.py b/scripts/TouchinBuild/parsers/RegexpBuilder.py index ffa28f4..90df74d 100644 --- a/scripts/TouchinBuild/parsers/RegexpBuilder.py +++ b/scripts/TouchinBuild/parsers/RegexpBuilder.py @@ -1,4 +1,7 @@ class RegexpBuilder: + def __init__(self): + pass + def keywordToken(self, keyword): assert keyword is not None return r'\s+' + keyword + r'\s+' diff --git a/scripts/TouchinBuild/utils/IncludeProcessor.py b/scripts/TouchinBuild/utils/IncludeProcessor.py index 8357997..41b9ffe 100644 --- a/scripts/TouchinBuild/utils/IncludeProcessor.py +++ b/scripts/TouchinBuild/utils/IncludeProcessor.py @@ -1,5 +1,4 @@ import re -from parsers.LineParser import LineParser from parsers.RegexpBuilder import RegexpBuilder