From 7a66ce97c5cec72d083346e1bffaee6ff46fa9e0 Mon Sep 17 00:00:00 2001 From: pal Date: Tue, 18 Aug 2020 08:56:41 +0000 Subject: [PATCH 1/5] modify for wip to build on ferrum environment --- Makefile | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) diff --git a/Makefile b/Makefile index da452229..4ba77e3a 100644 --- a/Makefile +++ b/Makefile @@ -20,35 +20,32 @@ SUBDIR+= ddp-actuator-solver SUBDIR+= dynamic-graph-tutorial SUBDIR+= dynamic-graph-v3 SUBDIR+= dynamic-introspection -SUBDIR+= example-adder +#SUBDIR+= example-adder SUBDIR+= fcl SUBDIR+= FRILibrary SUBDIR+= hatponboard-lib SUBDIR+= head-action SUBDIR+= hey5-description SUBDIR+= hpp-affordance -SUBDIR+= hpp-benchmark -SUBDIR+= hrp2-14-description -SUBDIR+= hrp2-dev -SUBDIR+= infuse-asn1-conversions -SUBDIR+= infuse-asn1-types -SUBDIR+= infuse-envire -SUBDIR+= infuse-idl -SUBDIR+= infuse-msgs-ros -SUBDIR+= infuse-novatel-gps-driver-ros +#SUBDIR+= infuse-asn1-conversions +#SUBDIR+= infuse-asn1-types +#SUBDIR+= infuse-envire +#SUBDIR+= infuse-idl +#SUBDIR+= infuse-msgs-ros +#SUBDIR+= infuse-novatel-gps-driver-ros SUBDIR+= jrl-walkgen-v3 SUBDIR+= jsbsim SUBDIR+= libhatp SUBDIR+= libnabo SUBDIR+= libpointmatcher -SUBDIR+= morse-ros +#SUBDIR+= morse-ros SUBDIR+= msgconnector -SUBDIR+= multicontact-api -SUBDIR+= octovis +#SUBDIR+= multicontact-api +#SUBDIR+= octovis SUBDIR+= ompl -SUBDIR+= openhrp3-hrp2 -SUBDIR+= openhrp3-simulator-wo-rtm -SUBDIR+= osg-dae +#SUBDIR+= openhrp3-hrp2 +#SUBDIR+= openhrp3-simulator-wo-rtm +#SUBDIR+= osg-dae SUBDIR+= pal-gazebo-plugins SUBDIR+= pal-gazebo-worlds SUBDIR+= pal-gripper @@ -66,31 +63,31 @@ SUBDIR+= pmb2-simulation SUBDIR+= prf-roboticsgroup-gazebo-plugins SUBDIR+= prf-teleop-tools SUBDIR+= py-bmtools -SUBDIR+= py-casadi -SUBDIR+= py-cvxpy +#SUBDIR+= py-casadi +#SUBDIR+= py-cvxpy SUBDIR+= py-dill SUBDIR+= py-dynamic-graph-bridge-v3 SUBDIR+= py-dynamic-graph-tutorial SUBDIR+= py-dynamic-graph-v3 SUBDIR+= py-ecos -SUBDIR+= py-example-adder +#SUBDIR+= py-example-adder SUBDIR+= py-gurobi SUBDIR+= py-hqp SUBDIR+= py-hpp-affordance-corba -SUBDIR+= py-hpp-baxter +#SUBDIR+= py-hpp-baxter SUBDIR+= py-hpp-bezier-com-traj SUBDIR+= py-hpp-centroidal-dynamics -SUBDIR+= py-hpp-hrp2 +#SUBDIR+= py-hpp-hrp2 SUBDIR+= py-hpp-rbprm SUBDIR+= py-hpp-rbprm-corba SUBDIR+= py-hpp-rbprm-robot-data -SUBDIR+= py-hpp-romeo +#SUBDIR+= py-hpp-romeo SUBDIR+= py-hpp-spline SUBDIR+= py-hpp-universal-robot SUBDIR+= py-libnabo SUBDIR+= py-mavlink SUBDIR+= py-morse -SUBDIR+= py-mraa +#SUBDIR+= py-mraa SUBDIR+= py-multicontact-api SUBDIR+= py-multiprocess SUBDIR+= py-ospi @@ -125,7 +122,7 @@ SUBDIR+= py-talos-rbprm SUBDIR+= py-talos-torque-control SUBDIR+= py-tiago-tutorials SUBDIR+= pyrene-motions -SUBDIR+= roralink +#SUBDIR+= roralink SUBDIR+= ros-aicp-mapping SUBDIR+= ros-four-wheel-steering-msgs SUBDIR+= ros-image-pipeline @@ -155,8 +152,8 @@ SUBDIR+= sot-dynamic-pinocchio-v3 #SUBDIR+= sot-dyninv #SUBDIR+= sot-dyninv-v3 SUBDIR+= soth -SUBDIR+= sot-hrp2 -SUBDIR+= sot-hrp2-v3 +#SUBDIR+= sot-hrp2 +#SUBDIR+= sot-hrp2-v3 SUBDIR+= sot-pattern-generator-v3 SUBDIR+= sot-talos-balance SUBDIR+= sot-tools-v3 From c4a142ffeebef29054194de8e064b286161350b9 Mon Sep 17 00:00:00 2001 From: Ha Thuc Long Date: Wed, 26 Aug 2020 11:33:41 +0000 Subject: [PATCH 2/5] finish agimus packaging for wip --- agimus-hpp/Makefile | 3 --- agimus-sot/Makefile | 2 +- agimus-vision/Makefile | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/agimus-hpp/Makefile b/agimus-hpp/Makefile index f9146fcc..8b86360b 100644 --- a/agimus-hpp/Makefile +++ b/agimus-hpp/Makefile @@ -13,9 +13,6 @@ LICENSE= 2-clause-bsd CATEGORIES= wip COMMENT= Package to link HPP to the Agimus framework -CMAKE_ARGS+= -DBUILD_HPP_PLUGIN=ON -CMAKE_ARGS+= -DBUILD_ROS_INTERFACE=ON - include ../../devel/jrl-cmakemodules/Makefile.common include ../../wip/agimus_sot_msgs/depend.mk include ../../motion/dynamic-graph-bridge-msgs/depend.mk diff --git a/agimus-sot/Makefile b/agimus-sot/Makefile index 88571409..f6fa36af 100644 --- a/agimus-sot/Makefile +++ b/agimus-sot/Makefile @@ -24,4 +24,4 @@ include ../../path/py-hpp-manipulation-corba/depend.mk include ../../devel/ros-catkin/depend.mk include ../../mk/language/c.mk include ../../mk/language/c++.mk -include ../../mk/robotpkg.mk +include ../../mk/robotpkg.mk \ No newline at end of file diff --git a/agimus-vision/Makefile b/agimus-vision/Makefile index c54016d0..441aeb9a 100644 --- a/agimus-vision/Makefile +++ b/agimus-vision/Makefile @@ -13,6 +13,7 @@ LICENSE= 2-clause-bsd CATEGORIES= wip COMMENT= Computer vision for Agimus +CMAKE_ARGS+= -DPYTHON_STANDARD_LAYOUT=ON include ../../devel/jrl-cmakemodules/Makefile.common include ../../image/ros-vision-opencv/depend.mk From e3d5d9767483cb74fd7dc97022ae5b3ff7aebed6 Mon Sep 17 00:00:00 2001 From: Ha Thuc Long Date: Wed, 26 Aug 2020 11:36:04 +0000 Subject: [PATCH 3/5] example adder added back --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4ba77e3a..0bfd0b75 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ SUBDIR+= ddp-actuator-solver SUBDIR+= dynamic-graph-tutorial SUBDIR+= dynamic-graph-v3 SUBDIR+= dynamic-introspection -#SUBDIR+= example-adder +SUBDIR+= example-adder SUBDIR+= fcl SUBDIR+= FRILibrary SUBDIR+= hatponboard-lib From 2c3e2fd984455cbc31d3c40f9e7d7c884f139ad8 Mon Sep 17 00:00:00 2001 From: Ha Thuc Long Date: Thu, 10 Sep 2020 08:41:55 +0000 Subject: [PATCH 4/5] Fix WIP packaging for Agimus --- Makefile | 44 +++++++++++++++++++++--------------------- agimus-hpp/Makefile | 2 +- agimus-vision/Makefile | 2 +- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index 0bfd0b75..ec5be4d9 100644 --- a/Makefile +++ b/Makefile @@ -27,25 +27,25 @@ SUBDIR+= hatponboard-lib SUBDIR+= head-action SUBDIR+= hey5-description SUBDIR+= hpp-affordance -#SUBDIR+= infuse-asn1-conversions -#SUBDIR+= infuse-asn1-types -#SUBDIR+= infuse-envire -#SUBDIR+= infuse-idl -#SUBDIR+= infuse-msgs-ros -#SUBDIR+= infuse-novatel-gps-driver-ros +SUBDIR+= infuse-asn1-conversions +SUBDIR+= infuse-asn1-types +SUBDIR+= infuse-envire +SUBDIR+= infuse-idl +SUBDIR+= infuse-msgs-ros +SUBDIR+= infuse-novatel-gps-driver-ros SUBDIR+= jrl-walkgen-v3 SUBDIR+= jsbsim SUBDIR+= libhatp SUBDIR+= libnabo SUBDIR+= libpointmatcher -#SUBDIR+= morse-ros +SUBDIR+= morse-ros SUBDIR+= msgconnector -#SUBDIR+= multicontact-api -#SUBDIR+= octovis +SUBDIR+= multicontact-api +SUBDIR+= octovis SUBDIR+= ompl -#SUBDIR+= openhrp3-hrp2 -#SUBDIR+= openhrp3-simulator-wo-rtm -#SUBDIR+= osg-dae +SUBDIR+= openhrp3-hrp2 +SUBDIR+= openhrp3-simulator-wo-rtm +SUBDIR+= osg-dae SUBDIR+= pal-gazebo-plugins SUBDIR+= pal-gazebo-worlds SUBDIR+= pal-gripper @@ -63,31 +63,31 @@ SUBDIR+= pmb2-simulation SUBDIR+= prf-roboticsgroup-gazebo-plugins SUBDIR+= prf-teleop-tools SUBDIR+= py-bmtools -#SUBDIR+= py-casadi -#SUBDIR+= py-cvxpy +SUBDIR+= py-casadi +SUBDIR+= py-cvxpy SUBDIR+= py-dill SUBDIR+= py-dynamic-graph-bridge-v3 SUBDIR+= py-dynamic-graph-tutorial SUBDIR+= py-dynamic-graph-v3 SUBDIR+= py-ecos -#SUBDIR+= py-example-adder +SUBDIR+= py-example-adder SUBDIR+= py-gurobi SUBDIR+= py-hqp SUBDIR+= py-hpp-affordance-corba -#SUBDIR+= py-hpp-baxter +SUBDIR+= py-hpp-baxter SUBDIR+= py-hpp-bezier-com-traj SUBDIR+= py-hpp-centroidal-dynamics -#SUBDIR+= py-hpp-hrp2 +SUBDIR+= py-hpp-hrp2 SUBDIR+= py-hpp-rbprm SUBDIR+= py-hpp-rbprm-corba SUBDIR+= py-hpp-rbprm-robot-data -#SUBDIR+= py-hpp-romeo +SUBDIR+= py-hpp-romeo SUBDIR+= py-hpp-spline SUBDIR+= py-hpp-universal-robot SUBDIR+= py-libnabo SUBDIR+= py-mavlink SUBDIR+= py-morse -#SUBDIR+= py-mraa +SUBDIR+= py-mraa SUBDIR+= py-multicontact-api SUBDIR+= py-multiprocess SUBDIR+= py-ospi @@ -122,7 +122,7 @@ SUBDIR+= py-talos-rbprm SUBDIR+= py-talos-torque-control SUBDIR+= py-tiago-tutorials SUBDIR+= pyrene-motions -#SUBDIR+= roralink +SUBDIR+= roralink SUBDIR+= ros-aicp-mapping SUBDIR+= ros-four-wheel-steering-msgs SUBDIR+= ros-image-pipeline @@ -152,8 +152,8 @@ SUBDIR+= sot-dynamic-pinocchio-v3 #SUBDIR+= sot-dyninv #SUBDIR+= sot-dyninv-v3 SUBDIR+= soth -#SUBDIR+= sot-hrp2 -#SUBDIR+= sot-hrp2-v3 +SUBDIR+= sot-hrp2 +SUBDIR+= sot-hrp2-v3 SUBDIR+= sot-pattern-generator-v3 SUBDIR+= sot-talos-balance SUBDIR+= sot-tools-v3 diff --git a/agimus-hpp/Makefile b/agimus-hpp/Makefile index 8b86360b..133e7336 100644 --- a/agimus-hpp/Makefile +++ b/agimus-hpp/Makefile @@ -23,4 +23,4 @@ include ../../path/py-hpp-manipulation-corba/depend.mk include ../../devel/ros-catkin/depend.mk include ../../mk/language/c.mk include ../../mk/language/c++.mk -include ../../mk/robotpkg.mk +include ../../mk/robotpkg.mk \ No newline at end of file diff --git a/agimus-vision/Makefile b/agimus-vision/Makefile index 441aeb9a..3ae8587f 100644 --- a/agimus-vision/Makefile +++ b/agimus-vision/Makefile @@ -13,7 +13,7 @@ LICENSE= 2-clause-bsd CATEGORIES= wip COMMENT= Computer vision for Agimus -CMAKE_ARGS+= -DPYTHON_STANDARD_LAYOUT=ON + include ../../devel/jrl-cmakemodules/Makefile.common include ../../image/ros-vision-opencv/depend.mk From 1115d70d5c9f6768ab80b67fa7f63097e0007788 Mon Sep 17 00:00:00 2001 From: Ha Thuc Long Date: Thu, 10 Sep 2020 12:36:21 +0000 Subject: [PATCH 5/5] update for WIP --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index ec5be4d9..da452229 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,9 @@ SUBDIR+= hatponboard-lib SUBDIR+= head-action SUBDIR+= hey5-description SUBDIR+= hpp-affordance +SUBDIR+= hpp-benchmark +SUBDIR+= hrp2-14-description +SUBDIR+= hrp2-dev SUBDIR+= infuse-asn1-conversions SUBDIR+= infuse-asn1-types SUBDIR+= infuse-envire