Revert all changes except addition of env QT_QPA_PLATFORMTHEME in the…

… launch file, all changes will be moved to ansible playbook/roles This reverts commit 037224b. Signed-off-by: KhalilSelyan <[email protected]>
autowarefoundation · Sep 12, 2024 · c11a5db · c11a5db
1 parent d3a6889
commit c11a5db
Show file tree

Hide file tree

Showing 116 changed files with 1 addition and 22,346 deletions.
diff --git a/autoware_launch/CMakeLists.txt b/autoware_launch/CMakeLists.txt
@@ -15,26 +15,3 @@ ament_auto_package(
   launch
   rviz
 )
-
-# Copy the script to the build directory and ensure it is executable
-add_custom_target(copy_qt5ct_setup ALL
-  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/rviz/qt5ctsetup.sh ${CMAKE_CURRENT_BINARY_DIR}/rviz/qt5ctsetup.sh
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/rviz
-  COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/rviz/qt5ctsetup.sh
-)
-
-# Create a dummy target
-add_custom_target(dummy_target ALL
-  COMMAND ${CMAKE_COMMAND} -E echo "Running autoware build dummy target"
-)
-
-# Custom target to run the script after build
-add_custom_target(post_build ALL
-  COMMAND ${CMAKE_COMMAND} -E echo "Running post-build script"
-  COMMAND ${CMAKE_COMMAND} -E env bash ${CMAKE_CURRENT_BINARY_DIR}/rviz/qt5ctsetup.sh
-  DEPENDS dummy_target copy_qt5ct_setup
-)
-
-# Ensure post_build target runs after dummy_target and copy_qt5ct_setup
-add_dependencies(post_build dummy_target)
-add_dependencies(post_build copy_qt5ct_setup)
diff --git a/autoware_launch/launch/autoware.launch.xml b/autoware_launch/launch/autoware.launch.xml
@@ -123,15 +123,7 @@
 
   <!-- Tools -->
   <group>
-    <node
-      pkg="rviz2"
-      exec="rviz2"
-      name="rviz2"
-      output="screen"
-      args="-d $(var rviz_config) -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png"
-      if="$(var rviz)"
-      respawn="$(var rviz_respawn)"
-    >
+    <node pkg="rviz2" exec="rviz2" name="rviz2" output="screen" args="-d $(var rviz_config) -s $(find-pkg-share autoware_launch)/rviz/image/autoware.png" if="$(var rviz)" respawn="$(var rviz_respawn)">
       <env name="QT_QPA_PLATFORMTHEME" value="qt5ct"/>
     </node>
   </group>

diff --git a/autoware_launch/rviz/autoware-rviz-icons/active/base.svg b/autoware_launch/rviz/autoware-rviz-icons/active/base.svg