QuasarApp/QuasarAppCI
4
0
Fork 0
mirror of https://github.com/QuasarApp/QuasarAppCI.git synced 2025-04-28 14:44:36 +00:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Andrei Yankovich 2020-06-19 18:22:01 +03:00
parent 99a5e578de
commit 15fa57284d
4 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BuildBotLib/basemodule.py
View File

@ -16,10 +16,10 @@ class BaseModule:
self.MULTIPLE_SH_COMMAND = ["/bin/bash", "-c"] self.MULTIPLE_SH_COMMAND = ["/bin/bash", "-c"]
self.home = str(Path.home()) self.home = str(Path.home())
self.platform = platform self.platform = platform
self.detectedBuildSystems = 0 # self.detectedBuildSystems = 0
self.buildSystems = 0 # self.buildSystems = 0
self.B_CMake = 1 # self.B_CMake = 1
self.B_QMake = 2 # self.B_QMake = 2
def isWin(self, step): def isWin(self, step):
return self.platform == BaseModule.P_Windows return self.platform == BaseModule.P_Windows

2
BuildBotLib/cmake.py
View File

@ -8,7 +8,7 @@ class CMake(Make):
def __init__(self, platform): def __init__(self, platform):
Make.__init__(self, platform) Make.__init__(self, platform)
self.buildSystems = self.B_CMake # self.buildSystems = self.B_CMake
def makePrefix(self): def makePrefix(self):
return "C" return "C"

37
BuildBotLib/make.py
View File

@ -6,8 +6,6 @@ from buildbot.plugins import util, steps
import datetime import datetime
from BuildBotLib.secretManager import SecretManager from BuildBotLib.secretManager import SecretManager
import hashlib import hashlib
import glob
import os
class Make(BaseModule): class Make(BaseModule):
@ -16,8 +14,9 @@ class Make(BaseModule):
self.tempRepoDir = "" self.tempRepoDir = ""
def isSupport(self, step): def isSupport(self, step):
check = self.buildSystems & self.detectedBuildSystems # check = self.buildSystems & self.detectedBuildSystems
return check != 0 # return check != 0
return True
def isClean(self, step): def isClean(self, step):
return step.getProperty('clean') return step.getProperty('clean')
@ -113,25 +112,25 @@ class Make(BaseModule):
def makePrefix(self): def makePrefix(self):
return "X" return "X"
def checkSupportedBuildSystems(self): # def checkSupportedBuildSystems(self):
def cmd(step): # def cmd(step):
PWD = step.getProperty('builddir') + '/build' # PWD = step.getProperty('builddir') + '/build'
if (len(glob.glob1(PWD, '*.pro')) > 0): # if (len(glob.glob1(PWD, '*.pro')) > 0):
self.detectedBuildSystems = self.detectedBuildSystems | self.B_QMake # self.detectedBuildSystems = self.detectedBuildSystems | self.B_QMake
if (os.path.isfile(PWD + '/CMakeLists.txt')): # if (os.path.isfile(PWD + '/CMakeLists.txt')):
self.detectedBuildSystems = self.detectedBuildSystems | self.B_CMake # self.detectedBuildSystems = self.detectedBuildSystems | self.B_CMake
return ['echo', 'PWD: ' + PWD + str(self.detectedBuildSystems)] # return ['echo', 'PWD: ' + PWD + str(self.detectedBuildSystems)]
return steps.ShellCommand( # return steps.ShellCommand(
command=self.getWraper(cmd), # command=self.getWraper(cmd),
haltOnFailure=True, # haltOnFailure=True,
name='Chek build system', # name='Chek build system',
description='Chek build system', # description='Chek build system',
) # )
def generateStep(self, cmd, platform, desc, checkFunc, log=False): def generateStep(self, cmd, platform, desc, checkFunc, log=False):
@ -276,7 +275,7 @@ class Make(BaseModule):
) )
) )
factory.addStep(self.checkSupportedBuildSystems()) # factory.addStep(self.checkSupportedBuildSystems())
factory.addSteps(self.generatePlatformSteps(self.platform)) factory.addSteps(self.generatePlatformSteps(self.platform))
factory.addStep( factory.addStep(

2
BuildBotLib/qmake.py
View File

@ -8,7 +8,7 @@ class QMake(Make):
def __init__(self, platform): def __init__(self, platform):
Make.__init__(self, platform) Make.__init__(self, platform)
self.buildSystems = self.B_QMake # self.buildSystems = self.B_QMake
def makePrefix(self): def makePrefix(self):
return "Q" return "Q"