Remove unwanted code (that search for information into files found using the TOOLCHAI...

[bertos.git] / wizard / BProject.py

diff --git a/wizard/BProject.py b/wizard/BProject.py
index 1cbaf1643b69ab878336e1a975f1e83922f19b18..7cc1da496432688f9cb5d44ac3c26cd039203667 100644 (file)
--- a/wizard/BProject.py
+++ b/wizard/BProject.py
@@ -39,6 +39,9 @@ import copy
 import pickle
 
 import DefineException
+
+from LoadException import VersionException, ToolchainException
+
 import const
 
 from bertos_utils import (
@@ -46,7 +49,7 @@ from bertos_utils import (
                             isBertosDir, getTagSet, setEnabledModules, getInfos,
                             loadConfigurationInfos, loadDefineLists, loadModuleDefinition,
                             getCommentList, updateConfigurationValues,
-                            
+
                             # Custom exceptions
                             ParseError, SupportedException
                         )
@@ -55,7 +58,7 @@ class BProject(object):
     """
     Simple class for store and retrieve project informations.
     """
-    
+
     def __init__(self, project_file="", info_dict={}):
         self.infos = {}
         self._cached_queries = {}
@@ -113,6 +116,13 @@ class BProject(object):
         self.loadModuleData(True)
         setEnabledModules(self, project_data["ENABLED_MODULES"])
 
+    def loadProjectPresets(self):
+        """
+        Load the default presets (into the const.PREDEFINED_BOARDS_DIR).
+        """
+        # NOTE: this method does nothing (for now).
+        preset_path = os.path.join(self.infos["SOURCES_PATH"], const.PREDEFINED_BOARDS_DIR)
+
     def loadModuleData(self, edit=False):
         module_info_dict = {}
         list_info_dict = {}
@@ -154,9 +164,6 @@ class BProject(object):
                         list_info_dict.update(list_dict)
                     except ParseError, err:
                         raise DefineException.EnumDefineException(path, err.line_number, err.line)
-        for filename, path in self.findDefinitions("*_" + self.infos["CPU_INFOS"]["TOOLCHAIN"] + ".h"):
-            comment_list = getCommentList(open(path + "/" + filename, "r").read())
-            list_info_dict.update(loadDefineLists(comment_list))
         for tag in self.infos["CPU_INFOS"]["CPU_TAGS"]:
             for filename, path in self.findDefinitions("*_" + tag + ".h"):
                 comment_list = getCommentList(open(path + "/" + filename, "r").read())
@@ -174,7 +181,7 @@ class BProject(object):
 
     def reloadCpuInfo(self):
         for cpu_info in self.loadCpuInfos():
-            if cpu_info["CPU_NAME"]:
+            if cpu_info["CPU_NAME"] == self.infos["CPU_NAME"]:
                 self.infos["CPU_INFOS"] = cpu_info
 
     def setInfo(self, key, value):
@@ -182,7 +189,7 @@ class BProject(object):
         Store the given value with the name key.
         """
         self.infos[key] = value
-    
+
     def info(self, key, default=None):
         """
         Retrieve the value associated with the name key.
@@ -206,7 +213,9 @@ class BProject(object):
         return [(filename, dirname) for dirname in file_dict.get(filename, [])]
 
     def findDefinitions(self, ftype):
-        definitions = self._cached_queries.get(ftype, None)
+        # Maintain a cache for every scanned SOURCES_PATH
+        definitions_dict = self._cached_queries.get(self.infos["SOURCES_PATH"], {})
+        definitions = definitions_dict.get(ftype, None)
         if definitions is not None:
             return definitions
         file_dict = self.infos["FILE_DICT"]
@@ -214,8 +223,13 @@ class BProject(object):
         for filename in file_dict:
             if fnmatch.fnmatch(filename, ftype):
                 definitions += [(filename, dirname) for dirname in file_dict.get(filename, [])]
-        self._cached_queries[ftype] = definitions
+
+        # If no cache for the current SOURCES_PATH create an empty one
+        if not definitions_dict:
+            self._cached_queries[self.infos["SOURCES_PATH"]] = {}
+        # Fill the empty cache with the result
+        self._cached_queries[self.infos["SOURCES_PATH"]][ftype] = definitions
         return definitions
 
     def __repr__(self):
-        return repr(self.infos)
\ No newline at end of file
+        return repr(self.infos)