Skip to content

Commit 1eee382

Browse files
longhathuclonghathuc
committed
finish agimus packaging for wip
1 parent a254ba7 commit 1eee382

File tree

17 files changed

+121
-113
lines changed

17 files changed

+121
-113
lines changed

‎agimus-demos/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ DISTNAME= ${NAME}-${VERSION}
1111

1212
MASTER_SITES= ${MASTER_SITE_AGIMUS:=${NAME}/${DOWNLOAD_LOC}/v${VERSION}/}
1313
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}/${DOWNLOAD_LOC}/v${VERSION}
14-
LICENSE= gnu-lgpl-v3
15-
14+
LICENSE= BSD-2-Clause
1615
CATEGORIES= wip
1716
COMMENT= Agimus-demos
17+
CMAKE_ARGS+= -DPYTHON_STANDARD_LAYOUT=ON
1818

1919
include ../../devel/ros-catkin/depend.mk
2020
include ../../mk/language/c.mk

‎agimus-demos/PLIST‎

Lines changed: 27 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,27 @@
1-
share/agimus_demos/tiago/CMakeLists.txt
2-
share/agimus_demos/tiago/setup/play_supervisor.py
3-
share/agimus_demos/tiago/setup/supervisor.py
4-
share/agimus_demos/tiago/common/camera_info.yaml
5-
share/agimus_demos/tiago/insert_drill/script_hpp.py
6-
share/agimus_demos/tiago/insert_drill/config.rviz
7-
share/agimus_demos/tiago/insert_drill/supervisor.py
1+
lib/pkgconfig/agimus_demos.pc
2+
share/agimus_demos/cmake/agimus_demosConfig.cmake
3+
share/agimus_demos/cmake/agimus_demosConfig-version.cmake
84
share/agimus_demos/package.xml
5+
share/agimus_demos/launch/talos_pass_box_between_hands_geometric_simu.launch
6+
share/agimus_demos/launch/talos_pass_box_between_hands_gazebo.launch
7+
share/agimus_demos/launch/talos_pass_box_between_hands_on_pyrene.launch
8+
share/agimus_demos/launch/talos_pickup_object_geometric_simu.launch
9+
share/agimus_demos/launch/talos_pickup_object_gazebo.launch
910
share/agimus_demos/launch/talos_pickup_object_on_pyrene_no_vision.launch
10-
share/agimus_demos/launch/tiago_insert_drill_estimation.launch
11-
share/agimus_demos/launch/tiago_insert_drill_tiago.launch
12-
share/agimus_demos/launch/tiago_insert_drill_tiago_hpp.launch
13-
share/agimus_demos/launch/tiago_insert_drill_world_setup.launch
14-
share/agimus_demos/launch/tiago_insert_drill_geometric_simu.launch
15-
share/agimus_demos/launch/tiago_insert_drill_gazebo_sot.launch
16-
share/agimus_demos/launch/talos_manipulate_boxes_world_setup.launch
11+
share/agimus_demos/launch/talos_pickup_cardboard_box_geometric_simu.launch
12+
share/agimus_demos/launch/talos_pickup_cardboard_box_gazebo.launch
13+
share/agimus_demos/launch/talos_pickup_cardboard_box_on_pyrene_no_vision.launch
1714
share/agimus_demos/launch/talos_pickup_cardboard_box_on_pyrene.launch
15+
share/agimus_demos/launch/talos_manipulate_boxes_gazebo.launch
1816
share/agimus_demos/launch/talos_manipulate_boxes_estimation.launch
19-
share/agimus_demos/launch/talos_calibration_apriltags_on_pyrene.launch
20-
share/agimus_demos/launch/talos_pickup_object_geometric_simu.launch
21-
share/agimus_demos/launch/talos_pickup_object_gazebo.launch
2217
share/agimus_demos/launch/talos_manipulate_boxes_on_pyrene.launch
23-
share/agimus_demos/launch/talos_pickup_cardboard_box_on_pyrene_no_vision.launch
24-
share/agimus_demos/launch/talos_pickup_cardboard_box_geometric_simu.launch
25-
share/agimus_demos/launch/talos_pass_box_between_hands_on_pyrene.launch
26-
share/agimus_demos/launch/talos_calibration_apriltags.launch
27-
share/agimus_demos/launch/talos_camera_calibration_on_pyrene.launch
18+
share/agimus_demos/launch/talos_manipulate_boxes_geometric_simu.launch
19+
share/agimus_demos/launch/talos_manipulate_boxes_world_setup.launch
2820
share/agimus_demos/launch/talos_manipulate_boxes_support_calibration.launch
29-
share/agimus_demos/launch/talos_manipulate_boxes_gazebo.launch
21+
share/agimus_demos/launch/talos_camera_calibration_on_pyrene.launch
22+
share/agimus_demos/launch/talos_calibration_apriltags.launch
3023
share/agimus_demos/launch/talos_calibration_apriltags_tracker.launch
31-
share/agimus_demos/launch/tiago_insert_drill_gazebo.launch
32-
share/agimus_demos/launch/talos_manipulate_boxes_geometric_simu.launch
33-
share/agimus_demos/launch/talos_pass_box_between_hands_geometric_simu.launch
34-
share/agimus_demos/launch/tiago_insert_drill_gazebo_tiago.launch
35-
share/agimus_demos/launch/talos_pass_box_between_hands_gazebo.launch
36-
share/agimus_demos/launch/talos_pickup_cardboard_box_gazebo.launch
37-
share/agimus_demos/cmake/agimus_demosConfig.cmake
38-
share/agimus_demos/cmake/agimus_demosConfig-version.cmake
39-
share/agimus_demos/scripts/group_of_tags.py
40-
share/agimus_demos/scripts/calibration_frames_grabber.py
41-
share/agimus_demos/scripts/gazebo_object_to_tf.py
42-
share/agimus_demos/scripts/publish_constants.py
43-
share/agimus_demos/scripts/visual_tag_initializer.py
24+
share/agimus_demos/launch/talos_calibration_apriltags_on_pyrene.launch
4425
share/agimus_demos/talos/pickup_cardboard_box/script_hpp.py
4526
share/agimus_demos/talos/pickup_cardboard_box/supervisor.py
4627
share/agimus_demos/talos/pickup_cardboard_box/estimation_hpp.py
@@ -49,7 +30,6 @@ share/agimus_demos/talos/movement_30_11_18/run_demo.py
4930
share/agimus_demos/talos/movement_30_11_18/script_hpp.py
5031
share/agimus_demos/talos/movement_30_11_18/script_hpp2.py
5132
share/agimus_demos/talos/movement_30_11_18/supervisor.py
52-
share/agimus_demos/talos/CMakeLists.txt
5333
share/agimus_demos/talos/camera_calibration/generate_pose.py
5434
share/agimus_demos/talos/camera_calibration/convert_to_visp_yaml.py
5535
share/agimus_demos/talos/camera_calibration/test_compute_model.py
@@ -62,13 +42,11 @@ share/agimus_demos/talos/camera_calibration/compute_model.py
6242
share/agimus_demos/talos/manipulate_boxes/README.md
6343
share/agimus_demos/talos/manipulate_boxes/script_hpp.py
6444
share/agimus_demos/talos/manipulate_boxes/estimation.py
65-
share/agimus_demos/talos/manipulate_boxes/flip_box.py
6645
share/agimus_demos/talos/manipulate_boxes/config.rviz
6746
share/agimus_demos/talos/manipulate_boxes/supervisor.py
6847
share/agimus_demos/talos/manipulate_boxes/robot_only_supervisor.py
6948
share/agimus_demos/talos/manipulate_boxes/common_hpp.py
7049
share/agimus_demos/talos/manipulate_boxes/calibration.py
71-
share/agimus_demos/talos/manipulate_boxes/plan_path.py
7250
share/agimus_demos/talos/pass_box_between_hands/pass_box_between_hands.py
7351
share/agimus_demos/talos/pass_box_between_hands/supervisor.py
7452
share/agimus_demos/talos/full-body-calibration/joint_limits.py
@@ -94,12 +72,16 @@ share/agimus_demos/talos/calibration/README
9472
share/agimus_demos/talos/common/half_sitting.json
9573
share/agimus_demos/talos/common/camera_info.yaml
9674
share/agimus_demos/talos/common/publish_constants.py
97-
share/agimus_demos/srdf/aircraft_skin_with_marker.srdf
98-
share/agimus_demos/srdf/calibration_mire.srdf
99-
share/agimus_demos/srdf/talos.srdf
100-
share/agimus_demos/srdf/cup.srdf
75+
share/agimus_demos/tiago/setup/play_supervisor.py
76+
share/agimus_demos/tiago/setup/supervisor.py
10177
share/agimus_demos/urdf/calibration_mire.urdf
10278
share/agimus_demos/urdf/talos_calibration_camera.urdf
103-
share/agimus_demos/urdf/aircraft_skin_with_marker.urdf
10479
share/agimus_demos/urdf/cup.urdf
105-
lib/pkgconfig/agimus_demos.pc
80+
share/agimus_demos/srdf/calibration_mire.srdf
81+
share/agimus_demos/srdf/talos.srdf
82+
share/agimus_demos/srdf/cup.srdf
83+
share/agimus_demos/scripts/gazebo_object_to_tf.py
84+
share/agimus_demos/scripts/visual_tag_initializer.py
85+
share/agimus_demos/scripts/calibration_frames_grabber.py
86+
share/agimus_demos/scripts/publish_constants.py
87+
share/agimus_demos/scripts/group_of_tags.py

