From: duplo <duplo@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Mon, 23 Feb 2009 18:27:42 +0000 (+0000)
Subject: Only show as valid the toolchains that also have the other needed tools
X-Git-Tag: 2.1.0~303
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=47bd7e9955bb480ba4720268ef0342d5fdb157de;hp=06b54dcaeaa1bb368a4f3542c3f6911e5187dcf5;p=bertos.git

Only show as valid the toolchains that also have the other needed tools

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2379 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py
index a2929b5d..778a8937 100644
--- a/wizard/BToolchainPage.py
+++ b/wizard/BToolchainPage.py
@@ -118,18 +118,31 @@ class BToolchainPage(BWizardPage):
     
     def validateToolchain(self, i):
         filename = qvariant_converter.getStringDict(self.pageContent.toolchainList.item(i).data(Qt.UserRole))["path"]
-        self._validationProcess = QProcess()
-        self._validationProcess.start(filename, ["-v"])
-        self._validationProcess.waitForStarted(1000)
-        if self._validationProcess.waitForFinished(200):
-            description = str(self._validationProcess.readAllStandardError())
-            infos = bertos_utils.getToolchainInfo(description)
-            if len(infos.keys()) >= 4:
-                self._validItem(i, infos)
+        valid = False
+        info = {}
+        ## Check for the other tools of the toolchain
+        for tool in TOOLCHAIN_ITEMS:
+            if os.path.exists(filename.replace("gcc", tool)):
+                valid = True
             else:
-                self._invalidItem(i)
+                valid = False
+                break
+        ## Try to retrieve the informations about the toolchain only for the valid toolchains
+        if valid:
+            self._validationProcess = QProcess()
+            self._validationProcess.start(filename, ["-v"])
+            self._validationProcess.waitForStarted(1000)
+            if self._validationProcess.waitForFinished(200):
+                description = str(self._validationProcess.readAllStandardError())
+                info = bertos_utils.getToolchainInfo(description)
+                if len(info.keys()) >= 4:
+                    valid = True
+            else:
+                self._validationProcess.kill()
+        ## Add the item in the list with the appropriate associate data.
+        if valid:
+            self._validItem(i, info)
         else:
-            self._validationProcess.kill()
             self._invalidItem(i)
         toolchains = self.toolchains()
         toolchains[filename] = True