Merge pull request #1805 from mqcmd196/PR/python3_shebang

jsk-ros-pkg · Nov 12, 2024 · 4775ff4 · 4775ff4
2 parents 2f9aa58 + 3d1536b
commit 4775ff4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/jsk_network_tools/CMakeLists.txt b/jsk_network_tools/CMakeLists.txt
@@ -63,9 +63,15 @@ add_dependencies(silverhammer_highspeed_internal_receiver
 # recursively into ${CATKIN_PACKAGE_SHARE_DESTINATION}.
 # Be careful that 'launch' and 'launch/' are different: the former is directory
 # and the latter is each content.
-install(DIRECTORY scripts/
+
+file(GLOB PYTHON_SCRIPTS scripts/*.py)
+catkin_install_python(
+  PROGRAMS ${PYTHON_SCRIPTS}
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+install(
+  PROGRAMS scripts/expand_udp_receive_buffer.sh
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-  USE_SOURCE_PERMISSIONS
 )
 install(DIRECTORY launch test
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}

diff --git a/jsk_topic_tools/CMakeLists.txt b/jsk_topic_tools/CMakeLists.txt
@@ -243,9 +243,16 @@ install(DIRECTORY include/${PROJECT_NAME}/
   FILES_MATCHING PATTERN "*.h" # Ignore *_version.h.in files
 )
 
-install(DIRECTORY scripts/
+file(GLOB PYTHON_SCRIPTS scripts/*.py)
+list(APPEND PYTHON_SCRIPTS scripts/is_synchronized scripts/rostopic_connection_list)
+catkin_install_python(
+  PROGRAMS ${PYTHON_SCRIPTS}
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+
+install(
+  PROGRAMS scripts/sample_topic_update_caller.sh
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-  USE_SOURCE_PERMISSIONS
 )
 
 install(FILES ${jsk_topic_tools_test_files}