diff -r d51af006fa6b -r 64d8f52bc8c8 targets/__init__.py --- a/targets/__init__.py Fri Aug 11 15:18:19 2017 +0300 +++ b/targets/__init__.py Mon Aug 14 19:13:01 2017 +0300 @@ -41,14 +41,14 @@ def _GetLocalTargetClassFactory(name): return lambda:getattr(__import__(name,globals(),locals()), name+"_target") -targets = dict([(name, {"xsd":path.join(_base_path, name, "XSD"), +targets = dict([(name, {"xsd":path.join(_base_path, name, "XSD"), "class":_GetLocalTargetClassFactory(name), - "code": { fname: path.join(_base_path, name, fname) + "code": { fname: path.join(_base_path, name, fname) for fname in listdir(path.join(_base_path, name)) if fname.startswith("plc_%s_main"%name) and fname.endswith(".c")}}) - for name in listdir(_base_path) - if path.isdir(path.join(_base_path, name)) + for name in listdir(_base_path) + if path.isdir(path.join(_base_path, name)) and not name.startswith("__")]) toolchains = {"gcc": path.join(_base_path, "XSD_toolchain_gcc"), @@ -67,7 +67,7 @@ DictXSD_toolchain["toolchain_"+toolchainname] = \ open(xsdfilename).read() - # Get all xsd targets + # Get all xsd targets for targetname,nfo in targets.iteritems(): xsd_string = open(nfo["xsd"]).read() targetchoices += xsd_string%DictXSD_toolchain @@ -86,4 +86,3 @@ def GetCode(name): filename = paths.AbsNeighbourFile(__file__,name) return open(filename).read() -