added suppor iosworker

This commit is contained in:
Andrei Yankovich 2022-01-21 15:34:36 +03:00
parent 967c9d62f8
commit a48ccbed90
3 changed files with 24 additions and 9 deletions

View File

@ -38,6 +38,12 @@ class BaseModule:
def isWasm(self, step):
return self.platform == BaseModule.P_Wasm
def isiOS(self, step):
return self.platform == BaseModule.P_iOS
def isMac(self, step):
return self.platform == BaseModule.P_Mac
def generateCmd(self, bashString):
if isinstance(bashString, list):

View File

@ -4,7 +4,7 @@ from BuildBotLib.make import Make
from BuildBotLib.secretManager import SecretManager
from buildbot.plugins import steps, util
import multiprocessing
import os
class CMake(Make):
@ -15,22 +15,27 @@ class CMake(Make):
def makePrefix(self):
return "C"
def make(self):
return 'cmake --build cmake_build --target all'
def make(self, cxxFlags=[]):
return self.makeTarget('all', cxxFlags)
def makeTarget(self, target):
return 'cmake --build cmake_build --target ' + target
def makeCommand(self, props):
command = self.make()
def makeTarget(self, target, cxxFlags=[]):
command = 'cmake --build cmake_build'
command += ' --config Release --target ' + target
cpus = multiprocessing.cpu_count()
if cpus:
command += ' --parallel ' + str(cpus)
command += ' -- ' + cxxFlags.join(' ')
return command
def makeCommand(self, props):
cxx = []
if self.isiOS():
cxx = ['-allowProvisioningUpdates']
return self.make(cxx)
def linuxXmakeCmd(self, props):
defines = self.getDefinesList(props)

View File

@ -36,6 +36,8 @@ repoGen = QIFRepogen()
release = Releaser()
release = CMake(BaseModule.P_iOS)
bot.addBuilder("LinuxBuilder", qmakeLinux)
bot.addBuilder("WindowsBuilder", qmakeWindows)
@ -54,5 +56,7 @@ bot.addBuilder("Wasm32Builder", wasm)
bot.addBuilder("DocsGenerator", docs)
bot.addBuilder("prodDeployer", release)
bot.addBuilder("iOSCMakeBuilder", release)
c = BuildmasterConfig = bot.getMaster()