diff --git a/BuildBotLib/buildBotShedulers.py b/BuildBotLib/buildBotShedulers.py index 0cebd82..d33bf92 100644 --- a/BuildBotLib/buildBotShedulers.py +++ b/BuildBotLib/buildBotShedulers.py @@ -34,6 +34,7 @@ class BuildBotShedulers(BuildBotModule): 'LinuxCMakeBuilderQt6', 'WindowsCMakeBuilder', 'Wasm32Builder', + 'iOSCMakeBuilder', ] prodBuilders = ['AndroidBuilder_v7', @@ -42,6 +43,7 @@ class BuildBotShedulers(BuildBotModule): 'LinuxCMakeBuilder', 'LinuxCMakeBuilderQt6', 'WindowsCMakeBuilder', + 'iOSCMakeBuilder' ] buildersDeployCode = ['DocsGenerator'] diff --git a/BuildBotLib/buildBotWorkers.py b/BuildBotLib/buildBotWorkers.py index 457d50b..f802cf9 100644 --- a/BuildBotLib/buildBotWorkers.py +++ b/BuildBotLib/buildBotWorkers.py @@ -28,6 +28,7 @@ class BuildBotWorkers(BuildBotModule): worker.Worker("AndroidBuilder_v8Qt6", password), worker.Worker("LinuxCMakeBuilder", password), worker.Worker("LinuxCMakeBuilderQt6", password), + worker.Worker("iOSCMakeBuilder", password), worker.Worker("WindowsCMakeBuilder", password), worker.Worker("RepoGen", password), worker.Worker("Wasm32Builder", password), diff --git a/BuildBotLib/cmake.py b/BuildBotLib/cmake.py index cde2944..2e47df6 100644 --- a/BuildBotLib/cmake.py +++ b/BuildBotLib/cmake.py @@ -144,6 +144,28 @@ class CMake(Make): def androidXmakeCmd(self, props): return self.androidXmakeSinglAbiCmd(props) + def iosXmakeCmd(self, props): + file = self.home + "/buildBotSecret/secret.json" + secret = SecretManager(file, props) + + defines = self.getDefinesList(props) + + defines += secret.convertToCmakeDefines() + + defines += [ + '-DCMAKE_PREFIX_PATH=$QTDIR', + '-DCMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM=$XCODE_DEVELOPMENT_TEAM', + '-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOL_CHAIN_FILE/', + '-B cmake_build' + ] + + options = [ + 'cmake -G Xcode', + ] + options += defines + + return ' '.join(options) + def wasmXmakeCmd(self, props): defines = self.getDefinesList(props) @@ -174,4 +196,3 @@ class CMake(Make): ) return factory -