Skip to content

Commit 20b421b

Browse files
longhathuclonghathuc
committed
Fix WIP packaging for Agimus
1 parent b93ec39 commit 20b421b

File tree

12 files changed

+79
-67
lines changed

12 files changed

+79
-67
lines changed

‎Makefile‎

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33

44
COMMENT= WIP packages
55

6+
SUBDIR+= agimus
7+
SUBDIR+= agimus-demos
8+
SUBDIR+= agimus-hpp
9+
SUBDIR+= agimus-sot
10+
SUBDIR+= agimus-vision
11+
SUBDIR+= agimus_sot_msgs
612
SUBDIR+= antlr2
713
SUBDIR+= aruco-ros
814
SUBDIR+= backward-ros
@@ -21,25 +27,25 @@ SUBDIR+= hatponboard-lib
2127
SUBDIR+= head-action
2228
SUBDIR+= hey5-description
2329
SUBDIR+= hpp-affordance
24-
#SUBDIR+= infuse-asn1-conversions
25-
#SUBDIR+= infuse-asn1-types
26-
#SUBDIR+= infuse-envire
27-
#SUBDIR+= infuse-idl
28-
#SUBDIR+= infuse-msgs-ros
29-
#SUBDIR+= infuse-novatel-gps-driver-ros
30+
SUBDIR+= infuse-asn1-conversions
31+
SUBDIR+= infuse-asn1-types
32+
SUBDIR+= infuse-envire
33+
SUBDIR+= infuse-idl
34+
SUBDIR+= infuse-msgs-ros
35+
SUBDIR+= infuse-novatel-gps-driver-ros
3036
SUBDIR+= jrl-walkgen-v3
3137
SUBDIR+= jsbsim
3238
SUBDIR+= libhatp
3339
SUBDIR+= libnabo
3440
SUBDIR+= libpointmatcher
35-
#SUBDIR+= morse-ros
41+
SUBDIR+= morse-ros
3642
SUBDIR+= msgconnector
37-
#SUBDIR+= multicontact-api
38-
#SUBDIR+= octovis
43+
SUBDIR+= multicontact-api
44+
SUBDIR+= octovis
3945
SUBDIR+= ompl
40-
#SUBDIR+= openhrp3-hrp2
41-
#SUBDIR+= openhrp3-simulator-wo-rtm
42-
#SUBDIR+= osg-dae
46+
SUBDIR+= openhrp3-hrp2
47+
SUBDIR+= openhrp3-simulator-wo-rtm
48+
SUBDIR+= osg-dae
4349
SUBDIR+= pal-gazebo-plugins
4450
SUBDIR+= pal-gazebo-worlds
4551
SUBDIR+= pal-gripper
@@ -57,31 +63,31 @@ SUBDIR+= pmb2-simulation
5763
SUBDIR+= prf-roboticsgroup-gazebo-plugins
5864
SUBDIR+= prf-teleop-tools
5965
SUBDIR+= py-bmtools
60-
#SUBDIR+= py-casadi
61-
#SUBDIR+= py-cvxpy
66+
SUBDIR+= py-casadi
67+
SUBDIR+= py-cvxpy
6268
SUBDIR+= py-dill
6369
SUBDIR+= py-dynamic-graph-bridge-v3
6470
SUBDIR+= py-dynamic-graph-tutorial
6571
SUBDIR+= py-dynamic-graph-v3
6672
SUBDIR+= py-ecos
67-
#SUBDIR+= py-example-adder
73+
SUBDIR+= py-example-adder
6874
SUBDIR+= py-gurobi
6975
SUBDIR+= py-hqp
7076
SUBDIR+= py-hpp-affordance-corba
71-
#SUBDIR+= py-hpp-baxter
77+
SUBDIR+= py-hpp-baxter
7278
SUBDIR+= py-hpp-bezier-com-traj
7379
SUBDIR+= py-hpp-centroidal-dynamics
74-
#SUBDIR+= py-hpp-hrp2
80+
SUBDIR+= py-hpp-hrp2
7581
SUBDIR+= py-hpp-rbprm
7682
SUBDIR+= py-hpp-rbprm-corba
7783
SUBDIR+= py-hpp-rbprm-robot-data
78-
#SUBDIR+= py-hpp-romeo
84+
SUBDIR+= py-hpp-romeo
7985
SUBDIR+= py-hpp-spline
8086
SUBDIR+= py-hpp-universal-robot
8187
SUBDIR+= py-libnabo
8288
SUBDIR+= py-mavlink
8389
SUBDIR+= py-morse
84-
#SUBDIR+= py-mraa
90+
SUBDIR+= py-mraa
8591
SUBDIR+= py-multicontact-api
8692
SUBDIR+= py-multiprocess
8793
SUBDIR+= py-ospi
@@ -104,7 +110,7 @@ SUBDIR+= py-solo-pybullet
104110
SUBDIR+= py-sot-application-v3
105111
SUBDIR+= py-sot-core-v3
106112
SUBDIR+= py-sot-dynamic-pinocchio-v3
107-
#SUBDIR+= py-sot-dyninv-v3
113+
SUBDIR+= py-sot-dyninv-v3
108114
SUBDIR+= py-sot-pattern-generator-v3
109115
SUBDIR+= py-sot-talos
110116
SUBDIR+= py-sot-talos-balance
@@ -116,7 +122,7 @@ SUBDIR+= py-talos-rbprm
116122
SUBDIR+= py-talos-torque-control
117123
SUBDIR+= py-tiago-tutorials
118124
SUBDIR+= pyrene-motions
119-
#SUBDIR+= roralink
125+
SUBDIR+= roralink
120126
SUBDIR+= ros-aicp-mapping
121127
SUBDIR+= ros-four-wheel-steering-msgs
122128
SUBDIR+= ros-image-pipeline
@@ -143,11 +149,11 @@ SUBDIR+= rviz-plugin-covariance
143149
SUBDIR+= simple-grasping-action
144150
SUBDIR+= sot-core-v3
145151
SUBDIR+= sot-dynamic-pinocchio-v3
146-
#SUBDIR+= sot-dyninv
147-
#SUBDIR+= sot-dyninv-v3
152+
SUBDIR+= sot-dyninv
153+
SUBDIR+= sot-dyninv-v3
148154
SUBDIR+= soth
149-
#SUBDIR+= sot-hrp2
150-
#SUBDIR+= sot-hrp2-v3
155+
SUBDIR+= sot-hrp2
156+
SUBDIR+= sot-hrp2-v3
151157
SUBDIR+= sot-pattern-generator-v3
152158
SUBDIR+= sot-talos-balance
153159
SUBDIR+= sot-tools-v3

