From 0a945cc6bf2fac5ada4b67fd77f63b9a86516b03 Mon Sep 17 00:00:00 2001 From: sfalexrog Date: Wed, 11 Sep 2019 18:10:07 +0300 Subject: [PATCH] builder: Remove unused builder code --- builder/image-ros.sh | 54 -------------------------------------------- 1 file changed, 54 deletions(-) diff --git a/builder/image-ros.sh b/builder/image-ros.sh index f396066f..033a51b3 100755 --- a/builder/image-ros.sh +++ b/builder/image-ros.sh @@ -86,60 +86,6 @@ resolve_rosdep() { my_travis_retry rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --os=${OS_DISTRO}:${OS_VERSION} } -INSTALL_ROS_PACK_SOURCES=${INSTALL_ROS_PACK_SOURCES:='false'} -if [ "${INSTALL_ROS_PACK_SOURCES}" = "true" ]; then - DISCOVER_ROS_PACK=${DISCOVER_ROS_PACK:='true'} - if [ "${DISCOVER_ROS_PACK}" = "false" ]; then - echo_stamp "Preparing ros_comm packages to kinetic-ros_comm-wet.rosinstall" \ - && mkdir -p /home/pi/ros_catkin_ws && cd /home/pi/ros_catkin_ws \ - && rosinstall_generator ros_comm --rosdistro kinetic --deps --wet-only --tar > kinetic-ros_comm-wet.rosinstall \ - && wstool init -j${NUMBER_THREADS} src kinetic-ros_comm-wet.rosinstall \ - && echo_stamp "All roscomm sources was installed!" "SUCCESS" \ - || (echo_stamp "Some roscomm sources installation was failed!" "ERROR"; exit 1) - - echo_stamp "Preparing other ROS-packages to kinetic-custom_ros.rosinstall" \ - && cd /home/pi/ros_catkin_ws \ - && rosinstall_generator \ - actionlib actionlib_msgs angles async_web_server_cpp bond bond_core bondcpp bondpy camera_calibration_parsers camera_info_manager catkin class_loader cmake_modules cpp_common cv_bridge cv_camera diagnostic_msgs diagnostic_updater dynamic_reconfigure eigen_conversions gencpp geneus genlisp genmsg gennodejs genpy geographic_msgs geometry_msgs geometry2 image_transport compressed_image_transport libmavconn mavlink mavros_msgs message_filters message_generation message_runtime mk nav_msgs nodelet orocos_kdl pluginlib python_orocos_kdl ros ros_comm rosapi rosauth rosbag rosbag_migration_rule rosbag_storage rosbash rosboost_cfg rosbridge_library rosbridge_server rosbridge_suite rosbuild rosclean rosconsole rosconsole_bridge roscpp roscpp_serialization roscpp_traits roscreate rosgraph rosgraph_msgs roslang roslaunch roslib roslint roslisp roslz4 rosmake rosmaster rosmsg rosnode rosout rospack rosparam rospy rospy_tutorials rosserial rosserial_client rosserial_msgs rosserial_python rosservice rostest rostime rostopic rosunit roswtf sensor_msgs smclib std_msgs std_srvs stereo_msgs tf tf2 tf2_bullet tf2_eigen tf2_geometry_msgs tf2_kdl tf2_msgs tf2_py tf2_ros tf2_sensor_msgs tf2_tools topic_tools trajectory_msgs urdf urdf_parser_plugin usb_cam uuid_msgs visualization_msgs web_video_server xmlrpcpp mavros opencv3 mavros_extras interactive_markers tf2_web_republisher interactive_marker_proxy vl53l1x \ - --rosdistro kinetic --deps --wet-only --tar > kinetic-custom_ros.rosinstall \ - && wstool merge -j${NUMBER_THREADS} -t src kinetic-custom_ros.rosinstall \ - && wstool update -j${NUMBER_THREADS} -t src \ - && echo_stamp "All custom sources was installed!" "SUCCESS" \ - || (echo_stamp "Some custom sources installation was failed!" "ERROR"; exit 1) - else - echo_stamp "Creating ros_catkin_ws & getting all sources using wstool" \ - && mkdir -p /home/pi/ros_catkin_ws && cd /home/pi/ros_catkin_ws \ - && wstool init -j${NUMBER_THREADS} src kinetic-ros-clever.rosinstall \ - > /dev/null \ - && echo_stamp "All CLEVER sources was installed!" "SUCCESS" \ - || (echo_stamp "Some CLEVER sources installation was failed!" "ERROR"; exit 1) - fi - - resolve_rosdep '/home/pi/ros_catkin_ws' - - # TODO: Add refactor to origin repo - #echo_stamp "Refactoring usb_cam in SRC" - #sed -i '/#define __STDC_CONSTANT_MACROS/a\#define PIX_FMT_RGB24 AV_PIX_FMT_RGB24\n#define PIX_FMT_YUV422P AV_PIX_FMT_YUV422P' /home/pi/ros_catkin_ws/src/usb_cam/src/usb_cam.cpp - - echo_stamp "Building ros_catkin_ws packages" - cd /home/pi/ros_catkin_ws && ./src/catkin/bin/catkin_make_isolated --install -j${NUMBER_THREADS} -DCMAKE_BUILD_TYPE=Release --install-space /opt/ros/kinetic - - #echo_stamp "#11 Building light packages on 2 threads" - #cd /home/pi/ros_catkin_ws && ./src/catkin/bin/catkin_make_isolated --install -DCMAKE_BUILD_TYPE=Release -j2 --install-space /opt/ros/kinetic --pkg actionlib actionlib_msgs angles async_web_server_cpp bond bond_core bondcpp bondpy camera_calibration_parsers camera_info_manager catkin class_loader cmake_modules cpp_common diagnostic_msgs diagnostic_updater dynamic_reconfigure eigen_conversions gencpp geneus genlisp genmsg gennodejs genpy geographic_msgs geometry_msgs geometry2 image_transport libmavconn mavlink mavros_msgs message_filters message_generation message_runtime mk nav_msgs nodelet orocos_kdl pluginlib python_orocos_kdl ros ros_comm rosapi rosauth rosbag rosbag_migration_rule rosbag_storage rosbash rosboost_cfg rosbridge_library rosbridge_server rosbridge_suite rosbuild rosclean rosconsole rosconsole_bridge roscpp roscpp_serialization roscpp_traits roscreate rosgraph rosgraph_msgs roslang roslaunch roslib roslint roslisp roslz4 rosmake rosmaster rosmsg rosnode rosout rospack rosparam rospy rospy_tutorials rosserial rosserial_client rosserial_msgs rosserial_python rosservice rostest rostime rostopic rosunit roswtf sensor_msgs smclib std_msgs std_srvs stereo_msgs tf tf2 tf2_bullet tf2_eigen tf2_geometry_msgs tf2_kdl tf2_msgs tf2_py tf2_ros tf2_sensor_msgs tf2_tools topic_tools trajectory_msgs urdf urdf_parser_plugin usb_cam uuid_msgs visualization_msgs xmlrpcpp - - #echo_stamp "#12 Building heavy packages" - # This command uses less threads to avoid Raspberry Pi freeze - #cd /home/pi/ros_catkin_ws && ./src/catkin/bin/catkin_make_isolated --install -DCMAKE_BUILD_TYPE=Release -j1 --install-space /opt/ros/kinetic --pkg mavros opencv3 cv_bridge cv_camera mavros_extras web_video_server - - # Install builded packages - # WARNING: A major bug was found when using --pkg option (catkin_make_isolated doesn't install environment files) - # TODO: Can we increase threads number with HDD swap? - - echo_stamp "Remove build_isolated & devel_isolated from ros_catkin_ws" - rm -rf /home/pi/ros_catkin_ws/build_isolated /home/pi/ros_catkin_ws/devel_isolated - chown -Rf pi:pi /home/pi/ros_catkin_ws -fi - export ROS_IP='127.0.0.1' # needed for running tests echo_stamp "Reconfiguring Clever repository for simplier unshallowing"