hook updated

BuildBotLib/buildBotShedulers.py

@@ -1,6 +1,6 @@
 # This Python file uses the following encoding: utf-8
 from BuildBotLib.buildBotModule import BuildBotModule
-from buildbot.plugins import schedulers, util
+from buildbot.plugins import schedulers
 
 
 class BuildBotShedulers(BuildBotModule):
@@ -27,20 +27,17 @@ class BuildBotShedulers(BuildBotModule):
         buildersCode = ['LinuxBuilder',
                         'AndroidBuilder',
                         'WindowsBuilder',
+                        'LinuxCMakeBuilder',
+                        'AndroidCMakeBuilder',
+                        'WindowsCMakeBuilder',
                         ]
 
-        cmakeBuildersCode = ['LinuxCMakeBuilder',
-                             'AndroidCMakeBuilder',
-                             'WindowsCMakeBuilder',
-                             ]
-
         buildersRepo = ['RepoGen']
         self.masterConf['schedulers'] = self.shedulers
 
         self.masterConf['schedulers'] += [
             schedulers.AnyBranchScheduler(
-                name='githubQmake',
+                name='github',
-                change_filter=util.ChangeFilter(project_re="qmake-*"),
                 builderNames=buildersCode,
                 properties={
                     'clean': True,
@@ -51,19 +48,6 @@ class BuildBotShedulers(BuildBotModule):
                 treeStableTimer=None
             ),
 
-            schedulers.AnyBranchScheduler(
-                name='githubCmake',
-                change_filter=util.ChangeFilter(project_re="cmake-*"),
-                builderNames=cmakeBuildersCode,
-                properties={
-                    'clean': True,
-                    'test': True,
-                    'release': False,
-                    'deploy': False
-                },
-                treeStableTimer=None
-            ),
-
             schedulers.Triggerable(name="repogen",
                                    builderNames=buildersRepo)
         ]

BuildBotLib/cmake.py

@@ -2,6 +2,7 @@
 
 from BuildBotLib.make import Make
 from BuildBotLib.secretManager import SecretManager
+import os
 
 
 class CMake(Make):
@@ -12,6 +13,9 @@ class CMake(Make):
     def makePrefix(self):
         return "C"
 
+    def isSupport(self, step):
+        return os.path.isfile('./CMakeLists.txt')
+
     def mainCmd(self):
         command = [
             'cmake',

BuildBotLib/make.py

@@ -13,6 +13,9 @@ class Make(BaseModule):
         BaseModule.__init__(self, platform)
         self.tempRepoDir = ""
 
+    def isSupport(self, step):
+        return False
+
     def isClean(self, step):
         return step.getProperty('clean')
 
@@ -121,7 +124,7 @@ class Make(BaseModule):
             return platformEnv[platform](step)
 
         def dustepIf(step):
-            return checkFunc(step)
+            return checkFunc(step) and self.isSupport(step)
 
         res = steps.Compile(
             command=self.getWraper(cmd),
@@ -218,7 +221,9 @@ class Make(BaseModule):
                 return self.home + "/repo/"
 
             res += [steps.Trigger(schedulerNames=['repogen'],
-                                  doStepIf=lambda step: self.isRelease(step),
+                                  doStepIf=lambda step:
+                                      self.isRelease(step) and
+                                      self.isSupport(step),
                                   set_properties={"tempPackage": tempDirProp,
                                                   "platform": platform,
                                                   "projectName": projectName,
@@ -263,9 +268,9 @@ class Make(BaseModule):
 
         factory.addStep(
             self.generateStep(["git", "clean", "-xdf"],
-                               self.platform,
+                              self.platform,
-                               'clear all data',
+                              'clear all data',
-                               lambda step: True)
+                              lambda step: True)
         )
 
         return factory

BuildBotLib/qmake.py

@@ -2,6 +2,7 @@
 
 from BuildBotLib.make import Make
 from BuildBotLib.secretManager import SecretManager
+import glob
 
 
 class QMake(Make):
@@ -12,6 +13,9 @@ class QMake(Make):
     def makePrefix(self):
         return "Q"
 
+    def isSupport(self, step):
+        return len(glob.glob1("./", "*.pro")) > 0
+
     def mainCmd(self):
         command = [
             'qmake',