Skip to content

Commit 63e5ca8

Browse files
k-okadak-okada
committed
Merge branch 'master' of github.com:jsk-ros-pkg/jsk_demos
2 parents 6f716ef + d39f3ac commit 63e5ca8

File tree

9 files changed

+9
-18
lines changed

9 files changed

+9
-18
lines changed

‎.github/workflows/config.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
BEFORE_SCRIPT: "TEST_ROBOT=fetch ./jsk_demos/.travis.before_script.sh"
3838
- ROS_DISTRO: noetic
3939
CONTAINER: jskrobotics/ros-ubuntu:20.04-pcl
40-
continue-on-error: true
40+
EXTRA_DEB : "python3-rospkg python3-rospkg-modules" # drc_task_common need rospkg, but not installed
4141

4242
container: ${{ matrix.CONTAINER }}
4343
steps:
@@ -70,6 +70,7 @@ jobs:
7070

7171
- name: Start X server
7272
run: |
73+
if [[ "${{ matrix.CONTAINER }}" =~ "jskrobotics/ros-ubuntu:14.04" ]]; then exit 0; fi
7374
echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections || echo "failing on ros-ubuntu is OK" # set non interactive tzdata https://stackoverflow.com/questions/8671308/non-interactive-method-for-dpkg-reconfigure-tzdata
7475
sudo apt-get -y -qq install mesa-utils x11-xserver-utils xserver-xorg-video-dummy wget
7576
export DISPLAY=:0
@@ -78,6 +79,7 @@ jobs:
7879
sleep 3 # wait x server up
7980
export QT_X11_NO_MITSHM=1 # http://wiki.ros.org/docker/Tutorials/GUI
8081
xhost +local:root
82+
shell: bash
8183

8284
- name: Run jsk_travis
8385
uses: jsk-ros-pkg/jsk_travis@master

‎interactive_behavior_201409/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ project(interactive_behavior_201409)
77
find_package(catkin REQUIRED COMPONENTS
88
face_detector
99
people_msgs
10-
pr2eus
1110
roseus
1211
)
1312

‎interactive_behavior_201409/package.xml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<buildtool_depend>catkin</buildtool_depend>
1010
<build_depend>face_detector</build_depend>
1111
<build_depend>people_msgs</build_depend>
12-
<build_depend>pr2eus</build_depend>
1312
<build_depend>roseus</build_depend>
1413
<build_depend>face_recognition</build_depend>
1514
<run_depend>face_detector</run_depend>

‎jsk_2013_04_pr2_610/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ find_package(catkin REQUIRED COMPONENTS
66
message_generation
77
jsk_demo_common
88
jsk_perception
9-
pddl_planner
109
roseus_smach
1110
roseus)
1211

@@ -22,7 +21,7 @@ generate_messages(
2221
)
2322

2423
catkin_package(
25-
CATKIN_DEPENDS geometry_msgs message_runtime roseus jsk_demo_common jsk_perception pddl_planner pr2eus roseus_smach
24+
CATKIN_DEPENDS geometry_msgs message_runtime roseus jsk_demo_common jsk_perception roseus_smach
2625
)
2726

2827
###########

‎jsk_2013_04_pr2_610/package.xml

-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
<build_depend>jsk_demo_common</build_depend>
2727
<build_depend>jsk_perception</build_depend>
2828
<build_depend>task_compiler</build_depend>
29-
<build_depend>pddl_planner</build_depend>
30-
<build_depend>pddl_planner_viewer</build_depend>
3129
<build_depend>laser_filters_jsk_patch</build_depend>
3230
<build_depend>imagesift</build_depend>
3331

‎jsk_2015_06_hrp_drc/drc_task_common/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 2.8.3)
22
project(drc_task_common)
33

4-
find_package(catkin REQUIRED COMPONENTS cmake_modules message_generation std_msgs std_srvs geometry_msgs roscpp rospy sensor_msgs visualization_msgs message_filters message_generation jsk_pcl_ros interactive_markers pcl_conversions jsk_topic_tools rviz eigen_conversions dynamic_tf_publisher jsk_interactive_marker jsk_recognition_msgs move_base_msgs rosgraph_msgs topic_tools jsk_topic_tools jsk_ik_server pcl_msgs jsk_footstep_msgs drc_com_common jsk_perception jsk_calibration resized_image_transport smach_msgs pcl_ros nav_msgs tf dynamic_reconfigure roseus)
4+
find_package(catkin REQUIRED COMPONENTS cmake_modules message_generation std_msgs std_srvs geometry_msgs roscpp rospy sensor_msgs visualization_msgs message_filters message_generation jsk_pcl_ros interactive_markers pcl_conversions jsk_topic_tools rviz eigen_conversions dynamic_tf_publisher jsk_interactive_marker jsk_recognition_msgs move_base_msgs rosgraph_msgs topic_tools jsk_topic_tools pcl_msgs jsk_footstep_msgs drc_com_common jsk_perception resized_image_transport smach_msgs pcl_ros nav_msgs tf dynamic_reconfigure roseus)
55

