Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
robotpkg-wip
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Gepetto
robotpkg-wip
Commits
895b9bbb
Commit
895b9bbb
authored
5 years ago
by
Guilhem Saurel
Browse files
Options
Downloads
Patches
Plain Diff
[wip/{py-,}sot-torque-control] use jrl-cmakemodules
to fix PLIST
parent
368f1af1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
py-sot-torque-control/Makefile
+2
-9
2 additions, 9 deletions
py-sot-torque-control/Makefile
py-sot-torque-control/PLIST
+4
-0
4 additions, 0 deletions
py-sot-torque-control/PLIST
sot-torque-control/Makefile
+1
-8
1 addition, 8 deletions
sot-torque-control/Makefile
with
7 additions
and
17 deletions
py-sot-torque-control/Makefile
+
2
−
9
View file @
895b9bbb
...
...
@@ -7,22 +7,15 @@ NAME= sot-torque-control
VERSION
=
1.4.0
PKGREVISION
=
1
DISTNAME
=
${
NAME
}
-
${
VERSION
}
PKGNAME
=
${
PKGTAG.python-
}${
DISTNAME
}
MASTER_SITES
=
${
MASTER_SITE_OPENROBOTS:
=
${
NAME
}
/
}
MASTER_REPOSITORY
=
${
MASTER_REPOSITORY_GITHUB
}${
ORG
}
/
${
NAME
}
CHECKOUT_VCS_OPTS
=
--recursive
CATEGORIES
=
wip
COMMENT
=
Torque control
for
humanoids
(
python bindings
)
LICENSE
=
2-clause-bsd
MAINTAINER
=
gepetto-soft@laas.fr
CMAKE_ARGS
+=
-DINSTALL_DOCUMENTATION
=
OFF
USE_PYTHON_ONLY
=
true
include
../../${CATEGORIES}/${NAME}/depend.mk
include
../../wip/jrl-cmakemodules/Makefile.common
include
../../devel/boost-headers/depend.mk
include
../../devel/boost-libs/depend.mk
include
../../graphics/simple-humanoid-description/depend.mk
...
...
This diff is collapsed.
Click to expand it.
py-sot-torque-control/PLIST
+
4
−
0
View file @
895b9bbb
@comment Fri Jul 27 14:47:41 CEST 2018
${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/admittance_controller/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/admittance_controller/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/base_estimator/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/base_estimator/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/control_manager/__init__.py
...
...
@@ -7,6 +9,8 @@ ${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/control_manager/wrap${PYTHON_
${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/create_entities_utils.py
${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/current_controller/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/current_controller/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/ddp_actuator_solver/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/ddp_actuator_solver/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/device_torque_ctrl/__init__.py
${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/device_torque_ctrl/wrap${PYTHON_EXT_SUFFIX}
${PYTHON_SITELIB}/dynamic_graph/sot/torque_control/free_flyer_locator/__init__.py
...
...
This diff is collapsed.
Click to expand it.
sot-torque-control/Makefile
+
1
−
8
View file @
895b9bbb
...
...
@@ -7,12 +7,6 @@ NAME= sot-torque-control
VERSION
=
1.4.0
PKGREVISION
=
1
DISTNAME
=
${
NAME
}
-
${
VERSION
}
MASTER_SITES
=
${
MASTER_SITE_OPENROBOTS:
=
${
NAME
}
/
}
MASTER_REPOSITORY
=
${
MASTER_REPOSITORY_GITHUB
}${
ORG
}
/
${
NAME
}
.git
CHECKOUT_VCS_OPTS
=
--recursive
CATEGORIES
=
wip
COMMENT
=
Torque control
for
humanoids
LICENSE
=
2-clause-bsd
...
...
@@ -20,8 +14,7 @@ MAINTAINER= gepetto-soft@laas.fr
CMAKE_ARGS
+=
-DBUILD_PYTHON_INTERFACE
=
OFF
DYNAMIC_PLIST_DIRS
+=
share/doc/
${
NAME
}
include
../../wip/jrl-cmakemodules/Makefile.common
include
../../devel/boost-headers/depend.mk
include
../../devel/boost-libs/depend.mk
include
../../graphics/simple-humanoid-description/depend.mk
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment