QuasarApp/QuasarAppCI
4
0
Fork 0
mirror of https://github.com/QuasarApp/QuasarAppCI.git synced 2025-04-29 07:04:37 +00:00
Code Issues Projects Releases Wiki Activity

use android single build

Browse Source
This commit is contained in:
Andrei Yankovich 2021-04-11 10:09:18 +03:00
parent 3a16c986dd
commit 3b4391759a
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
BuildBotLib/cmake.py
View File

@ -54,7 +54,7 @@ class CMake(Make):
return ' '.join(options) return ' '.join(options)
def androidXmakeCmd(self, props): def androidXmakeMultiAbiCmd(self, props):
file = self.home + "/buildBotSecret/secret.json" file = self.home + "/buildBotSecret/secret.json"
secret = SecretManager(file, props) secret = SecretManager(file, props)
toochainFile = 'build/cmake/android.toolchain.cmake' toochainFile = 'build/cmake/android.toolchain.cmake'
@ -76,6 +76,29 @@ class CMake(Make):
return ' '.join(options) return ' '.join(options)
def androidXmakeSinglAbiCmd(self, props):
file = self.home + "/buildBotSecret/secret.json"
secret = SecretManager(file, props)
toochainFile = 'build/cmake/android.toolchain.cmake'
options = [
'cmake -GNinja',
'-DCMAKE_PREFIX_PATH=$QTDIR',
'-DQT_QMAKE_EXECUTABLE=$QTDIR/bin/qmake',
'-DANDROID_ABI=$ANDROID_ABI',
'-DCMAKE_FIND_ROOT_PATH=$QTDIR',
'-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/' + toochainFile,
'-DSIGN_PATH="' + secret.getValue('SIGPATH') + '"',
'-DSIGN_ALIES="quasarapp"',
'-DSIGN_STORE_PASSWORD="' + secret.getValue('SIGPASS') + '"',
'-B cmake_build'
]
return ' '.join(options)
def androidXmakeCmd(self, props):
return self.androidXmakeSinglAbiCmd(props)
def wasmXmakeCmd(self, props): def wasmXmakeCmd(self, props):
options = [ options = [
'cmake -DCMAKE_PREFIX_PATH=$QTDIR', 'cmake -DCMAKE_PREFIX_PATH=$QTDIR',

8
BuildBotLib/docs.py
View File

@ -1,7 +1,7 @@
# This Python file uses the following encoding: utf-8 # This Python file uses the following encoding: utf-8
from BuildBotLib.cmake import CMake from BuildBotLib.cmake import CMake
from buildbot.plugins import util, steps from buildbot.plugins import util
class Docs(CMake): class Docs(CMake):
@ -34,9 +34,9 @@ class Docs(CMake):
return 'mv docs ' + str(props.getProperty('copyFolder')) return 'mv docs ' + str(props.getProperty('copyFolder'))
res += [self.generateStep(move, res += [self.generateStep(move,
platform, platform,
'moveDocs', 'moveDocs',
self.isDeploy)] self.isDeploy)]
return res return res