‎agimus-demos/depend.mk‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
#
44

55
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
6-
AGIMUS_VISION_DEPEND_MK:= ${AGIMUS_VISION_DEPEND_MK}+
6+
AGIMUS_DEMOS_DEPEND_MK:= ${AGIMUS_DEMOS_DEPEND_MK}+
77

88
ifeq (+,$(DEPEND_DEPTH))
99
DEPEND_PKG+= agimus-demos
1010
endif
1111

12-
ifeq (+,$(AGIMUS_VISION_DEPEND_MK)) # -------------------------------------------
12+
ifeq (+,$(AGIMUS_DEMOS_DEPEND_MK)) # -------------------------------------------
1313

1414
PREFER.agimus-demos?= robotpkg
1515

1616
DEPEND_USE+= agimus-demos
1717

18-
DEPEND_ABI.agimus-demos?= agimus-demos>=1.1.1
19-
DEPEND_DIR.agimus-demos1?= ../../wip/agimus-demos
18+
DEPEND_ABI.agimus-demos?= agimus-demos>=1.1.0
19+
DEPEND_DIR.agimus-demos?= ../../wip/agimus-demos
2020

2121
SYSTEM_SEARCH.agimus-demos= \
2222
'lib/pkgconfig/agimus-demos.pc:/Version/s/[^0-9.]//gp' \
2323
'share/agimus-demos/cmake/agimus-demosConfig-version.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp'
2424