‎agimus-demos/Makefile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
ORG= agimus
66
NAME= agimus-demos
77
VERSION= 1.1.0
8-
DOWNLOAD_LOC= releases/download
9-
MASTER_SITE_AGIMUS= https://github.com/agimus/
108
DISTNAME= ${NAME}-${VERSION}
119

12-
MASTER_SITES= ${MASTER_SITE_AGIMUS:=${NAME}/${DOWNLOAD_LOC}/v${VERSION}/}
13-
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}/${DOWNLOAD_LOC}/v${VERSION}
14-
LICENSE= BSD-2-Clause
10+
MASTER_SITES?= ${MASTER_SITE_GITHUB:=${ORG}/${NAME}}/releases/download/v${VERSION}/
11+
MASTER_REPOSITORY?= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
12+
13+
LICENSE= 2-clause-bsd
1514
CATEGORIES= wip
16-
COMMENT= Agimus-demos
17-
CMAKE_ARGS+= -DPYTHON_STANDARD_LAYOUT=ON
15+
COMMENT= agimus-demos
16+
1817

1918
include ../../devel/ros-catkin/depend.mk
2019
include ../../mk/language/c.mk
2120
include ../../mk/language/c++.mk
2221
include ../../mk/robotpkg.mk
22+
include ../../devel/jrl-cmakemodules/Makefile.common

‎agimus-hpp/Makefile‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,15 @@
44
ORG= agimus
55
NAME= agimus-hpp
66
VERSION= 1.0.0
7-
DOWNLOAD_LOC= releases/download
8-
MASTER_SITE_AGIMUS= https://github.com/agimus/
97
DISTNAME= ${NAME}-${VERSION}
108

