diff -r 518c30f2a507 -r 36aeab46f27d plugins/canfestival/canfestival.py --- a/plugins/canfestival/canfestival.py Mon Dec 14 11:03:59 2009 +0100 +++ b/plugins/canfestival/canfestival.py Mon Dec 14 21:05:10 2009 +0100 @@ -8,7 +8,7 @@ import config_utils, gen_cfile, eds_utils from networkedit import networkedit from objdictedit import objdictedit -import canfestival_config +import canfestival_config as local_canfestival_config from plugger import PlugTemplate from commondialogs import CreateNodeDialog import wx @@ -171,7 +171,7 @@ res = eds_utils.GenerateEDSFile(os.path.join(buildpath, "Slave_%s.eds"%prefix), slave) if res : raise Exception, res - return [(Gen_OD_path,canfestival_config.getCFLAGS(CanFestivalPath))],"",False + return [(Gen_OD_path,local_canfestival_config.getCFLAGS(CanFestivalPath))],"",False #-------------------------------------------------- # MASTER @@ -293,7 +293,7 @@ dump(master, file) file.close() - return [(Gen_OD_path,canfestival_config.getCFLAGS(CanFestivalPath))],"",False + return [(Gen_OD_path,local_canfestival_config.getCFLAGS(CanFestivalPath))],"",False class RootClass: XSD = """ @@ -315,7 +315,7 @@ if element["name"] == "CanFestivalInstance": for child in element["children"]: if child["name"] == "CAN_Driver": - DLL_LIST= getattr(canfestival_config,"DLL_LIST",None) + DLL_LIST= getattr(local_canfestival_config,"DLL_LIST",None) if DLL_LIST is not None: child["type"] = DLL_LIST return infos @@ -427,6 +427,6 @@ f.write(cf_main) f.close() - return [(cf_main_path, canfestival_config.getCFLAGS(CanFestivalPath))],canfestival_config.getLDFLAGS(CanFestivalPath), True - - + return [(cf_main_path, local_canfestival_config.getCFLAGS(CanFestivalPath))],local_canfestival_config.getLDFLAGS(CanFestivalPath), True + +