25-
endif # AGIMUS_VISION_DEPEND_MK -------------------------------------------------
25+
endif # AGIMUS_DEMOS_DEPEND_MK -------------------------------------------------
2626

2727
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
2828

‎agimus-hpp/Makefile‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# robotpkg Makefile for: wip/agimus-hpp
22
# Created: Long Ha Thuc on Tue, 18 Aug 2020
33
#
4-
54
ORG= agimus
65
NAME= agimus-hpp
76
VERSION= 1.0.0
@@ -11,11 +10,16 @@ DISTNAME= ${NAME}-${VERSION}
1110

1211
MASTER_SITES= ${MASTER_SITE_AGIMUS:=${NAME}/${DOWNLOAD_LOC}/v${VERSION}/}
1312
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}/${DOWNLOAD_LOC}/v${VERSION}
14-
LICENSE= gnu-lgpl-v3
13+
LICENSE= BSD-2-Clause
1514

1615
CATEGORIES= wip
1716
COMMENT= Package to link HPP to the Agimus framework
1817

18+
CMAKE_ARGS+= -DPYTHON_STANDARD_LAYOUT=ON
19+
CMAKE_ARGS+= -DBUILD_HPP_PLUGIN=ON
20+
CMAKE_ARGS+= -DBUILD_ROS_INTERFACE=ON
21+
22+
1923
include ../../wip/agimus_sot_msgs/depend.mk
2024
include ../../motion/dynamic-graph-bridge-msgs/depend.mk
2125
include ../../middleware/py-omniORBpy/depend.mk

