yemai/bizhang_-obav
1
0
Fork 0
mirror of https://gitee.com/xiaohuolufeihua/bizhang_-obav.git synced 2026-05-21 01:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework Includes during the uorb message generation

Browse Source 
each CMakeFile that generates parameters should add its path to the msg_include_path
which will then be handled in the px_generate_uorb_topic_files.py
This commit is contained in:
mazahner
2017-01-13 16:43:48 +01:00
committed by Lorenz Meier
parent 6ffffe3367
commit 06d28b2635
4 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -388,6 +388,7 @@ add_subdirectory(msg)
px4_generate_messages(TARGET msg_gen px4_generate_messages(TARGET msg_gen
MSG_FILES ${msg_files} MSG_FILES ${msg_files}
OS ${OS} OS ${OS}
INCLUDES ${msg_include_paths}
DEPENDS git_genmsg git_gencpp prebuild_targets DEPENDS git_genmsg git_gencpp prebuild_targets
) )
px4_generate_parameters_xml(OUT parameters.xml px4_generate_parameters_xml(OUT parameters.xml

14
Tools/px_generate_uorb_topic_files.py
View File

@@ -79,7 +79,7 @@ __email__ = "thomasgubler@gmail.com"
TEMPLATE_FILE = ['msg.h.template', 'msg.cpp.template'] TEMPLATE_FILE = ['msg.h.template', 'msg.cpp.template']
TOPICS_LIST_TEMPLATE_FILE = 'uORBTopics.cpp.template' TOPICS_LIST_TEMPLATE_FILE = 'uORBTopics.cpp.template'
OUTPUT_FILE_EXT = ['.h', '.cpp'] OUTPUT_FILE_EXT = ['.h', '.cpp']
INCL_DEFAULT = ['std_msgs:./msg/std_msgs','px4:%s'%(px4_msg_dir)] INCL_DEFAULT = ['std_msgs:./msg/std_msgs']
PACKAGE = 'px4' PACKAGE = 'px4'
TOPICS_TOKEN = '# TOPICS ' TOPICS_TOKEN = '# TOPICS '
@@ -279,7 +279,11 @@ def generate_topics_list_file_from_files(files, outputdir, templatedir):
tl_template_file = os.path.join(templatedir, TOPICS_LIST_TEMPLATE_FILE) tl_template_file = os.path.join(templatedir, TOPICS_LIST_TEMPLATE_FILE)
tl_out_file = os.path.join(outputdir, TOPICS_LIST_TEMPLATE_FILE.replace(".template", "")) tl_out_file = os.path.join(outputdir, TOPICS_LIST_TEMPLATE_FILE.replace(".template", ""))
generate_by_template(tl_out_file, tl_template_file, tl_globals) generate_by_template(tl_out_file, tl_template_file, tl_globals)
def append_to_include_path(path_to_append, curr_include):
for p in path_to_append:
curr_include.append("%s:%s" % (PACKAGE, p))
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
description='Convert msg files to uorb headers/sources') description='Convert msg files to uorb headers/sources')
@@ -291,6 +295,9 @@ if __name__ == "__main__":
parser.add_argument('-f', dest='file', parser.add_argument('-f', dest='file',
help="files to convert (use only without -d)", help="files to convert (use only without -d)",
nargs="+") nargs="+")
parser.add_argument('-i', dest="include_paths",
help='Additional Include Paths', nargs="*",
default=None)
parser.add_argument('-e', dest='templatedir', parser.add_argument('-e', dest='templatedir',
help='directory with template files',) help='directory with template files',)
parser.add_argument('-o', dest='outputdir', parser.add_argument('-o', dest='outputdir',
@@ -305,6 +312,9 @@ if __name__ == "__main__":
' name when converting directories') ' name when converting directories')
args = parser.parse_args() args = parser.parse_args()
if args.include_paths:
append_to_include_path(args.include_paths, INCL_DEFAULT)
if args.headers: if args.headers:
generate_idx = 0 generate_idx = 0
elif args.sources: elif args.sources:

3
cmake/common/px4_base.cmake
View File

@@ -407,6 +407,7 @@ function(px4_generate_messages)
--headers --headers
${QUIET} ${QUIET}
-f ${MSG_FILES} -f ${MSG_FILES}
-i ${INCLUDES}
-o ${msg_out_path} -o ${msg_out_path}
-e msg/templates/uorb -e msg/templates/uorb
-t ${PX4_BINARY_DIR}/topics_temporary_header -t ${PX4_BINARY_DIR}/topics_temporary_header
@@ -428,6 +429,7 @@ function(px4_generate_messages)
--sources --sources
${QUIET} ${QUIET}
-f ${MSG_FILES} -f ${MSG_FILES}
-i ${INCLUDES}
-o ${msg_source_out_path} -o ${msg_source_out_path}
-e msg/templates/uorb -e msg/templates/uorb
-t ${PX4_BINARY_DIR}/topics_temporary_sources -t ${PX4_BINARY_DIR}/topics_temporary_sources
@@ -458,6 +460,7 @@ function(px4_generate_messages)
--headers --headers
${QUIET} ${QUIET}
-f ${MSG_FILES} -f ${MSG_FILES}
-i ${INCLUDES}
-o ${msg_multi_out_path} -o ${msg_multi_out_path}
-e msg/templates/px4/uorb -e msg/templates/px4/uorb
-t ${PX4_BINARY_DIR}/multi_topics_temporary/${OS} -t ${PX4_BINARY_DIR}/multi_topics_temporary/${OS}

5
msg/CMakeLists.txt
View File

@@ -129,10 +129,15 @@ set(msg_file_names
# Get absolute paths # Get absolute paths
set(msg_files) set(msg_files)
set(msg_include_paths)
foreach(msg_file ${msg_file_names}) foreach(msg_file ${msg_file_names})
list(APPEND msg_files ${CMAKE_CURRENT_SOURCE_DIR}/${msg_file}) list(APPEND msg_files ${CMAKE_CURRENT_SOURCE_DIR}/${msg_file})
endforeach() endforeach()
list(APPEND msg_include_paths ${CMAKE_CURRENT_SOURCE_DIR})
set(msg_include_paths ${msg_include_paths} PARENT_SCOPE)
set(msg_files ${msg_files} PARENT_SCOPE) set(msg_files ${msg_files} PARENT_SCOPE)
# vim: set noet ft=cmake fenc=utf-8 ff=unix : # vim: set noet ft=cmake fenc=utf-8 ff=unix :