From 4feaa0992d5c36303462df3c3207d9ddd78019a4 Mon Sep 17 00:00:00 2001 From: rzaitov Date: Fri, 15 Nov 2013 19:14:34 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BB=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=D1=83?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=D0=BF=D0=B8=D1=81=D0=B8=20apk=20=D1=84?= =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/AndroidSteps.txt | 2 +- .../commands/CleanBuildCommands/SignApkCommand.py | 10 ++-------- scripts/TouchinBuild/parsers/SignApkParser.py | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/scripts/AndroidSteps.txt b/scripts/AndroidSteps.txt index 5d3f566..0bbd163 100644 --- a/scripts/AndroidSteps.txt +++ b/scripts/AndroidSteps.txt @@ -4,4 +4,4 @@ inside 'BuildSample/DroidApp/Properties/AndroidManifest.xml' set android:version inside 'BuildSample/DroidApp/Properties/AndroidManifest.xml' set android:versionName to '1.2.3' clean 'BuildSample/BuildSample.sln' for '{@sln_config}' -build 'BuildSample/BuildSample.sln' for '{@sln_config}' +sign android 'BuildSample/BuildSample.sln' for '{@sln_config}' project 'DroidApp' diff --git a/scripts/TouchinBuild/commands/CleanBuildCommands/SignApkCommand.py b/scripts/TouchinBuild/commands/CleanBuildCommands/SignApkCommand.py index 7fc0e4e..9914f75 100644 --- a/scripts/TouchinBuild/commands/CleanBuildCommands/SignApkCommand.py +++ b/scripts/TouchinBuild/commands/CleanBuildCommands/SignApkCommand.py @@ -15,14 +15,8 @@ class SignApkCommand(ShellCommandBase): self.slnConfig = slnConfig self.projectName = projectName - self.commandPattern = '%(mdtool) -v build "--configuration:%(config)" "--project:%(project)" /t:SignAndroidPackage "%(slnPath)"' + self.commandPattern = '{0} -v build "--configuration:{1}" "--project:{2}" /t:SignAndroidPackage "{3}"' def execute(self): - cmdText = self.commandPattern % { - 'mdtool': self.pathToBuildUtil, - 'config': self.slnConfig, - 'project': self.projectName, - 'slnPath': self.slnPath - } - + cmdText = self.commandPattern.format(self.pathToBuildUtil, self.slnConfig, self.projectName, self.slnPath) self.executeShell(cmdText) diff --git a/scripts/TouchinBuild/parsers/SignApkParser.py b/scripts/TouchinBuild/parsers/SignApkParser.py index 4108b9f..5ac4e20 100644 --- a/scripts/TouchinBuild/parsers/SignApkParser.py +++ b/scripts/TouchinBuild/parsers/SignApkParser.py @@ -12,7 +12,7 @@ class SignApkParser(LineParser): filePathRegexp = r"'(?P[./ a-zA-Z]+\.sln)'" slnConfigRegexp = r"'(?P[a-zA-Z|]+)'" - projectRegexp = r"(?P[.a-zA-Z]+)$" + projectRegexp = r"'(?P[.a-zA-Z]+)'$" rb = RegexpBuilder() rSrc = rb.startsWith('sign') + rb.than('android') + filePathRegexp + rb.keywordToken('for') + slnConfigRegexp +\