From 15fa57284d4f1ae8eddf9d619caf24f44f65237b Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Fri, 19 Jun 2020 18:22:01 +0300
Subject: [PATCH] fix

---
 BuildBotLib/basemodule.py |  8 ++++----
 BuildBotLib/cmake.py      |  2 +-
 BuildBotLib/make.py       | 37 ++++++++++++++++++-------------------
 BuildBotLib/qmake.py      |  2 +-
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/BuildBotLib/basemodule.py b/BuildBotLib/basemodule.py
index 0022478..4db912d 100644
--- a/BuildBotLib/basemodule.py
+++ b/BuildBotLib/basemodule.py
@@ -16,10 +16,10 @@ class BaseModule:
         self.MULTIPLE_SH_COMMAND = ["/bin/bash", "-c"]
         self.home = str(Path.home())
         self.platform = platform
-        self.detectedBuildSystems = 0
-        self.buildSystems = 0
-        self.B_CMake = 1
-        self.B_QMake = 2
+#        self.detectedBuildSystems = 0
+#        self.buildSystems = 0
+#        self.B_CMake = 1
+#        self.B_QMake = 2
 
     def isWin(self, step):
         return self.platform == BaseModule.P_Windows
diff --git a/BuildBotLib/cmake.py b/BuildBotLib/cmake.py
index 061556c..0a3540e 100644
--- a/BuildBotLib/cmake.py
+++ b/BuildBotLib/cmake.py
@@ -8,7 +8,7 @@ class CMake(Make):
 
     def __init__(self, platform):
         Make.__init__(self, platform)
-        self.buildSystems = self.B_CMake
+#        self.buildSystems = self.B_CMake
 
     def makePrefix(self):
         return "C"
diff --git a/BuildBotLib/make.py b/BuildBotLib/make.py
index 3451541..fb9ec8e 100644
--- a/BuildBotLib/make.py
+++ b/BuildBotLib/make.py
@@ -6,8 +6,6 @@ from buildbot.plugins import util, steps
 import datetime
 from BuildBotLib.secretManager import SecretManager
 import hashlib
-import glob
-import os
 
 
 class Make(BaseModule):
@@ -16,8 +14,9 @@ class Make(BaseModule):
         self.tempRepoDir = ""
 
     def isSupport(self, step):
-        check = self.buildSystems & self.detectedBuildSystems
-        return check != 0
+        # check = self.buildSystems & self.detectedBuildSystems
+        # return check != 0
+        return True
 
     def isClean(self, step):
         return step.getProperty('clean')
@@ -113,25 +112,25 @@ class Make(BaseModule):
     def makePrefix(self):
         return "X"
 
-    def checkSupportedBuildSystems(self):
+#    def checkSupportedBuildSystems(self):
 
-        def cmd(step):
-            PWD = step.getProperty('builddir') + '/build'
+#        def cmd(step):
+#            PWD = step.getProperty('builddir') + '/build'
 
-            if (len(glob.glob1(PWD, '*.pro')) > 0):
-                self.detectedBuildSystems = self.detectedBuildSystems | self.B_QMake
+#            if (len(glob.glob1(PWD, '*.pro')) > 0):
+#                self.detectedBuildSystems = self.detectedBuildSystems | self.B_QMake
 
-            if (os.path.isfile(PWD + '/CMakeLists.txt')):
-                self.detectedBuildSystems = self.detectedBuildSystems | self.B_CMake
+#            if (os.path.isfile(PWD + '/CMakeLists.txt')):
+#                self.detectedBuildSystems = self.detectedBuildSystems | self.B_CMake
 
-            return ['echo', 'PWD: ' + PWD + str(self.detectedBuildSystems)]
+#            return ['echo', 'PWD: ' + PWD + str(self.detectedBuildSystems)]
 
-        return steps.ShellCommand(
-                    command=self.getWraper(cmd),
-                    haltOnFailure=True,
-                    name='Chek build system',
-                    description='Chek build system',
-                )
+#        return steps.ShellCommand(
+#                    command=self.getWraper(cmd),
+#                    haltOnFailure=True,
+#                    name='Chek build system',
+#                    description='Chek build system',
+#                )
 
     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.addStep(
diff --git a/BuildBotLib/qmake.py b/BuildBotLib/qmake.py
index bde98d2..72c1a4b 100644
--- a/BuildBotLib/qmake.py
+++ b/BuildBotLib/qmake.py
@@ -8,7 +8,7 @@ class QMake(Make):
 
     def __init__(self, platform):
         Make.__init__(self, platform)
-        self.buildSystems = self.B_QMake
+#        self.buildSystems = self.B_QMake
 
     def makePrefix(self):
         return "Q"