Extract the validateToolchain function from the BToolchainPage in order to use it...

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

diff --git a/wizard/BEditingDialog.py b/wizard/BEditingDialog.py
index 121a4ed2cbba1e218adfd8b025b3129ded4e575f..495f358ce5746b0ee3e50cad43bcb511444497c7 100644 (file)
--- a/wizard/BEditingDialog.py
+++ b/wizard/BEditingDialog.py
@@ -39,7 +39,8 @@ import os
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
-from bertos_utils import loadBertosProject, bertosVersion
+from bertos_utils import loadBertosProject, bertosVersion, getToolchainName
+from toolchain_validation import validateToolchain
 import BModulePage
 
 class BEditingDialog(QDialog):
@@ -79,10 +80,15 @@ class BEditingDialog(QDialog):
         self.toolchain_menu = QMenu(self.tr("select toolchain"))
         action_group = QActionGroup(self.toolchain_menu)
         for toolchain in sorted(self.toolchains()):
-            action = self.toolchain_menu.addAction(toolchain)
+            info = validateToolchain(toolchain)
+            if info[0]:
+                name = getToolchainName(info[1])
+            else:
+                name = toolchain
+            action = self.toolchain_menu.addAction(name)
             action_group.addAction(action)
             action.setCheckable(True)
-            action.setChecked(True if unicode(action.text()) == self.currentToolchain()["path"] else False)
+            action.setChecked(True if toolchain == self.currentToolchain()["path"] else False)
 
     def setupVersionMenu(self):
         self.version_menu = QMenu(self.tr("select BeRTOS version"))

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 8a73185d71822b74f2881b1d0af0716697d2b821..b57801a0fe6ef6db2658d510cc071d941ad35adb 100644 (file)
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -358,6 +358,10 @@ def getToolchainInfo(output):
         info["thread"] = thread[0].split("Thread model: ")[1]
     return info
 
+def getToolchainName(toolchain_info):
+    name = "GCC " + toolchain_info["version"] + " - " + toolchain_info["target"].strip()
+    return name
+
 def loadSourceTree(project):
     fileList = [f for f in os.walk(project.info("SOURCES_PATH"))]
     project.setInfo("FILE_LIST", fileList)

diff --git a/wizard/toolchain_validation.py b/wizard/toolchain_validation.py
new file mode 100644 (file)
index 0000000..f70b1f9
--- /dev/null
+++ b/wizard/toolchain_validation.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+# encoding: utf-8
+#
+# This file is part of BeRTOS.
+#
+# Bertos is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+#
+# As a special exception, you may use this file as part of a free software
+# library without restriction.  Specifically, if other files instantiate
+# templates or use macros or inline functions from this file, or you compile
+# this file and link it with other files to produce an executable, this
+# file does not by itself cause the resulting executable to be covered by
+# the GNU General Public License.  This exception does not however
+# invalidate any other reasons why the executable file might be covered by
+# the GNU General Public License.
+#
+# Copyright 2008 Develer S.r.l. (http://www.develer.com/)
+#
+# $Id$
+#
+# Author: Lorenzo Berni <duplo@develer.com>
+#
+
+import os
+
+from PyQt4.QtCore import *
+
+import bertos_utils
+
+from const import TOOLCHAIN_ITEMS
+
+def validateToolchain(toolchain):
+    if not os.path.exists(toolchain):
+        return False, {}
+    for tool in TOOLCHAIN_ITEMS:
+        if not os.path.exists(toolchain.replace("gcc", tool)):
+            return False, {}
+    validation_process = QProcess()
+    validation_process.start(toolchain, ["-v"])
+    validation_process.waitForStarted(1000)
+    if validation_process.waitForFinished(200):
+        description = unicode(validation_process.readAllStandardError())
+        info = bertos_utils.getToolchainInfo(description)
+        print info
+        if len(info) >= 4:
+            return True, info
+        else:
+            return False, {}
+    else:
+        validation_process.kill()
+        return False, {}