‎agimus-hpp/PLIST‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1-
share/agimus-hpp/package.xml
2-
share/agimus-hpp/launch
3-
share/agimus-hpp/launch/hpp_interface.launch
4-
share/agimus-hpp/cmake/agimus-hppConfig-version.cmake
5-
share/agimus-hpp/cmake/agimus-hppConfig.cmake
6-
share/agimus-hpp/scripts/hpp_node.py
7-
share/agimus-hpp/scripts/estimation.py
8-
lib/hppPlugins/agimus-hpp.so
9-
lib/pkgconfig/agimus-hpp.pc
1+
lib/hppPlugins/agimus_hpp.so
2+
lib/pkgconfig/agimus_hpp.pc
3+
share/agimus_hpp/package.xml
4+
share/agimus_hpp/launch/hpp_interface.launch
5+
share/agimus_hpp/cmake/agimus_hppConfig-version.cmake
6+
share/agimus_hpp/cmake/agimus_hppConfig.cmake
7+
share/agimus_hpp/scripts/hpp_node.py
8+
share/agimus_hpp/scripts/estimation.py
9+
${PYTHON_SITELIB}/agimus_hpp/__init__.py
10+
${PYTHON_SITELIB}/agimus_hpp/manipulation/__init__.py
11+
${PYTHON_SITELIB}/agimus_hpp/manipulation/planning_request_adapter.py
12+
${PYTHON_SITELIB}/agimus_hpp/estimation.py
13+
${PYTHON_SITELIB}/agimus_hpp/ros_tools.py
14+
${PYTHON_SITELIB}/agimus_hpp/planning_request_adapter.py
15+
${PYTHON_SITELIB}/agimus_hpp/trajectory_publisher.py
16+
${PYTHON_SITELIB}/agimus_hpp/client.py
17+
${PYTHON_SITELIB}/agimus_hpp/tools.py

‎agimus-hpp/depend.mk‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
# robotpkg depend.mk for: wip/agimus-hpp
1+
# robotpkg depend.mk for: wip/agimus_hpp
22
# Created: Long Ha Thuc on Wed, 19 Aug 2020
33
#
44

55
DEPEND_DEPTH:= ${DEPEND_DEPTH}+
66
AGIMUS_HPP_DEPEND_MK:= ${AGIMUS_HPP_DEPEND_MK}+
77

88
ifeq (+,$(DEPEND_DEPTH))
9-
DEPEND_PKG+= agimus-hpp
9+
DEPEND_PKG+= agimus_hpp
1010
endif
1111

12-
ifeq (+,$(AGIMUS_HPP__DEPEND_MK)) # -------------------------------------------
12+
ifeq (+,$(AGIMUS_HPP_DEPEND_MK)) # -------------------------------------------
1313

14-
PREFER.agimus-hpp?= robotpkg
14+
PREFER.agimus_hpp?= robotpkg
1515

16-
SYSTEM_SEARCH.agimus-hpp= \
17-
'lib/pkgconfig/agimus-hpp.pc:/Version/s/[^0-9.]//gp'
16+
SYSTEM_SEARCH.agimus_hpp = \ \
17+
'lib/pkgconfig/agimus_hpp.pc:/Version/s/[^0-9.]//gp' \
18+
'share/agimus_hpp/cmake/agimus_hppConfig-version.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp'
1819

20+
DEPEND_USE+= agimus_hpp
1921

20-
DEPEND_USE+= agimus-hpp
21-
22-
DEPEND_ABI.agimus-hpp?= agimus-hpp>=1.0.0
23-
DEPEND_DIR.agimus-hpp?= ../../wip/agimus-hpp
22+
DEPEND_ABI.agimus_hpp?= agimus-hpp>=1.0.0
23+
DEPEND_DIR.agimus_hpp?= ../../wip/agimus-hpp
2424

2525
endif # AGIMUS_HPP_DEPEND_MK -------------------------------------------------
2626

‎agimus-hpp/distinfo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
SHA1 (agimus-hpp-1.0.0.tar.gz) = 896188e710073572b122787a73979529c2b08b31
2-
RMD160 (agimus-hpp-1.0.0.tar.gzz) = 051ac8fba4d2bddd248d6afa4921d4aeeb594eb2
2+
RMD160 (agimus-hpp-1.0.0.tar.gz) = 051ac8fba4d2bddd248d6afa4921d4aeeb594eb2
33
Size (agimus-hpp-1.0.0.tar.gz) = 784205 bytes

‎agimus-sot/Makefile‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,20 @@ DISTNAME= ${NAME}-${VERSION}
1111

1212
MASTER_SITES= ${MASTER_SITE_AGIMUS:=${NAME}/${DOWNLOAD_LOC}/v${VERSION}/}
1313
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}/${DOWNLOAD_LOC}/v${VERSION}
14-
LICENSE= gnu-lgpl-v3
14+
LICENSE= BSD-2-Clause
1515

1616
CATEGORIES= wip
1717
COMMENT= Package to link SoT to the Agimus framework.
1818

19+
CMAKE_ARGS+= -DPYTHON_STANDARD_LAYOUT=ON
1920

