diff -r 4480b7da6bea -r 4fc681ed0c61 ProjectController.py --- a/ProjectController.py Fri May 18 18:50:49 2012 +0200 +++ b/ProjectController.py Sat May 19 12:41:48 2012 +0200 @@ -62,9 +62,9 @@ """+"\n".join(['' - for lib in features.libraries])+""" + libname+ + '_Library" type="xsd:boolean" use="optional" default="true"/>' + for libname,lib in features.libraries])+""" @@ -112,9 +112,9 @@ def LoadLibraries(self): self.Libraries = [] TypeStack=[] - for clsname in features.libraries: - if self.BeremizRoot.Libraries is None or getattr(self.BeremizRoot.Libraries, "Enable_"+clsname.rsplit('.',1)[-1]): - Lib = GetClassImporter(clsname)()(TypeStack) + for libname,clsname in features.libraries: + if self.BeremizRoot.Libraries is None or getattr(self.BeremizRoot.Libraries, "Enable_"+libname+"_Library"): + Lib = GetClassImporter(clsname)()(libname, TypeStack) TypeStack.append(Lib.GetTypes()) self.Libraries.append(Lib)