Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Fix header generator bug #43

Merged
merged 2 commits into from
Aug 18, 2023
Merged

Fix header generator bug #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a705b08
skip blank line
s-hosoai Aug 18, 2023
1e873ff
change env path to self origin
s-hosoai Aug 18, 2023
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
6 changes: 4 additions & 2 deletions mros2_header_generator/header_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import sys
import re
from jinja2 import Environment, FileSystemLoader
from os import path

arg = sys.argv
msgFile = arg[1]
Expand All @@ -21,7 +22,7 @@ def main():

# generate header file for mros2
for msg in msgs:
env = Environment(loader=FileSystemLoader('../mros2/mros2_header_generator'))
env = Environment(loader=FileSystemLoader(path.dirname(__file__)))
template = env.get_template('header_template.tpl')
datatext = template.render({ "msg": msg })

Expand All @@ -42,7 +43,8 @@ def genDepMsgHeader(genMsg):
msgs=[]
msgs.append(msgDataGenerator(genMsg.strip()))
for msg in msgs:
env = Environment(loader=FileSystemLoader('../mros2/mros2_header_generator'))
env = Environment(loader=FileSystemLoader(path.dirname(__file__)))

template = env.get_template('header_template.tpl')
datatext = template.render({ "msg": msg })

Expand Down
4 changes: 3 additions & 1 deletion mros2_header_generator/msg_data_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ def msgDataGenerator(line):
arr = m_f.readlines()
msgDef = []
for m_line in arr:
msgDef.append(msgDefGenerator(m_line, dependingFileNames))
stripped_line = m_line.strip()
if stripped_line == "": continue
msgDef.append(msgDefGenerator(stripped_line, dependingFileNames))

lineArr = line.strip().split('/')
lineArr[2] = os.path.splitext(lineArr[2])[0]
Expand Down