From a705b089a7167ae6eecae25c84c304d2bdfcc315 Mon Sep 17 00:00:00 2001 From: s-hosoai Date: Fri, 18 Aug 2023 11:29:30 +0900 Subject: [PATCH 1/2] skip blank line --- mros2_header_generator/msg_data_generator.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mros2_header_generator/msg_data_generator.py b/mros2_header_generator/msg_data_generator.py index 01a2370..3be8cf4 100644 --- a/mros2_header_generator/msg_data_generator.py +++ b/mros2_header_generator/msg_data_generator.py @@ -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] From 1e873ff5d5e64072220ca3375bae94868d8e2235 Mon Sep 17 00:00:00 2001 From: s-hosoai Date: Fri, 18 Aug 2023 11:38:56 +0900 Subject: [PATCH 2/2] change env path to self origin --- mros2_header_generator/header_generator.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mros2_header_generator/header_generator.py b/mros2_header_generator/header_generator.py index 88f8d59..a7e42f5 100644 --- a/mros2_header_generator/header_generator.py +++ b/mros2_header_generator/header_generator.py @@ -4,6 +4,7 @@ import sys import re from jinja2 import Environment, FileSystemLoader +from os import path arg = sys.argv msgFile = arg[1] @@ -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 }) @@ -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 })