diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6e83e2b52fdbe..fbc2c714e9c40 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -4,6 +4,7 @@ common/autoware_auto_common/** opensource@apex.ai satoshi.ota@tier4.jp shumpei.w common/autoware_component_interface_specs/** isamu.takagi@tier4.jp yukihiro.saito@tier4.jp common/autoware_component_interface_tools/** isamu.takagi@tier4.jp common/autoware_geography_utils/** koji.minoda@tier4.jp +common/autoware_glog_component/** takamasa.horibe@tier4.jp common/autoware_goal_distance_calculator/** taiki.tanaka@tier4.jp common/autoware_grid_map_utils/** maxime.clement@tier4.jp common/autoware_interpolation/** fumiya.watanabe@tier4.jp takayuki.murooka@tier4.jp @@ -29,7 +30,6 @@ common/bag_time_manager_rviz_plugin/** taiki.tanaka@tier4.jp common/component_interface_utils/** isamu.takagi@tier4.jp yukihiro.saito@tier4.jp common/fake_test_node/** opensource@apex.ai satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp common/global_parameter_loader/** ryohsuke.mitsudome@tier4.jp -common/glog_component/** takamasa.horibe@tier4.jp common/tier4_adapi_rviz_plugin/** hiroki.ota@tier4.jp isamu.takagi@tier4.jp kosuke.takeuchi@tier4.jp common/tier4_api_utils/** isamu.takagi@tier4.jp common/tier4_camera_view_rviz_plugin/** makoto.ybauta@tier4.jp uken.ryu@tier4.jp diff --git a/common/.pages b/common/.pages index bba56f6dab486..03436f52e0dcb 100644 --- a/common/.pages +++ b/common/.pages @@ -11,7 +11,7 @@ nav: - 'autoware_point_types': common/autoware_point_types - 'Geography Utils': common/geography_utils - 'Global Parameter Loader': common/global_parameter_loader/Readme - - 'Glog Component': common/glog_component + - 'Glog Component': common/autoware_glog_component - 'interpolation': common/interpolation - 'Kalman Filter': common/kalman_filter - 'Motion Utils': common/autoware_motion_utils diff --git a/common/glog_component/CHANGELOG.rst b/common/autoware_glog_component/CHANGELOG.rst similarity index 100% rename from common/glog_component/CHANGELOG.rst rename to common/autoware_glog_component/CHANGELOG.rst diff --git a/common/autoware_glog_component/CMakeLists.txt b/common/autoware_glog_component/CMakeLists.txt new file mode 100644 index 0000000000000..9a5a9733225d6 --- /dev/null +++ b/common/autoware_glog_component/CMakeLists.txt @@ -0,0 +1,18 @@ +cmake_minimum_required(VERSION 3.14) +project(autoware_glog_component) + +find_package(autoware_cmake REQUIRED) +autoware_package() + + +ament_auto_add_library(${PROJECT_NAME} SHARED + src/glog_component.cpp +) +target_link_libraries(${PROJECT_NAME} glog::glog) + +rclcpp_components_register_node(${PROJECT_NAME} + PLUGIN "GlogComponent" + EXECUTABLE ${PROJECT_NAME}_node +) + +ament_auto_package() diff --git a/common/glog_component/README.md b/common/autoware_glog_component/README.md similarity index 100% rename from common/glog_component/README.md rename to common/autoware_glog_component/README.md diff --git a/common/glog_component/include/glog_component/glog_component.hpp b/common/autoware_glog_component/include/autoware/glog_component/glog_component.hpp similarity index 91% rename from common/glog_component/include/glog_component/glog_component.hpp rename to common/autoware_glog_component/include/autoware/glog_component/glog_component.hpp index d940363d75ac4..b8665dcd36e34 100644 --- a/common/glog_component/include/glog_component/glog_component.hpp +++ b/common/autoware_glog_component/include/autoware/glog_component/glog_component.hpp @@ -19,10 +19,15 @@ #include +namespace autoware::glog_component +{ + class GlogComponent : public rclcpp::Node { public: explicit GlogComponent(const rclcpp::NodeOptions & node_options); }; +} // namespace autoware::glog_component + #endif // GLOG_COMPONENT__GLOG_COMPONENT_HPP_ diff --git a/common/glog_component/package.xml b/common/autoware_glog_component/package.xml similarity index 87% rename from common/glog_component/package.xml rename to common/autoware_glog_component/package.xml index a9e7cdf54fd5a..f9e6a1aa26723 100644 --- a/common/glog_component/package.xml +++ b/common/autoware_glog_component/package.xml @@ -1,9 +1,9 @@ - glog_component + autoware_glog_component 0.38.0 - The glog_component package + The autoware_glog_component package Takamasa Horibe Apache License 2.0 diff --git a/common/glog_component/src/glog_component.cpp b/common/autoware_glog_component/src/glog_component.cpp similarity index 81% rename from common/glog_component/src/glog_component.cpp rename to common/autoware_glog_component/src/glog_component.cpp index 7fd9c923d23c9..cddfd206668be 100644 --- a/common/glog_component/src/glog_component.cpp +++ b/common/autoware_glog_component/src/glog_component.cpp @@ -12,7 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "glog_component/glog_component.hpp" +#include "autoware/glog_component/glog_component.hpp" + +namespace autoware::glog_component +{ GlogComponent::GlogComponent(const rclcpp::NodeOptions & node_options) : Node("glog_component", node_options) @@ -23,5 +26,7 @@ GlogComponent::GlogComponent(const rclcpp::NodeOptions & node_options) } } +} // namespace autoware::glog_component + #include -RCLCPP_COMPONENTS_REGISTER_NODE(GlogComponent) +RCLCPP_COMPONENTS_REGISTER_NODE(autoware::glog_component::GlogComponent) diff --git a/common/glog_component/CMakeLists.txt b/common/glog_component/CMakeLists.txt deleted file mode 100644 index a233914cc1524..0000000000000 --- a/common/glog_component/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -cmake_minimum_required(VERSION 3.14) -project(glog_component) - -find_package(autoware_cmake REQUIRED) -autoware_package() - - -ament_auto_add_library(glog_component SHARED - src/glog_component.cpp -) -target_link_libraries(glog_component glog::glog) - -rclcpp_components_register_node(glog_component - PLUGIN "GlogComponent" - EXECUTABLE glog_component_node -) - -ament_auto_package() diff --git a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml index d88601497096d..57b70ee725812 100644 --- a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml +++ b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/behavior_planning/behavior_planning.launch.xml @@ -254,7 +254,7 @@ - + diff --git a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml index b303134ab80c3..fb7e11419fdc9 100644 --- a/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml +++ b/launch/tier4_planning_launch/launch/scenario_planning/lane_driving/motion_planning/motion_planning.launch.xml @@ -27,7 +27,7 @@ - + diff --git a/launch/tier4_planning_launch/launch/scenario_planning/parking.launch.xml b/launch/tier4_planning_launch/launch/scenario_planning/parking.launch.xml index e0fdcb1e30408..89961821fa761 100644 --- a/launch/tier4_planning_launch/launch/scenario_planning/parking.launch.xml +++ b/launch/tier4_planning_launch/launch/scenario_planning/parking.launch.xml @@ -32,7 +32,7 @@ - + diff --git a/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml b/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml index 9082ebab013ed..a89b47da13049 100644 --- a/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml +++ b/launch/tier4_planning_launch/launch/scenario_planning/scenario_planning.launch.xml @@ -44,7 +44,7 @@ - + diff --git a/launch/tier4_planning_launch/package.xml b/launch/tier4_planning_launch/package.xml index f0fe45a46d92a..7f181d6d707b6 100644 --- a/launch/tier4_planning_launch/package.xml +++ b/launch/tier4_planning_launch/package.xml @@ -63,6 +63,7 @@ autoware_external_cmd_selector autoware_external_velocity_limit_selector autoware_freespace_planner + autoware_glog_component autoware_mission_planner autoware_obstacle_cruise_planner autoware_obstacle_stop_planner @@ -74,7 +75,6 @@ autoware_scenario_selector autoware_surround_obstacle_checker autoware_velocity_smoother - glog_component ament_lint_auto autoware_lint_common