From 253556c9e54087a2f8f109462a51af5127884328 Mon Sep 17 00:00:00 2001
From: "a.yankovich" <EndrIIMail@gmail.com>
Date: Mon, 22 Jul 2019 10:56:25 +0300
Subject: [PATCH] test androidQmakeO
---
BuildBotLib/qmake.py | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/BuildBotLib/qmake.py b/BuildBotLib/qmake.py
index 00be985..6fbfe18 100644
--- a/BuildBotLib/qmake.py
+++ b/BuildBotLib/qmake.py
@@ -107,19 +107,26 @@ def LinuxSteps() :
return list;
+@util.renderer
+def androidQmake(props):
+
+ command = [
+ 'qmake-android',
+ '-spec', 'android-clang',
+ "-r",
+ "CONFIG+=qtquickcompiler",
+ util.Interpolate('SIGN_PATH="%(secret:SIGPATH)s"'),
+ 'SIGN_ALIES="quasarapp"',
+ util.Interpolate('SIGN_STORE_PASSWORD="%(secret:SIGPATH)s"')
+ ]
+
+ return command
+
def AndroidSteps() :
list = [
steps.ShellCommand(
- command = [
- 'qmake-android',
- '-spec', 'android-clang',
- "-r",
- "CONFIG+=qtquickcompiler",
- 'SIGN_PATH="' + util.Interpolate("%(secret:SIGPATH)s") + '"',
- 'SIGN_ALIES="quasarapp"',
- 'SIGN_STORE_PASSWORD="' + util.Interpolate("%(secret:SIGPASS)s") + '"',
- ],
+ command = androidQmake,
haltOnFailure = True,
doStepIf = lambda step : isAndroid(step),