Add the const string containing the pattern of the cpu definition filenames

[bertos.git] / wizard / bertos_utils.py

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index fd199632dfb416c1d8a912c91187d14fa51c0e35..99bdca23f7b248463f1dcd42452795736b4f1871 100644 (file)
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -12,6 +12,8 @@
 import os
 import fnmatch
 
+import const
+
 def isBertosDir(directory):
    return os.path.exists(directory + "/VERSION")
 
@@ -27,16 +29,18 @@ def findDefinitions(ftype, path):
     L = os.walk(path)
     for element in L:
         for filename in element[2]:
-            if fnmatch.fnmatch(filename, "*." + ftype):
+            if fnmatch.fnmatch(filename, ftype):
                 yield (filename, element[0])
 
 def loadCpuInfos(path):
     cpuInfos = []
-    for definition in findDefinitions("cdef", path):
+    for definition in findDefinitions(const.CPU_DEFINITION, path):
         D = {}
+        D.update(const.CPU_DEF)
         def include(filename, dict = D, directory=definition[1]):
             execfile(directory + "/" + filename, {}, D)
-        d["include"] = include
+        D["include"] = include
         include(definition[0], D)
+        D["CPU_NAME"] = definition[0].split(".")[0]
         cpuInfos.append(D)
     return cpuInfos