diff --git a/BuildBotLib/cmake.py b/BuildBotLib/cmake.py index a976461..914abdf 100644 --- a/BuildBotLib/cmake.py +++ b/BuildBotLib/cmake.py @@ -54,7 +54,7 @@ class CMake(Make): return ' '.join(options) - def androidXmakeCmd(self, props): + def androidXmakeMultiAbiCmd(self, props): file = self.home + "/buildBotSecret/secret.json" secret = SecretManager(file, props) toochainFile = 'build/cmake/android.toolchain.cmake' @@ -76,6 +76,29 @@ class CMake(Make): 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): options = [ 'cmake -DCMAKE_PREFIX_PATH=$QTDIR', diff --git a/BuildBotLib/docs.py b/BuildBotLib/docs.py index dcb8a4a..3e51ea0 100644 --- a/BuildBotLib/docs.py +++ b/BuildBotLib/docs.py @@ -1,7 +1,7 @@ # This Python file uses the following encoding: utf-8 from BuildBotLib.cmake import CMake -from buildbot.plugins import util, steps +from buildbot.plugins import util class Docs(CMake): @@ -34,9 +34,9 @@ class Docs(CMake): return 'mv docs ' + str(props.getProperty('copyFolder')) res += [self.generateStep(move, - platform, - 'moveDocs', - self.isDeploy)] + platform, + 'moveDocs', + self.isDeploy)] return res