66
catkin_python_setup()
77

@@ -15,9 +15,9 @@ add_service_files(DIRECTORY srv FILES RvizMenuCall.srv RvizMenuSelect.srv EusCom
1515

1616
# Generate msg file from DRCParametersConfig file
1717
set(tmp_pythonpath $ENV{PYTHONPATH})
18-
set(ENV{PYTHONPATH} ${CATKIN_DEVEL_PREFIX}/${PYTHON_INSTALL_DIR}:$ENV{PYTHONPATH})
18+
set(ENV{PYTHONPATH} ${CATKIN_DEVEL_PREFIX}/${PYTHON_INSTALL_DIR}:$ENV{PYTHONPATH}:/usr/lib/python$ENV{ROS_PYTHON_VERSION}/dist-packages)
1919
execute_process(
20-
COMMAND ${PROJECT_SOURCE_DIR}/scripts/gen_reconfigure_msg.py ${PROJECT_SOURCE_DIR}/msg/DRCParametersMessage.msg
20+
COMMAND python$ENV{ROS_PYTHON_VERSION} ${PROJECT_SOURCE_DIR}/scripts/gen_reconfigure_msg.py ${PROJECT_SOURCE_DIR}/msg/DRCParametersMessage.msg
2121
OUTPUT_VARIABLE output_variable
2222
RESULT_VARIABLE result_variable
2323
ERROR_VARIABLE error_variable

‎jsk_2015_06_hrp_drc/drc_task_common/package.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<author email="[email protected]">Masaki Murooka</author>
88

99
<buildtool_depend>catkin</buildtool_depend>
10+
<build_depend>rospkg</build_depend>
1011
<build_depend>move_base_msgs</build_depend>
1112
<build_depend>rosgraph_msgs</build_depend>
1213
<build_depend>roseus</build_depend>
@@ -36,15 +37,13 @@
3637
<build_depend>dynamic_reconfigure</build_depend>
3738
<build_depend>jsk_teleop_joy</build_depend>
3839
<build_depend>jsk_recognition_msgs</build_depend>
39-
<build_depend>jsk_ik_server</build_depend>
4040
<build_depend>pr2eus</build_depend>
4141
<build_depend>pcl_msgs</build_depend>
4242
<build_depend>jsk_footstep_msgs</build_depend>
4343
<build_depend>jsk_footstep_planner</build_depend>
4444
<build_depend>jsk_footstep_controller</build_depend>
4545
<build_depend>drc_com_common</build_depend>
4646
<build_depend>jsk_perception</build_depend>
47-
<build_depend>jsk_calibration</build_depend>
4847
<build_depend>resized_image_transport</build_depend>
4948
<build_depend>jsk_rqt_plugins</build_depend>
5049
<build_depend>jsk_rviz_plugins</build_depend>
@@ -84,7 +83,6 @@
8483
<run_depend>jsk_footstep_controller</run_depend>
8584
<run_depend>drc_com_common</run_depend>
8685
<run_depend>jsk_perception</run_depend>
87-
<run_depend>jsk_calibration</run_depend>
8886
<run_depend>resized_image_transport</run_depend>
8987
<run_depend>python-fysom</run_depend>
9088
<run_depend>jsk_rqt_plugins</run_depend>

‎jsk_demo_common/CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ find_package(catkin REQUIRED COMPONENTS
99
jsk_hark_msgs
1010
jsk_maps
1111
jsk_perception
12-
pddl_planner
13-
pr2eus
1412
pr2_gripper_sensor_msgs
1513
roseus
1614
roseus_smach
@@ -39,7 +37,7 @@ generate_messages(
3937
catkin_package(
4038
# INCLUDE_DIRS include
4139
# LIBRARIES jsk_demo_common
42-
CATKIN_DEPENDS control_msgs jsk_hark_msgs jsk_maps jsk_perception pddl_planner pr2eus roseus roseus_smach message_runtime
40+
CATKIN_DEPENDS control_msgs jsk_hark_msgs jsk_maps jsk_perception roseus roseus_smach message_runtime
4341
# DEPENDS system_lib
4442
)
4543

‎jsk_demo_common/package.xml

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
<build_depend>jsk_hark_msgs</build_depend>
1818
<build_depend>jsk_maps</build_depend>
1919
<build_depend>jsk_perception</build_depend>
20-
<build_depend>pddl_planner</build_depend>
21-
<build_depend>pr2eus</build_depend>
2220
<build_depend>roseus</build_depend>
2321
<build_depend>roseus_smach</build_depend>
2422
<build_depend>message_generation</build_depend>

0 commit comments

Comments
 (0)