20-
include ../../wip/sot-core-v3/depend.mk
21-
include ../../wip/py-dynamic-graph-bridge-v3/depend.mk
21+
include ../../wip/agimus_sot_msgs/depend.mk
2222
include ../../wip/py-dynamic-graph-v3/depend.mk
23+
include ../../wip/py-dynamic-graph-bridge-v3/depend.mk
24+
include ../../wip/py-sot-core-v3/depend.mk
25+
include ../../wip/sot-core-v3/depend.mk
26+
include ../../path/py-hpp-manipulation-corba/depend.mk
2327
include ../../devel/ros-catkin/depend.mk
2428
include ../../mk/language/c.mk
2529
include ../../mk/language/c++.mk
26-
include ../../mk/robotpkg.mk
30+
include ../../mk/robotpkg.mk

‎agimus-sot/PLIST‎

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,31 @@
1-
share/agimus_sot/launch/supervisor.launch
2-
share/agimus_sot/scripts/simulation.py
3-
share/agimus_sot/scripts/start_supervisor.py
41
share/agimus_sot/package.xml
5-
lib/libagimus_sot.so
2+
share/agimus_sot/scripts/start_supervisor.py
3+
share/agimus_sot/scripts/simulation.py
4+
share/agimus_sot/launch/supervisor.launch
65
lib/pkgconfig/agimus_sot.pc
6+
lib/libagimus_sot.so
7+
${PYTHON_SITELIB}/agimus_sot/sot/wrap.so
8+
${PYTHON_SITELIB}/agimus_sot/sot/__init__.py
9+
${PYTHON_SITELIB}/agimus_sot/__init__.py
10+
${PYTHON_SITELIB}/agimus_sot/supervisor.py
11+
${PYTHON_SITELIB}/agimus_sot/tools.py
12+
${PYTHON_SITELIB}/agimus_sot/solver.py
13+
${PYTHON_SITELIB}/agimus_sot/events.py
14+
${PYTHON_SITELIB}/agimus_sot/ros_interface.py
15+
${PYTHON_SITELIB}/agimus_sot/factory.py
16+
${PYTHON_SITELIB}/agimus_sot/srdf_parser.py
17+
${PYTHON_SITELIB}/agimus_sot/__init__.py
18+
${PYTHON_SITELIB}/agimus_sot/control/controllers.py
19+
${PYTHON_SITELIB}/agimus_sot/control/switch.py
20+
${PYTHON_SITELIB}/agimus_sot/control/gripper.py
21+
${PYTHON_SITELIB}/agimus_sot/control/__init__.py
22+
${PYTHON_SITELIB}/agimus_sot/task/__init__.py
23+
${PYTHON_SITELIB}/agimus_sot/task/com.py
24+
${PYTHON_SITELIB}/agimus_sot/task/end_effector.py
25+
${PYTHON_SITELIB}/agimus_sot/task/foot.py
26+
${PYTHON_SITELIB}/agimus_sot/task/grasp.py
27+
${PYTHON_SITELIB}/agimus_sot/task/op_frame.py
28+
${PYTHON_SITELIB}/agimus_sot/task/posture.py
29+
${PYTHON_SITELIB}/agimus_sot/task/pre_grasp.py
30+
${PYTHON_SITELIB}/agimus_sot/task/pre_grasp_post_action.py
31+
${PYTHON_SITELIB}/agimus_sot/task/task.py

‎agimus-sot/depend.mk‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ ifeq (+,$(DEPEND_DEPTH))
99
DEPEND_PKG+= agimus-sot
1010
endif
1111

12-
ifeq (+,$(AGIMUS_SOT__DEPEND_MK)) # -------------------------------------------
12+
ifeq (+,$(AGIMUS_SOT_DEPEND_MK)) # -------------------------------------------
1313

1414
PREFER.agimus-sot?= robotpkg
1515

16-
SYSTEM_SEARCH.agimus-sot= \
17-
'lib/pkgconfig/agimus-sot.pc:/Version/s/[^0-9.]//gp'
18-
19-
2016
DEPEND_USE+= agimus-sot
2117

2218
DEPEND_ABI.agimus-sot?= agimus-sot>=1.0.2
2319
DEPEND_DIR.agimus-sot?= ../../wip/agimus-sot
2420

21+
SYSTEM_SEARCH.agimus-sot= \
22+
'lib/pkgconfig/agimus-sot.pc:/Version/s/[^0-9.]//gp' \
23+
'lib/lib/libagimus_sot.so'
24+
2525
endif # AGIMUS_SOT_DEPEND_MK -------------------------------------------------
2626

2727
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}

0 commit comments

Comments
 (0)