Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[audio_video_recorder][jsk_rosbag_tools] support ros-o #1807

Merged
merged 4 commits into from
Dec 12, 2024
Merged

[audio_video_recorder][jsk_rosbag_tools] support ros-o #1807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb8bfa6
[audio_video_recorder][jsk_rosbag_tools] support ros-o
mqcmd196 Nov 13, 2024
18506fa
remove sed -i s/noetic/Debian/ /jsk_rosbag_tools/CMakeLists.txt
k-okada Dec 9, 2024
bbbdecf
Merge branch 'master' into ros-o
k-okada Dec 9, 2024
88f6c1f
[jsk_rosbag_tools][ros-o] only use STREQUAL to compare ROS_DISTRO in …
mqcmd196 Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ jobs:
set -x
# hack!
apt install -y -q -qq python-is-python3
sed -i s/noetic/Debian/ $GITHUB_WORKSPACE/jsk_rosbag_tools/CMakeLists.txt
# setup workspace
mkdir -p ~/ws_current/src
cd ~/ws_current/src
Expand Down
1 change: 1 addition & 0 deletions audio_video_recorder/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<exec_depend>gstreamer1.0-plugins-base</exec_depend>
<exec_depend>gstreamer1.0-plugins-good</exec_depend>
<exec_depend>gstreamer1.0-plugins-ugly</exec_depend>
<exec_depend>libgstreamer1.0-dev</exec_depend>
<exec_depend>message_filters</exec_depend>
<exec_depend>sensor_msgs</exec_depend>
</package>
10 changes: 5 additions & 5 deletions jsk_rosbag_tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ catkin_package(
CATKIN_DEPENDS
)

if(("$ENV{ROS_DISTRO}" STREQUAL "noetic") OR ("$ENV{ROS_DISTRO}" STREQUAL "Debian") OR ("$ENV{ROS_DISTRO}" STREQUAL "debian"))
if($ENV{ROS_DISTRO} STREQUAL "indigo" OR $ENV{ROS_DISTRO} STREQUAL "kinetic" OR $ENV{ROS_DISTRO} STREQUAL "melodic")
catkin_generate_virtualenv(
INPUT_REQUIREMENTS requirements.in
PYTHON_INTERPRETER python3
INPUT_REQUIREMENTS requirements.in.python2
PYTHON_INTERPRETER python2
)
else()
catkin_generate_virtualenv(
INPUT_REQUIREMENTS requirements.in.python2
PYTHON_INTERPRETER python2
INPUT_REQUIREMENTS requirements.in
PYTHON_INTERPRETER python3
)
endif()

Expand Down
Loading