From 5b130ff9a02248812e29b17e197894ae8a263a1f Mon Sep 17 00:00:00 2001 From: Jan Hernas Date: Thu, 7 Nov 2024 15:59:52 +0100 Subject: [PATCH 1/2] Add dummy .sh files for .dsv hooks --- leo_gz_plugins/CMakeLists.txt | 1 + leo_gz_plugins/hooks/gz_sim_system_plugin_path.sh | 0 leo_gz_worlds/CMakeLists.txt | 3 ++- .../{gz_sim_resource_path.dsv.in => gz_sim_resource_path.dsv} | 0 leo_gz_worlds/hooks/gz_sim_resource_path.sh | 0 5 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 leo_gz_plugins/hooks/gz_sim_system_plugin_path.sh rename leo_gz_worlds/hooks/{gz_sim_resource_path.dsv.in => gz_sim_resource_path.dsv} (100%) create mode 100644 leo_gz_worlds/hooks/gz_sim_resource_path.sh diff --git a/leo_gz_plugins/CMakeLists.txt b/leo_gz_plugins/CMakeLists.txt index dc3225b..535120b 100644 --- a/leo_gz_plugins/CMakeLists.txt +++ b/leo_gz_plugins/CMakeLists.txt @@ -33,6 +33,7 @@ if(BUILD_TESTING) ament_lint_auto_find_test_dependencies() endif() +ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/hooks/gz_sim_system_plugin_path.sh") ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/hooks/gz_sim_system_plugin_path.dsv") ament_package() diff --git a/leo_gz_plugins/hooks/gz_sim_system_plugin_path.sh b/leo_gz_plugins/hooks/gz_sim_system_plugin_path.sh new file mode 100644 index 0000000..e69de29 diff --git a/leo_gz_worlds/CMakeLists.txt b/leo_gz_worlds/CMakeLists.txt index a447add..5cac686 100644 --- a/leo_gz_worlds/CMakeLists.txt +++ b/leo_gz_worlds/CMakeLists.txt @@ -19,6 +19,7 @@ if(BUILD_TESTING) ament_lint_auto_find_test_dependencies() endif() -ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/hooks/gz_sim_resource_path.dsv.in") +ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/hooks/gz_sim_resource_path.sh") +ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/hooks/gz_sim_resource_path.dsv") ament_package() diff --git a/leo_gz_worlds/hooks/gz_sim_resource_path.dsv.in b/leo_gz_worlds/hooks/gz_sim_resource_path.dsv similarity index 100% rename from leo_gz_worlds/hooks/gz_sim_resource_path.dsv.in rename to leo_gz_worlds/hooks/gz_sim_resource_path.dsv diff --git a/leo_gz_worlds/hooks/gz_sim_resource_path.sh b/leo_gz_worlds/hooks/gz_sim_resource_path.sh new file mode 100644 index 0000000..e69de29 From 14b512da2a8afd5b66394a9578dfe78a0b856084 Mon Sep 17 00:00:00 2001 From: Jan Hernas Date: Fri, 8 Nov 2024 11:53:19 +0100 Subject: [PATCH 2/2] Add back .in extension to worlds hook --- leo_gz_worlds/CMakeLists.txt | 2 +- .../{gz_sim_resource_path.dsv => gz_sim_resource_path.dsv.in} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename leo_gz_worlds/hooks/{gz_sim_resource_path.dsv => gz_sim_resource_path.dsv.in} (100%) diff --git a/leo_gz_worlds/CMakeLists.txt b/leo_gz_worlds/CMakeLists.txt index 5cac686..145afd0 100644 --- a/leo_gz_worlds/CMakeLists.txt +++ b/leo_gz_worlds/CMakeLists.txt @@ -20,6 +20,6 @@ if(BUILD_TESTING) endif() ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/hooks/gz_sim_resource_path.sh") -ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/hooks/gz_sim_resource_path.dsv") +ament_environment_hooks("${CMAKE_CURRENT_SOURCE_DIR}/hooks/gz_sim_resource_path.dsv.in") ament_package() diff --git a/leo_gz_worlds/hooks/gz_sim_resource_path.dsv b/leo_gz_worlds/hooks/gz_sim_resource_path.dsv.in similarity index 100% rename from leo_gz_worlds/hooks/gz_sim_resource_path.dsv rename to leo_gz_worlds/hooks/gz_sim_resource_path.dsv.in