Index: lib/MsgUtils/.gitignore =================================================================== diff -u -rcfc0df719cb5033078d0cac45ce0f6243810f2e7 -rfde01bd195d14da4c7a68f4e137c8ffb60094c73 --- lib/MsgUtils/.gitignore (.../.gitignore) (revision cfc0df719cb5033078d0cac45ce0f6243810f2e7) +++ lib/MsgUtils/.gitignore (.../.gitignore) (revision fde01bd195d14da4c7a68f4e137c8ffb60094c73) @@ -1,3 +1,4 @@ +*.egg-info/ cmake/MsgUtilsConfig.cmake cmake/MsgUtilsConfigVersion.cmake lib/ Index: lib/MsgUtils/CMakeLists.txt =================================================================== diff -u -rf5f12f4bdcca0be94e5e306f0a7af1fe0d8c874a -rfde01bd195d14da4c7a68f4e137c8ffb60094c73 --- lib/MsgUtils/CMakeLists.txt (.../CMakeLists.txt) (revision f5f12f4bdcca0be94e5e306f0a7af1fe0d8c874a) +++ lib/MsgUtils/CMakeLists.txt (.../CMakeLists.txt) (revision fde01bd195d14da4c7a68f4e137c8ffb60094c73) @@ -12,14 +12,24 @@ endif() find_package(Protobuf COMPONENTS REQUIRED) +find_package(Python3 REQUIRED COMPONENTS Interpreter) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core) find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Network SerialBus) set(MSGUTILS_SCRIPTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/scripts) include(cmake/MsgUtils.cmake) -# set(DENALI_MSG_CSV ${CMAKE_CURRENT_SOURCE_DIR}/../../data/FW_Messages_List.csv) +# install the Python package in editable mode so that the generated protobuf files can be imported by the Python scripts +# without needing to be copied to the Python package directory +execute_process( + COMMAND ${Python3_EXECUTABLE} -m pip install -e ${MSGUTILS_SCRIPTS_DIR} --quiet + RESULT_VARIABLE _pip_result +) +if(NOT _pip_result EQUAL 0) + message(FATAL_ERROR "Failed to install msgutils Python package (pip returned ${_pip_result})") +endif() +# set(DENALI_MSG_CSV ${CMAKE_CURRENT_SOURCE_DIR}/../../data/FW_Messages_List.csv) set(LEAHI_MSG_CSV ${CMAKE_CURRENT_SOURCE_DIR}/../../data/Leahi_Staging_FW_Messages_List.csv) set(LEAHI_MSG_CONF ${CMAKE_CURRENT_SOURCE_DIR}/../../data/Unhandled.conf) Index: lib/MsgUtils/cmake/MsgUtils.cmake =================================================================== diff -u -rf5f12f4bdcca0be94e5e306f0a7af1fe0d8c874a -rfde01bd195d14da4c7a68f4e137c8ffb60094c73 --- lib/MsgUtils/cmake/MsgUtils.cmake (.../MsgUtils.cmake) (revision f5f12f4bdcca0be94e5e306f0a7af1fe0d8c874a) +++ lib/MsgUtils/cmake/MsgUtils.cmake (.../MsgUtils.cmake) (revision fde01bd195d14da4c7a68f4e137c8ffb60094c73) @@ -27,11 +27,11 @@ add_custom_command( DEPENDS - ${MSGUTILS_SCRIPTS_DIR}/MsgData.py - ${MSGUTILS_SCRIPTS_DIR}/MsgCpp.py + ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgData.py + ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgCpp.py ${MSGUTILS_SCRIPTS_DIR}/GenerateMsgDefsCpp.py - ${MSGUTILS_SCRIPTS_DIR}/templates/MsgDefs_h.jinja - ${MSGUTILS_SCRIPTS_DIR}/templates/MsgDefs_cpp.jinja + ${MSGUTILS_SCRIPTS_DIR}/msgutils/templates/MsgDefs_h.jinja + ${MSGUTILS_SCRIPTS_DIR}/msgutils/templates/MsgDefs_cpp.jinja ${${_input_confs}} OUTPUT ${_header_path} @@ -71,10 +71,10 @@ add_custom_command( DEPENDS - ${MSGUTILS_SCRIPTS_DIR}/MsgData.py - ${MSGUTILS_SCRIPTS_DIR}/MsgProtobuf.py + ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgData.py + ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgProtobuf.py ${MSGUTILS_SCRIPTS_DIR}/GenerateProtobuf.py - ${MSGUTILS_SCRIPTS_DIR}/templates/MsgDefs_proto.jinja + ${MSGUTILS_SCRIPTS_DIR}/msgutils/templates/MsgDefs_proto.jinja ${${_input_confs}} OUTPUT ${_protobuf_abs_filename} @@ -118,11 +118,11 @@ add_custom_command( DEPENDS - ${MSGUTILS_SCRIPTS_DIR}/MsgData.py - ${MSGUTILS_SCRIPTS_DIR}/MsgCpp.py + ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgData.py + ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgCpp.py ${MSGUTILS_SCRIPTS_DIR}/GenerateMsgDefsCpp.py - ${MSGUTILS_SCRIPTS_DIR}/templates/MsgDefs_h.jinja - ${MSGUTILS_SCRIPTS_DIR}/templates/MsgDefs_cpp.jinja + ${MSGUTILS_SCRIPTS_DIR}/msgutils/templates/MsgDefs_h.jinja + ${MSGUTILS_SCRIPTS_DIR}/msgutils/templates/MsgDefs_cpp.jinja ${${_input_csvs}} OUTPUT ${_header_path} @@ -162,10 +162,10 @@ add_custom_command( DEPENDS - ${MSGUTILS_SCRIPTS_DIR}/MsgData.py - ${MSGUTILS_SCRIPTS_DIR}/MsgProtobuf.py + ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgData.py + ${MSGUTILS_SCRIPTS_DIR}/msgutils/MsgProtobuf.py ${MSGUTILS_SCRIPTS_DIR}/GenerateProtobuf.py - ${MSGUTILS_SCRIPTS_DIR}/templates/MsgDefs_proto.jinja + ${MSGUTILS_SCRIPTS_DIR}/msgutils/templates/MsgDefs_proto.jinja ${${_input_csvs}} OUTPUT ${_protobuf_abs_filename} Index: lib/MsgUtils/scripts/GenerateMsgDefsCpp.py =================================================================== diff -u -rf5f12f4bdcca0be94e5e306f0a7af1fe0d8c874a -rfde01bd195d14da4c7a68f4e137c8ffb60094c73 --- lib/MsgUtils/scripts/GenerateMsgDefsCpp.py (.../GenerateMsgDefsCpp.py) (revision f5f12f4bdcca0be94e5e306f0a7af1fe0d8c874a) +++ lib/MsgUtils/scripts/GenerateMsgDefsCpp.py (.../GenerateMsgDefsCpp.py) (revision fde01bd195d14da4c7a68f4e137c8ffb60094c73) @@ -1,10 +1,10 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import argparse import os import sys -from MsgCpp import MsgCpp +from msgutils import MsgCpp def main(): parser = argparse.ArgumentParser( Index: lib/MsgUtils/scripts/GenerateProtobuf.py =================================================================== diff -u -rf5f12f4bdcca0be94e5e306f0a7af1fe0d8c874a -rfde01bd195d14da4c7a68f4e137c8ffb60094c73 --- lib/MsgUtils/scripts/GenerateProtobuf.py (.../GenerateProtobuf.py) (revision f5f12f4bdcca0be94e5e306f0a7af1fe0d8c874a) +++ lib/MsgUtils/scripts/GenerateProtobuf.py (.../GenerateProtobuf.py) (revision fde01bd195d14da4c7a68f4e137c8ffb60094c73) @@ -1,10 +1,10 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- import argparse import os import sys -from MsgProtobuf import MsgProtobuf +from msgutils import MsgProtobuf def main(): parser = argparse.ArgumentParser( Fisheye: Tag fde01bd195d14da4c7a68f4e137c8ffb60094c73 refers to a dead (removed) revision in file `lib/MsgUtils/scripts/MsgCpp.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fde01bd195d14da4c7a68f4e137c8ffb60094c73 refers to a dead (removed) revision in file `lib/MsgUtils/scripts/MsgData.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fde01bd195d14da4c7a68f4e137c8ffb60094c73 refers to a dead (removed) revision in file `lib/MsgUtils/scripts/MsgProtobuf.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag bde1243eb2ff6af2868f6c6ad0cb4f5760aaf68b refers to a dead (removed) revision in file `lib/MsgUtils/scripts/msgutils/MsgCpp.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag bde1243eb2ff6af2868f6c6ad0cb4f5760aaf68b refers to a dead (removed) revision in file `lib/MsgUtils/scripts/msgutils/MsgData.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag bde1243eb2ff6af2868f6c6ad0cb4f5760aaf68b refers to a dead (removed) revision in file `lib/MsgUtils/scripts/msgutils/MsgProtobuf.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag bde1243eb2ff6af2868f6c6ad0cb4f5760aaf68b refers to a dead (removed) revision in file `lib/MsgUtils/scripts/msgutils/__init__.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag bde1243eb2ff6af2868f6c6ad0cb4f5760aaf68b refers to a dead (removed) revision in file `lib/MsgUtils/scripts/msgutils/templates/MsgDefs_cpp.jinja'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag bde1243eb2ff6af2868f6c6ad0cb4f5760aaf68b refers to a dead (removed) revision in file `lib/MsgUtils/scripts/msgutils/templates/MsgDefs_h.jinja'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag bde1243eb2ff6af2868f6c6ad0cb4f5760aaf68b refers to a dead (removed) revision in file `lib/MsgUtils/scripts/msgutils/templates/MsgDefs_proto.jinja'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag bde1243eb2ff6af2868f6c6ad0cb4f5760aaf68b refers to a dead (removed) revision in file `lib/MsgUtils/scripts/pyproject.toml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2c00c6e743844c9a71fa03ce5a5c436ef3836484 refers to a dead (removed) revision in file `lib/MsgUtils/scripts/setup.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fde01bd195d14da4c7a68f4e137c8ffb60094c73 refers to a dead (removed) revision in file `lib/MsgUtils/scripts/templates/MsgDefs_cpp.jinja'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fde01bd195d14da4c7a68f4e137c8ffb60094c73 refers to a dead (removed) revision in file `lib/MsgUtils/scripts/templates/MsgDefs_h.jinja'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag fde01bd195d14da4c7a68f4e137c8ffb60094c73 refers to a dead (removed) revision in file `lib/MsgUtils/scripts/templates/MsgDefs_proto.jinja'. Fisheye: No comparison available. Pass `N' to diff?