From 5bc82f41cfb9946f4a4b50ed24fb10e57133b96d Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <silvio@traversaro.it>
Date: Tue, 14 Feb 2023 14:15:16 +0100
Subject: [PATCH] Move files that are mantained manually into iCub_manual

---
 CMakeLists.txt                                        | 11 +++--------
 {iCub => iCub_manual}/package.xml                     |  0
 {ros => iCub_manual/ros}/README.md                    |  0
 {ros => iCub_manual/ros}/launch/iCubRviz.launch       |  0
 {ros => iCub_manual/ros}/rviz/iCubRviz.rviz           |  0
 {ros => iCub_manual/ros}/transform-server.xml         |  0
 {ros2 => iCub_manual/ros2}/README.md                  |  0
 .../ros2}/launch/robot_state_publisher.launch.py      |  0
 8 files changed, 3 insertions(+), 8 deletions(-)
 rename {iCub => iCub_manual}/package.xml (100%)
 rename {ros => iCub_manual/ros}/README.md (100%)
 rename {ros => iCub_manual/ros}/launch/iCubRviz.launch (100%)
 rename {ros => iCub_manual/ros}/rviz/iCubRviz.rviz (100%)
 rename {ros => iCub_manual/ros}/transform-server.xml (100%)
 rename {ros2 => iCub_manual/ros2}/README.md (100%)
 rename {ros2 => iCub_manual/ros2}/launch/robot_state_publisher.launch.py (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a2f81b2..d7f9c7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,6 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
 endif()
 
 macro(SUBDIRLIST result curdir)
-  file(GLOB children RELATIVE ${curdir} ${curdir}/*)
   set(dirlist "")
   foreach(child ${children})
     if(IS_DIRECTORY ${curdir}/${child})
@@ -57,15 +56,11 @@ endmacro()
 file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/iCub DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 # Copy the iCub_manual folder in the build tree
-SUBDIRLIST(subdirs ${CMAKE_CURRENT_SOURCE_DIR}/iCub_manual)
-foreach(subdir ${subdirs})
-  file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/iCub_manual/${subdir}/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/iCub/${subdir})
+file(GLOB file_and_directories_mantained_manually RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/iCub_manual ${CMAKE_CURRENT_SOURCE_DIR}/iCub_manual/*)
+foreach(file_and_directories_mantained_manually ${file_and_directories_mantained_manually})
+  file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/iCub_manual/${file_and_directories_mantained_manually}/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/iCub/${file_and_directories_mantained_manually})
 endforeach()
 
-# Copy the ros and ros2 folder
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ros DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/iCub)
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ros2 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/iCub)
-
 # Add the model.config just for a limited number of models that are known
 # to work in Gazebo, unless the ICUB_MODELS_INSTALL_ALL_GAZEBO_MODELS option
 # is enabled
diff --git a/iCub/package.xml b/iCub_manual/package.xml
similarity index 100%
rename from iCub/package.xml
rename to iCub_manual/package.xml
diff --git a/ros/README.md b/iCub_manual/ros/README.md
similarity index 100%
rename from ros/README.md
rename to iCub_manual/ros/README.md
diff --git a/ros/launch/iCubRviz.launch b/iCub_manual/ros/launch/iCubRviz.launch
similarity index 100%
rename from ros/launch/iCubRviz.launch
rename to iCub_manual/ros/launch/iCubRviz.launch
diff --git a/ros/rviz/iCubRviz.rviz b/iCub_manual/ros/rviz/iCubRviz.rviz
similarity index 100%
rename from ros/rviz/iCubRviz.rviz
rename to iCub_manual/ros/rviz/iCubRviz.rviz
diff --git a/ros/transform-server.xml b/iCub_manual/ros/transform-server.xml
similarity index 100%
rename from ros/transform-server.xml
rename to iCub_manual/ros/transform-server.xml
diff --git a/ros2/README.md b/iCub_manual/ros2/README.md
similarity index 100%
rename from ros2/README.md
rename to iCub_manual/ros2/README.md
diff --git a/ros2/launch/robot_state_publisher.launch.py b/iCub_manual/ros2/launch/robot_state_publisher.launch.py
similarity index 100%
rename from ros2/launch/robot_state_publisher.launch.py
rename to iCub_manual/ros2/launch/robot_state_publisher.launch.py