X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=wizard%2FBToolchainPage.py;h=8a1edc1e43ddc8d0f9aa4bd9d6789868ae3bb87d;hb=1336f8f13e1b7f28ff3509f2caf12f0071802a26;hp=8d4101bac8ae2f80f1f0610de9a004d4ef61fd4e;hpb=b5eaec9ae59579faf3d2facea7ede3fb8ef64032;p=bertos.git diff --git a/wizard/BToolchainPage.py b/wizard/BToolchainPage.py index 8d4101ba..8a1edc1e 100644 --- a/wizard/BToolchainPage.py +++ b/wizard/BToolchainPage.py @@ -17,10 +17,12 @@ import BToolchainSearch import bertos_utils import qvariant_converter +from const import * + class BToolchainPage(BWizardPage): def __init__(self): - BWizardPage.__init__(self, "toolchain_select.ui") + BWizardPage.__init__(self, UI_LOCATION + "/toolchain_select.ui") self.setTitle(self.tr("Select toolchain")) self._validationProcess = None self._updateUi() @@ -34,7 +36,7 @@ class BToolchainPage(BWizardPage): toolchains = self.toolchains() for key, value in toolchains.items(): item = QListWidgetItem(key) - item.setData(Qt.UserRole, qvariant_converter.convertDict({"path": key})) + item.setData(Qt.UserRole, qvariant_converter.convertStringDict({"path": key})) self.pageContent.toolchainList.addItem(item) if value: self.validateToolchain(self.pageContent.toolchainList.row(item)) @@ -43,22 +45,23 @@ class BToolchainPage(BWizardPage): self.pageContent.toolchainList.clear() def _selectionChanged(self): - 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"] + "\nThread model: " + infos["thread"]) - self.pageContent.infoLabel.setVisible(True) - self.emit(SIGNAL("completeChanged()")) + 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"])) + self.pageContent.infoLabel.setVisible(True) + self.emit(SIGNAL("completeChanged()")) def _search(self): dirList = self.searchDirList() - if(self.pathSearch()): + 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(): item = QListWidgetItem(element) - item.setData(Qt.UserRole, qvariant_converter.convertDict({"path": element})) + item.setData(Qt.UserRole, qvariant_converter.convertStringDict({"path": element})) self.pageContent.toolchainList.addItem(item) storedToolchains[element] = False self.setToolchains(storedToolchains) @@ -72,15 +75,16 @@ class BToolchainPage(BWizardPage): def _validItem(self, index, infos): item = self.pageContent.toolchainList.item(index) - newData = qvariant_converter.getDict(self.pageContent.toolchainList.item(index).data(Qt.UserRole)) + newData = qvariant_converter.getStringDict(self.pageContent.toolchainList.item(index).data(Qt.UserRole)) newData.update(infos) - item.setData(Qt.UserRole, qvariant_converter.convertDict(newData)) + item.setData(Qt.UserRole, qvariant_converter.convertStringDict(newData)) needed = self._projectInfoRetrieve("CPU_INFOS") - if infos["target"].find(qvariant_converter.getString(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) @@ -90,7 +94,7 @@ class BToolchainPage(BWizardPage): sel_toolchain = QFileDialog.getOpenFileName(self, self.tr("Choose the toolchain"), "") if not sel_toolchain.isEmpty(): item = QListWidgetItem(sel_toolchain) - item.setData(Qt.UserRole, qvariant_converter.convertString(sel_toolchain)) + item.setData(Qt.UserRole, qvariant_converter.convertString({"path": sel_toolchain})) self.pageContent.toolchainList.addItem(item) toolchains = self.toolchains() toolchains[sel_toolchain] = False @@ -99,7 +103,7 @@ class BToolchainPage(BWizardPage): def removeToolchain(self): if self.pageContent.toolchainList.currentRow() != -1: item = self.pageContent.toolchainList.takeItem(self.pageContent.toolchainList.currentRow()) - toolchain = qvariant_converter.getString(qvariant_converter.getDict(item.data(Qt.UserRole))["path"]) + toolchain = qvariant_converter.getStringDict(item.data(Qt.UserRole))["path"] toolchains = self.toolchains() del toolchains[toolchain] self.setToolchains(toolchains) @@ -110,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.getString(qvariant_converter.getDict(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) + filename = qvariant_converter.getStringDict(self.pageContent.toolchainList.item(i).data(Qt.UserRole))["path"] + 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._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._invalidItem(i) + 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 @@ -135,8 +154,7 @@ class BToolchainPage(BWizardPage): def isComplete(self): if self.pageContent.toolchainList.currentRow() != -1: self._projectInfoStore("TOOLCHAIN", - qvariant_converter.getString( - qvariant_converter.getDict(self.pageContent.toolchainList.currentItem().data(Qt.UserRole))["path"])) + qvariant_converter.getStringDict(self.pageContent.toolchainList.currentItem().data(Qt.UserRole))) return True else: return False