QuasarApp/QuasarAppCI
4
0
Fork 0
mirror of https://github.com/QuasarApp/QuasarAppCI.git synced 2025-05-21 17:29:37 +00:00
Code Issues Projects Releases Wiki Activity

fix make validators

Browse Source
This commit is contained in:
Andrei Yankovich 2020-06-19 14:59:01 +03:00
parent d01d5cdcbb
commit 417730532b
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BuildBotLib/cmake.py
View File

@ -14,7 +14,8 @@ class CMake(Make):
return "C" return "C"
def isSupport(self, step): def isSupport(self, step):
return os.path.isfile('./CMakeLists.txt') PWD = step.getProperty('builddir') + '/build'
return os.path.isfile(PWD + '/CMakeLists.txt')
def mainCmd(self): def mainCmd(self):
command = [ command = [

2
BuildBotLib/make.py
View File

@ -130,7 +130,7 @@ class Make(BaseModule):
command=self.getWraper(cmd), command=self.getWraper(cmd),
haltOnFailure=True, haltOnFailure=True,
doStepIf=lambda step: dustepIf(step), doStepIf=lambda step: dustepIf(step),
#hideStepIf=lambda results, step: not dustepIf(step), hideStepIf=lambda results, step: not dustepIf(step),
name=desc + ' ' + platform, name=desc + ' ' + platform,
env=envWraper, env=envWraper,
want_stdout=True, want_stdout=True,

3
BuildBotLib/qmake.py
View File

@ -14,7 +14,8 @@ class QMake(Make):
return "Q" return "Q"
def isSupport(self, step): def isSupport(self, step):
return len(glob.glob1('.', '*.pro')) > 0 PWD = step.getProperty('builddir') + '/build'
return len(glob.glob1(PWD, '*.pro')) > 0
def mainCmd(self): def mainCmd(self):
command = [ command = [