QuasarApp/QuasarAppCI
4
0
Fork 0
mirror of https://github.com/QuasarApp/QuasarAppCI.git synced 2025-04-26 13:54:31 +00:00
Code Issues Projects Releases Wiki Activity

added new platform android qt6

Browse Source
This commit is contained in:
Andrei Yankovich 2021-06-05 12:47:02 +03:00
parent 6432e3d218
commit 3af188d914
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BuildBotLib/basemodule.py
View File

@ -11,7 +11,8 @@ class BaseModule:
P_Windows = 'Windows'
P_Linux = 'Linux'
P_Android = 'Android'
P_AndroidQt5 = 'AndroidQt5'
P_AndroidQt6 = 'AndroidQt6'
P_Wasm = 'Wasm'
def __init__(self, platform, pwd="."):
@ -31,7 +32,7 @@ class BaseModule:
return self.platform == BaseModule.P_Linux
def isAndroid(self, step):
return self.platform == BaseModule.P_Android
return self.platform == BaseModule.P_AndroidQt5 or self.platform == BaseModule.P_AndroidQt6
def isWasm(self, step):
return self.platform == BaseModule.P_Wasm

3
BuildBotLib/docs.py
View File

@ -14,7 +14,8 @@ class Docs(CMake):
platformXcmd = {
CMake.P_Linux: self.linuxXmakeCmd,
CMake.P_Windows: self.windowsXmakeCmd,
CMake.P_Android: self.androidXmakeCmd,
CMake.P_AndroidQt5: self.androidXmakeCmd,
CMake.P_AndroidQt6: self.androidXmakeCmd,
CMake.P_Wasm: self.wasmXmakeCmd,
}

8
BuildBotLib/make.py
View File

@ -160,7 +160,8 @@ class Make(BaseModule):
platformEnv = {
BaseModule.P_Linux: self.linuxXmakeEnv,
BaseModule.P_Windows: self.windowsXmakeEnv,
BaseModule.P_Android: self.androidXmakeEnv,
BaseModule.P_AndroidQt5: self.androidXmakeCmd,
BaseModule.P_AndroidQt6: self.androidXmakeCmd,
BaseModule.P_Wasm: self.wasmXmakeEnv,
}
@ -205,7 +206,8 @@ class Make(BaseModule):
platformXcmd = {
BaseModule.P_Linux: self.linuxXmakeCmd,
BaseModule.P_Windows: self.windowsXmakeCmd,
BaseModule.P_Android: self.androidXmakeCmd,
BaseModule.P_AndroidQt5: self.androidXmakeCmd,
BaseModule.P_AndroidQt6: self.androidXmakeCmd,
BaseModule.P_Wasm: self.wasmXmakeCmd,
}
@ -238,7 +240,7 @@ class Make(BaseModule):
'release project',
self.isRelease)]
if platform != BaseModule.P_Android:
if not self.isAndroid(''):
res += [steps.DirectoryUpload(
workersrc=util.Interpolate('%(prop:repoFolder)s'),

9
master.cfg
View File

@ -22,11 +22,12 @@ bot = BuildBot()
qmakeLinux = QMake(BaseModule.P_Linux)
qmakeWindows = QMake(BaseModule.P_Windows)
qmakeAndroid = QMake(BaseModule.P_Android)
qmakeAndroid = QMake(BaseModule.P_AndroidQt5)
cmakeLinux = CMake(BaseModule.P_Linux)
cmakeWindows = CMake(BaseModule.P_Windows)
cmakeAndroid = CMake(BaseModule.P_Android)
cmakeAndroidqt5 = CMake(BaseModule.P_AndroidQt5)
cmakeAndroidqt6 = CMake(BaseModule.P_AndroidQt6)
wasm = CMake(BaseModule.P_Wasm)
docs = Docs(BaseModule.P_Linux)
@ -39,8 +40,8 @@ bot.addBuilder("WindowsBuilder", qmakeWindows)
bot.addBuilder("LinuxCMakeBuilder", cmakeLinux)
bot.addBuilder("WindowsCMakeBuilder", cmakeWindows)
bot.addBuilder("AndroidBuilder_qt5", cmakeAndroid)
bot.addBuilder("AndroidBuilder_qt6", cmakeAndroid)
bot.addBuilder("AndroidBuilder_qt5", cmakeAndroidqt5)
bot.addBuilder("AndroidBuilder_qt6", cmakeAndroidqt6)
bot.addBuilder("RepoGen", repoGen)