X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBToolchainPage.py;h=18935ec5f598db267642404576bacd0156429119;hb=fdb18feb2dc80cfd619b2eb6b1c5ad194106de05;hp=a2ecfeb550a13f563f0f3cddac45dd8ae713c175;hpb=98c9cd8fdcf45680606672eb88317d76a509c9fa;p=bertos.git

diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py
index a2ecfeb5..18935ec5 100644
--- a/wizard/BToolchainPage.py
+++ b/wizard/BToolchainPage.py
@@ -24,7 +24,7 @@ class BToolchainPage(BWizardPage):
     def __init__(self):
         BWizardPage.__init__(self, UI_LOCATION + "/toolchain_select.ui")
         self.setTitle(self.tr("Select toolchain"))
-        self._validationProcess = None
+        self._validation_process = None
         self._updateUi()
         #self._populateToolchainList()
         self._connectSignals()
@@ -45,7 +45,7 @@ class BToolchainPage(BWizardPage):
         self.pageContent.toolchainList.clear()
     
     def _selectionChanged(self):
-        if self.pageContent.toolchainList.currentIndex != -1:
+        if self.pageContent.toolchainList.currentRow() != -1:
             infos = collections.defaultdict(lambda: unicode("not defined"))
             infos.update(qvariant_converter.getStringDict(self.pageContent.toolchainList.currentItem().data(Qt.UserRole)))
             self.pageContent.infoLabel.setText("GCC " + infos["version"] + " (" + infos["build"] + ")\nTarget: " + infos["target"] + "\nPath: " + os.path.normpath(infos["path"]))
@@ -53,18 +53,18 @@ class BToolchainPage(BWizardPage):
             self.emit(SIGNAL("completeChanged()"))
     
     def _search(self):
-        dirList = self.searchDirList()
-        if(self.pathSearch()):
-            dirList += [element for element in bertos_utils.getSystemPath()]
-        toolchainList = bertos_utils.findToolchains(dirList)
-        storedToolchains = self.toolchains()
-        for element in toolchainList:
-            if not element in storedToolchains.keys():
+        dir_list = self.searchDirList()
+        if self.pathSearch():
+            dir_list += [element for element in bertos_utils.getSystemPath()]
+        toolchain_list = bertos_utils.findToolchains(dir_list)
+        stored_toolchains = self.toolchains()
+        for element in toolchain_list:
+            if not element in stored_toolchains.keys():
                 item = QListWidgetItem(element)
                 item.setData(Qt.UserRole, qvariant_converter.convertStringDict({"path": element}))
                 self.pageContent.toolchainList.addItem(item)
-                storedToolchains[element] = False
-        self.setToolchains(storedToolchains)
+                stored_toolchains[element] = False
+        self.setToolchains(stored_toolchains)
         
     def _connectSignals(self):
         self.connect(self.pageContent.toolchainList, SIGNAL("itemSelectionChanged()"), self._selectionChanged)
@@ -75,15 +75,16 @@ class BToolchainPage(BWizardPage):
     
     def _validItem(self, index, infos):
         item = self.pageContent.toolchainList.item(index)
-        newData = qvariant_converter.getStringDict(self.pageContent.toolchainList.item(index).data(Qt.UserRole))
-        newData.update(infos)
-        item.setData(Qt.UserRole, qvariant_converter.convertStringDict(newData))
+        new_data = qvariant_converter.getStringDict(self.pageContent.toolchainList.item(index).data(Qt.UserRole))
+        new_data.update(infos)
+        item.setData(Qt.UserRole, qvariant_converter.convertStringDict(new_data))
         needed = self._projectInfoRetrieve("CPU_INFOS")
-        if infos["target"].find(needed["TOOLCHAIN"]) != -1:
+        if "target" in infos.keys() and infos["target"].find(needed["TOOLCHAIN"]) != -1:
             item.setIcon(QIcon(":/images/ok.png"))
         else:
             item.setIcon(QIcon(":/images/warning.png"))
-        item.setText("GCC " + infos["version"] + " - " + infos["target"])
+        if "version" in infos.keys() and "target" in infos.keys():
+            item.setText("GCC " + infos["version"] + " - " + infos["target"])
     
     def _invalidItem(self, index):
         item = self.pageContent.toolchainList.item(index)
@@ -113,23 +114,38 @@ class BToolchainPage(BWizardPage):
         search.exec_()
     
     def validateAllToolchains(self):
+        QApplication.instance().setOverrideCursor(Qt.WaitCursor)
         for i in range(self.pageContent.toolchainList.count()):
             self.validateToolchain(i)
+        QApplication.instance().restoreOverrideCursor()
     
     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:
+                valid = False
+                break
+        ## Try to retrieve the informations about the toolchain only for the valid toolchains
+        if valid:
+            self._validation_process = QProcess()
+            self._validation_process.start(filename, ["-v"])
+            self._validation_process.waitForStarted(1000)
+            if self._validation_process.waitForFinished(200):
+                description = str(self._validation_process.readAllStandardError())
+                info = bertos_utils.getToolchainInfo(description)
+                if len(info.keys()) >= 4:
+                    valid = True
             else:
-                self._invalidItem(i)
+                self._validation_process.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