11-
MASTER_SITES= ${MASTER_SITE_AGIMUS:=${NAME}/${DOWNLOAD_LOC}/v${VERSION}/}
12-
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}/${DOWNLOAD_LOC}/v${VERSION}
13-
LICENSE= BSD-2-Clause
9+
MASTER_SITES?= ${MASTER_SITE_GITHUB:=${ORG}/${NAME}}/releases/download/v${VERSION}/
10+
MASTER_REPOSITORY?= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
11+
LICENSE= 2-clause-bsd
1412

1513
CATEGORIES= wip
1614
COMMENT= Package to link HPP to the Agimus framework
1715

18-
CMAKE_ARGS+= -DPYTHON_STANDARD_LAYOUT=ON
1916
CMAKE_ARGS+= -DBUILD_HPP_PLUGIN=ON
2017
CMAKE_ARGS+= -DBUILD_ROS_INTERFACE=ON
2118

@@ -30,3 +27,4 @@ include ../../devel/ros-catkin/depend.mk
3027
include ../../mk/language/c.mk
3128
include ../../mk/language/c++.mk
3229
include ../../mk/robotpkg.mk
30+
include ../../devel/jrl-cmakemodules/Makefile.common

‎agimus-sot/Makefile‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,15 @@
55
ORG= agimus
66
NAME= agimus-sot
77
VERSION= 1.0.2
8-
DOWNLOAD_LOC= releases/download
9-
MASTER_SITE_AGIMUS= https://github.com/agimus/
108
DISTNAME= ${NAME}-${VERSION}
119

12-
MASTER_SITES= ${MASTER_SITE_AGIMUS:=${NAME}/${DOWNLOAD_LOC}/v${VERSION}/}
13-
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}/${DOWNLOAD_LOC}/v${VERSION}
14-
LICENSE= BSD-2-Clause
10+
MASTER_SITES?= ${MASTER_SITE_GITHUB:=${ORG}/${NAME}}/releases/download/v${VERSION}/
11+
MASTER_REPOSITORY?= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
12+
LICENSE= 2-clause-bsd
1513

1614
CATEGORIES= wip
1715
COMMENT= Package to link SoT to the Agimus framework.
1816

19-
CMAKE_ARGS+= -DPYTHON_STANDARD_LAYOUT=ON
2017

2118
include ../../wip/agimus_sot_msgs/depend.mk
2219
include ../../wip/py-dynamic-graph-v3/depend.mk
@@ -27,4 +24,5 @@ include ../../path/py-hpp-manipulation-corba/depend.mk
2724
include ../../devel/ros-catkin/depend.mk
2825
include ../../mk/language/c.mk
2926
include ../../mk/language/c++.mk
30-
include ../../mk/robotpkg.mk
27+
include ../../mk/robotpkg.mk
28+
include ../../devel/jrl-cmakemodules/Makefile.common

‎agimus-sot/depend.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DEPEND_DIR.agimus-sot?= ../../wip/agimus-sot
2020

2121
SYSTEM_SEARCH.agimus-sot= \
2222
'lib/pkgconfig/agimus-sot.pc:/Version/s/[^0-9.]//gp' \
23-
'lib/lib/libagimus_sot.so'
23+
'lib/libagimus_sot.so'
2424

2525
endif # AGIMUS_SOT_DEPEND_MK -------------------------------------------------
2626

‎agimus-vision/Makefile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,19 @@
55
ORG= agimus
66
NAME= agimus-vision
77
VERSION= 1.0.0
8-
DOWNLOAD_LOC= releases/download
9-
MASTER_SITE_AGIMUS= https://github.com/agimus/
108
DISTNAME= ${NAME}-${VERSION}
119

12-
MASTER_SITES= ${MASTER_SITE_AGIMUS:=${NAME}/${DOWNLOAD_LOC}/v${VERSION}/}
13-
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}/${DOWNLOAD_LOC}/v${VERSION}
14-
LICENSE= BSD-2-Clause
10+
MASTER_SITES?= ${MASTER_SITE_GITHUB:=${ORG}/${NAME}}/releases/download/v${VERSION}/
11+
MASTER_REPOSITORY?= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
12+
LICENSE= 2-clause-bsd
1513

