Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lestarch: hacking around some build limitations #4

Closed
wants to merge 1 commit into from
Closed

lestarch: hacking around some build limitations #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 26 additions & 41 deletions Autocoders/Python/bin/tlm_packet_gen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

from lxml import etree
from Cheetah.Template import Template
from fprime_ac.utils.buildroot import search_for_file, set_build_roots

header_file_template = """

Expand Down Expand Up @@ -153,27 +154,27 @@ def get_type_size(self,type_name, size):
else:
return None

def search_for_file(self,file_type, file_path):
'''
Searches for a given included port or serializable by looking in three places:
- The specified BUILD_ROOT
- The F Prime core
- The exact specified path
@param file_type: type of file searched for
@param file_path: path to look for based on offset
@return: full path of file
'''
core = os.environ.get("FPRIME_CORE_DIR", BUILD_ROOT)
for possible in [BUILD_ROOT, core, None]:
if not possible is None:
checker = os.path.join(possible, file_path)
else:
checker = file_path
if os.path.exists(checker):
DEBUG.debug("%s xml type description file: %s" % (file_type,file_path))
return checker
else:
return None
# def search_for_file(self,file_type, file_path):
# '''
# Searches for a given included port or serializable by looking in three places:
# - The specified BUILD_ROOT
# - The F Prime core
# - The exact specified path
# @param file_type: type of file searched for
# @param file_path: path to look for based on offset
# @return: full path of file
# '''
# core = os.environ.get("FPRIME_CORE_DIR", BUILD_ROOT)
# for possible in [BUILD_ROOT, core, None]:
# if not possible is None:
# checker = os.path.join(possible, file_path)
# else:
# checker = file_path
# if os.path.exists(checker):
# DEBUG.debug("%s xml type description file: %s" % (file_type,file_path))
# return checker
# else:
# return None

def generate_channel_size_dict(self, the_parsed_topology_xml, xml_filename):
"""
Expand Down Expand Up @@ -216,13 +217,13 @@ def generate_channel_size_dict(self, the_parsed_topology_xml, xml_filename):
if (parsed_xml_dict[comp_type].get_serializable_type_files() != None):
serializable_file_list = parsed_xml_dict[comp_type].get_serializable_type_files()
for serializable_file in serializable_file_list:
serializable_file = self.search_for_file("Serializable", serializable_file)
serializable_file = search_for_file("Serializable", serializable_file)
serializable_model = XmlSerializeParser.XmlSerializeParser(serializable_file)
if (len(serializable_model.get_includes()) != 0):
raise Exception("%s: Can only include one level of serializable for dictionaries"%serializable_file)
serializable_type = serializable_model.get_namespace() + "::" + serializable_model.get_name()
serializable_size = 0
for (member_name, member_type, member_size, member_format_specifier, member_comment) in serializable_model.get_members():
for (member_name, member_type, member_size, member_format_specifier, member_comment, _) in serializable_model.get_members():
# if enumeration
if type(member_type) == type(tuple()):
type_size = 4
Expand Down Expand Up @@ -316,7 +317,7 @@ def gen_packet_file(self, xml_filename):
for entry in element_tree.getroot():
# read in topology file
if entry.tag == "import_topology":
top_file = self.search_for_file("Packet",entry.text)
top_file = search_for_file("Packet",entry.text)
if top_file == None:
raise TlmPacketParseIOError("import file %s not found"%entry.text)
the_parsed_topology_xml = XmlTopologyParser.XmlTopologyParser(top_file)
Expand Down Expand Up @@ -475,24 +476,8 @@ def main():
return

print("Processing packet file %s" % xml_filename)
set_build_roots(os.environ.get("BUILD_ROOT"))

#
# Check for BUILD_ROOT variable for XML port searches
#
if not opt.build_root_overwrite == None:
BUILD_ROOT = os.path.abspath(opt.build_root_overwrite)
ModelParser.BUILD_ROOT = BUILD_ROOT
if opt.verbose_flag:
print("BUILD_ROOT set to %s" % BUILD_ROOT)
else:
if ('BUILD_ROOT' in os.environ.keys()) == False:
print("ERROR: Build root not set to root build path...")
sys.exit(-1)
BUILD_ROOT = os.path.abspath(os.environ['BUILD_ROOT'])
ModelParser.BUILD_ROOT = BUILD_ROOT
if opt.verbose_flag:
print("BUILD_ROOT set to %s in environment" % BUILD_ROOT)

packet_parser = TlmPacketParser(opt.verbose_flag,opt.dependency_file)
try:
packet_parser.gen_packet_file(xml_filename)
Expand Down
3 changes: 2 additions & 1 deletion cmake/support/parser/ai_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ def read_fprime_import(import_type, root):
deps = set()
for imp in root.findall(import_type):
imp_lib = os.path.dirname(imp.text).replace("/", "_")
deps.add(imp_lib)
if not imp_lib.endswith("_Top") or import_type != "import_topology":
deps.add(imp_lib)
return deps


Expand Down