1614
CATEGORIES= wip
1715
COMMENT= Computer vision for Agimus
18-
CMAKE_ARGS+= -DPYTHON_STANDARD_LAYOUT=ON
16+
1917

2018
include ../../image/ros-vision-opencv/depend.mk
2119
include ../../devel/ros-catkin/depend.mk
2220
include ../../mk/language/c.mk
2321
include ../../mk/language/c++.mk
2422
include ../../mk/robotpkg.mk
23+
include ../../devel/jrl-cmakemodules/Makefile.common

‎agimus/Makefile‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,20 @@
55
ORG= agimus
66
NAME= agimus
77
VERSION= 1.0.1
8-
DOWNLOAD_LOC= releases/download
9-
MASTER_SITE_AGIMUS= https://github.com/agimus/
108
DISTNAME= ${NAME}-${VERSION}
119

12-
MASTER_SITES= ${MASTER_SITE_AGIMUS:=${NAME}/${DOWNLOAD_LOC}/v${VERSION}/}
13-
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}/${DOWNLOAD_LOC}/v${VERSION}
14-
LICENSE= BSD-2-Clause
10+
MASTER_SITES?= ${MASTER_SITE_GITHUB:=${ORG}/${NAME}}/releases/download/v${VERSION}/
11+
MASTER_REPOSITORY?= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
12+
LICENSE= 2-clause-bsd
1513

1614
CATEGORIES= wip
1715
COMMENT= agimus
18-
CMAKE_ARGS+= -DPYTHON_STANDARD_LAYOUT=ON
16+
1917

2018
include ../../wip/agimus_sot_msgs/depend.mk
2119
include ../../wip/agimus-hpp/depend.mk
2220
include ../../devel/ros-catkin/depend.mk
2321
include ../../mk/language/c.mk
2422
include ../../mk/language/c++.mk
2523
include ../../mk/robotpkg.mk
24+
include ../../devel/jrl-cmakemodules/Makefile.common

‎agimus_sot_msgs/Makefile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
ORG= agimus
66
NAME= agimus_sot_msgs
77
VERSION= 1.0.0
8-
DOWNLOAD_LOC= releases/download
9-
MASTER_SITE_AGIMUS= https://github.com/agimus/
108
DISTNAME= ${NAME}-${VERSION}
119

12-
MASTER_SITES= ${MASTER_SITE_AGIMUS:=${NAME}/${DOWNLOAD_LOC}/v${VERSION}/}
13-
MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}/${DOWNLOAD_LOC}/v${VERSION}
14-
LICENSE= BSD-2-Clause
10+
MASTER_SITES?= ${MASTER_SITE_GITHUB:=${ORG}/${NAME}}/releases/download/v${VERSION}/
11+
MASTER_REPOSITORY?= ${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
12+
LICENSE= 2-clause-bsd
1513

1614
CATEGORIES= wip
1715
COMMENT= Messages and services for the agimus_sot package
@@ -20,3 +18,4 @@ include ../../devel/ros-catkin/depend.mk
2018
include ../../mk/language/c.mk
2119
include ../../mk/language/c++.mk
2220
include ../../mk/robotpkg.mk
21+
include ../../devel/jrl-cmakemodules/Makefile.common

‎play-motion/Makefile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ USE_BOOST_LIBS= thread
3030
ifeq (,$(filter 16.04%,${OS_VERSION}))
3131
include ../../wip/ros-moveit/depend.mk
3232
endif
33+
34+
ifeq (,$(filter 18.04%,${OS_VERSION}))
35+
include ../../wip/ros-moveit/depend.mk
36+
endif
37+
3338
include ../../wip/py-prf-ros-control/depend.mk
3439

3540
include ../../devel/boost-headers/depend.mk

‎play-motion/depend.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ DEPEND_DIR.play-motion?=\
2121
../../wip/play-motion
2222

2323
SYSTEM_SEARCH.play-motion=\
24-
'include/play_motion/play_motion.h' \
2524
'share/play_motion/cmake/play_motionConfig.cmake' \
2625
'share/play_motion_msgs/cmake/play_motion_msgsConfig.cmake' \
2726
'share/play_motion/package.xml:/<version>/s/[^0-9.]//gp' \

0 commit comments

Comments
 (0)