From 6a4042caca55bcba1fd0faa68853f588bf6e8129 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Fri, 14 Oct 2016 21:50:07 -0400 Subject: [PATCH 1/4] Update changelog --- CHANGELOG.md | 2 +- debian/changelog | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b1f4e9abe4b4..7160423efbf58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## DART 6 -### DART 6.1.1 (201X-XX-XX) +### DART 6.1.1 (201X-10-14) * Build diff --git a/debian/changelog b/debian/changelog index e80f5e9fbee8a..9bd0ce448bdf1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +dart6 (6.1.1) unstable; urgency=medium + + * Modified to build DART without SIMD options by default + * Modified to build external libraries as separately build targets + * Modified to export CMake target files separately per target + * Updated lodepng up to version 20160501 + + -- Jeongseok Lee Fri, 14 Oct 2016 23:59:00 -0500 + dart6 (6.1.0) unstable; urgency=medium * Added 'computeLagrangian()' to 'MetaSkeleton' and 'BodyNode' From b032b68838a920234a1f568cd5801f1a835cb701 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Fri, 14 Oct 2016 22:03:05 -0400 Subject: [PATCH 2/4] [debian] Suppress warnings --- debian/control | 54 ++++++++++++++++++++++++++---------------------- debian/copyright | 1 - 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/debian/control b/debian/control index 6a2512246decd..f8dbfa1aa1449 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 9), libboost-regex-dev (>= 1.54.0-4ubuntu3), libopenthreads-dev, libopenscenegraph-dev -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 Section: libs Homepage: http://dartsim.github.io/ Vcs-Git: git://github.com/dartsim/dart.git @@ -33,10 +33,11 @@ Section: libs Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Description: dear imgui (AKA ImGui), is a bloat-free graphical user interface -library for C++. It outputs optimized vertex buffers that you can render anytime -in your 3D-pipeline enabled application. It is fast, portable, renderer agnostic -and self-contained (no external dependencies). +Description: dear imgui (AKA ImGui) - Shared Files + dear imgui (AKA ImGui), is a bloat-free graphical user interface library for + C++. It outputs optimized vertex buffers that you can render anytime in your + 3D-pipeline enabled application. It is fast, portable, renderer agnostic and + self-contained (no external dependencies). Package: libdart6-external-imgui-dev Section: libdevel @@ -44,19 +45,21 @@ Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, libdart6-external-imgui (= ${binary:Version}) -Description: dear imgui (AKA ImGui), is a bloat-free graphical user interface -library for C++. It outputs optimized vertex buffers that you can render anytime -in your 3D-pipeline enabled application. It is fast, portable, renderer agnostic -and self-contained (no external dependencies). +Description: dear imgui (AKA ImGui) - Development + dear imgui (AKA ImGui), is a bloat-free graphical user interface library for + C++. It outputs optimized vertex buffers that you can render anytime in your + 3D-pipeline enabled application. It is fast, portable, renderer agnostic and + self-contained (no external dependencies). Package: libdart6-external-lodepng Section: libs Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Description: LodePNG is a PNG image decoder and encoder, all in one, no -dependency or linkage to zlib or libpng required. It's made for C (ISO C90), and -has a C++ wrapper with a more convenient interface on top. +Description: LodePNG - Shared Files + LodePNG is a PNG image decoder and encoder, all in one, no dependency or + linkage to zlib or libpng required. It's made for C (ISO C90), and has a C++ + wrapper with a more convenient interface on top. Package: libdart6-external-lodepng-dev Section: libdevel @@ -64,20 +67,21 @@ Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, libdart6-external-lodepng (= ${binary:Version}) -Description: LodePNG is a PNG image decoder and encoder, all in one, no -dependency or linkage to zlib or libpng required. It's made for C (ISO C90), and -has a C++ wrapper with a more convenient interface on top. +Description: LodePNG - Development Files + LodePNG is a PNG image decoder and encoder, all in one, no dependency or + linkage to zlib or libpng required. It's made for C (ISO C90), and has a C++ + wrapper with a more convenient interface on top. Package: libdart6-external-odelcpsolver Section: libs Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Description: ODE is a free, industrial quality library for simulating -articulated rigid body dynamics - for example ground vehicles, legged creatures, -and moving objects in VR environments. It is fast, flexible, robust and platform -independent, with advanced joints, contact with friction, and built-in collision -detection. +Description: Open Dynamics Engine - Shared Library + ODE is a free, industrial quality library for simulating articulated rigid body + dynamics - for example ground vehicles, legged creatures, and moving objects in + VR environments. It is fast, flexible, robust and platform independent, with + advanced joints, contact with friction, and built-in collision detection. Package: libdart6-external-odelcpsolver-dev Section: libdevel @@ -85,11 +89,11 @@ Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, libdart6-external-odelcpsolver (= ${binary:Version}) -Description: ODE is a free, industrial quality library for simulating -articulated rigid body dynamics - for example ground vehicles, legged creatures, -and moving objects in VR environments. It is fast, flexible, robust and platform -independent, with advanced joints, contact with friction, and built-in collision -detection. +Description: Open Dynamics Engine - Development Files + ODE is a free, industrial quality library for simulating articulated rigid body + dynamics - for example ground vehicles, legged creatures, and moving objects in + VR environments. It is fast, flexible, robust and platform independent, with + advanced joints, contact with friction, and built-in collision detection. Package: libdart6 Section: libs diff --git a/debian/copyright b/debian/copyright index 5f0159707e51b..1e31290244952 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,6 @@ Files: * Copyright: 2008-2016 Georgia Tech Research Corporation 2016 Carnegie Mellon University License: BSD-2-clause - Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: From af03c17ab71790618bb33c50142ef0ee7c147cfc Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Fri, 14 Oct 2016 22:56:55 -0400 Subject: [PATCH 3/4] [debian] Fix location of installed cmake files --- debian/libdart6-collision-bullet-dev.install | 6 +++--- debian/libdart6-dev.install | 10 +++++----- debian/libdart6-external-imgui-dev.install | 6 +++--- debian/libdart6-external-lodepng-dev.install | 6 +++--- debian/libdart6-external-odelcpsolver-dev.install | 6 +++--- debian/libdart6-gui-dev.install | 6 +++--- debian/libdart6-gui-osg-dev.install | 6 +++--- debian/libdart6-optimizer-ipopt-dev.install | 6 +++--- debian/libdart6-optimizer-nlopt-dev.install | 6 +++--- debian/libdart6-planning-dev.install | 6 +++--- debian/libdart6-utils-dev.install | 6 +++--- debian/libdart6-utils-urdf-dev.install | 6 +++--- 12 files changed, 38 insertions(+), 38 deletions(-) diff --git a/debian/libdart6-collision-bullet-dev.install b/debian/libdart6-collision-bullet-dev.install index 3360614ae809c..fb759caba56a6 100644 --- a/debian/libdart6-collision-bullet-dev.install +++ b/debian/libdart6-collision-bullet-dev.install @@ -1,6 +1,6 @@ usr/include/dart/collision/bullet/* usr/lib/libdart-collision-bullet.so -usr/share/dart/dart_collision-bulletTargets.cmake -usr/share/dart/dart_collision-bulletTargets-*.cmake -usr/share/dart/dart_collision-bulletComponent.cmake +usr/share/dart/cmake/dart_collision-bulletTargets.cmake +usr/share/dart/cmake/dart_collision-bulletTargets-*.cmake +usr/share/dart/cmake/dart_collision-bulletComponent.cmake diff --git a/debian/libdart6-dev.install b/debian/libdart6-dev.install index b0128e238fd1e..a2828a492f93c 100644 --- a/debian/libdart6-dev.install +++ b/debian/libdart6-dev.install @@ -12,9 +12,9 @@ usr/include/dart/math/* usr/include/dart/optimizer/*.* usr/include/dart/simulation/* usr/lib/libdart.so -usr/share/dart/dartConfig.cmake -usr/share/dart/dartConfigVersion.cmake -usr/share/dart/dart_dartTargets.cmake -usr/share/dart/dart_dartTargets-*.cmake -usr/share/dart/dart_dartComponent.cmake +usr/share/dart/cmake/dartConfig.cmake +usr/share/dart/cmake/dartConfigVersion.cmake +usr/share/dart/cmake/dart_dartTargets.cmake +usr/share/dart/cmake/dart_dartTargets-*.cmake +usr/share/dart/cmake/dart_dartComponent.cmake diff --git a/debian/libdart6-external-imgui-dev.install b/debian/libdart6-external-imgui-dev.install index 90aa10295456f..89e1a27123068 100644 --- a/debian/libdart6-external-imgui-dev.install +++ b/debian/libdart6-external-imgui-dev.install @@ -1,6 +1,6 @@ usr/include/dart/external/imgui/* usr/lib/libdart-external-imgui.so -usr/share/dart/dart_external-imguiTargets.cmake -usr/share/dart/dart_external-imguiTargets-*.cmake -usr/share/dart/dart_external-imguiComponent.cmake +usr/share/dart/cmake/dart_external-imguiTargets.cmake +usr/share/dart/cmake/dart_external-imguiTargets-*.cmake +usr/share/dart/cmake/dart_external-imguiComponent.cmake diff --git a/debian/libdart6-external-lodepng-dev.install b/debian/libdart6-external-lodepng-dev.install index e5f54a4bc2b17..fe521eb50d809 100644 --- a/debian/libdart6-external-lodepng-dev.install +++ b/debian/libdart6-external-lodepng-dev.install @@ -1,6 +1,6 @@ usr/include/dart/external/lodepng/* usr/lib/libdart-external-lodepng.so -usr/share/dart/dart_external-lodepngTargets.cmake -usr/share/dart/dart_external-lodepngTargets-*.cmake -usr/share/dart/dart_external-lodepngComponent.cmake +usr/share/dart/cmake/dart_external-lodepngTargets.cmake +usr/share/dart/cmake/dart_external-lodepngTargets-*.cmake +usr/share/dart/cmake/dart_external-lodepngComponent.cmake diff --git a/debian/libdart6-external-odelcpsolver-dev.install b/debian/libdart6-external-odelcpsolver-dev.install index 0543d4d8c0ea4..179b41edb4978 100644 --- a/debian/libdart6-external-odelcpsolver-dev.install +++ b/debian/libdart6-external-odelcpsolver-dev.install @@ -1,6 +1,6 @@ usr/include/dart/external/odelcpsolver/* usr/lib/libdart-external-odelcpsolver.so -usr/share/dart/dart_external-odelcpsolverTargets.cmake -usr/share/dart/dart_external-odelcpsolverTargets-*.cmake -usr/share/dart/dart_external-odelcpsolverComponent.cmake +usr/share/dart/cmake/dart_external-odelcpsolverTargets.cmake +usr/share/dart/cmake/dart_external-odelcpsolverTargets-*.cmake +usr/share/dart/cmake/dart_external-odelcpsolverComponent.cmake diff --git a/debian/libdart6-gui-dev.install b/debian/libdart6-gui-dev.install index e088da1c9534b..2703d5968edc0 100644 --- a/debian/libdart6-gui-dev.install +++ b/debian/libdart6-gui-dev.install @@ -1,6 +1,6 @@ usr/include/dart/gui/*.* usr/lib/libdart-gui.so -usr/share/dart/dart_guiTargets.cmake -usr/share/dart/dart_guiTargets-*.cmake -usr/share/dart/dart_guiComponent.cmake +usr/share/dart/cmake/dart_guiTargets.cmake +usr/share/dart/cmake/dart_guiTargets-*.cmake +usr/share/dart/cmake/dart_guiComponent.cmake diff --git a/debian/libdart6-gui-osg-dev.install b/debian/libdart6-gui-osg-dev.install index 7f8ae05e80604..4716f6c902937 100644 --- a/debian/libdart6-gui-osg-dev.install +++ b/debian/libdart6-gui-osg-dev.install @@ -1,6 +1,6 @@ usr/include/dart/gui/osg/* usr/lib/libdart-gui-osg.so -usr/share/dart/dart_gui-osgTargets.cmake -usr/share/dart/dart_gui-osgTargets-*.cmake -usr/share/dart/dart_gui-osgComponent.cmake +usr/share/dart/cmake/dart_gui-osgTargets.cmake +usr/share/dart/cmake/dart_gui-osgTargets-*.cmake +usr/share/dart/cmake/dart_gui-osgComponent.cmake diff --git a/debian/libdart6-optimizer-ipopt-dev.install b/debian/libdart6-optimizer-ipopt-dev.install index 3b7528f9da480..632bad3c14b45 100644 --- a/debian/libdart6-optimizer-ipopt-dev.install +++ b/debian/libdart6-optimizer-ipopt-dev.install @@ -1,5 +1,5 @@ usr/include/dart/optimizer/ipopt/* usr/lib/libdart-optimizer-ipopt.so -usr/share/dart/dart_optimizer-ipoptTargets.cmake -usr/share/dart/dart_optimizer-ipoptTargets-*.cmake -usr/share/dart/dart_optimizer-ipoptComponent.cmake +usr/share/dart/cmake/dart_optimizer-ipoptTargets.cmake +usr/share/dart/cmake/dart_optimizer-ipoptTargets-*.cmake +usr/share/dart/cmake/dart_optimizer-ipoptComponent.cmake diff --git a/debian/libdart6-optimizer-nlopt-dev.install b/debian/libdart6-optimizer-nlopt-dev.install index 33297edc2757b..81bf0a31fe08b 100644 --- a/debian/libdart6-optimizer-nlopt-dev.install +++ b/debian/libdart6-optimizer-nlopt-dev.install @@ -1,6 +1,6 @@ usr/include/dart/optimizer/nlopt/* usr/lib/libdart-optimizer-nlopt.so -usr/share/dart/dart_optimizer-ipoptTargets.cmake -usr/share/dart/dart_optimizer-ipoptTargets-*.cmake -usr/share/dart/dart_optimizer-ipoptComponent.cmake +usr/share/dart/cmake/dart_optimizer-ipoptTargets.cmake +usr/share/dart/cmake/dart_optimizer-ipoptTargets-*.cmake +usr/share/dart/cmake/dart_optimizer-ipoptComponent.cmake diff --git a/debian/libdart6-planning-dev.install b/debian/libdart6-planning-dev.install index 2e486aee6bec3..94c46c85bbcb7 100644 --- a/debian/libdart6-planning-dev.install +++ b/debian/libdart6-planning-dev.install @@ -1,5 +1,5 @@ usr/include/dart/planning/* usr/lib/libdart-planning.so -usr/share/dart/dart_planningTargets.cmake -usr/share/dart/dart_planningTargets-*.cmake -usr/share/dart/dart_planningComponent.cmake +usr/share/dart/cmake/dart_planningTargets.cmake +usr/share/dart/cmake/dart_planningTargets-*.cmake +usr/share/dart/cmake/dart_planningComponent.cmake diff --git a/debian/libdart6-utils-dev.install b/debian/libdart6-utils-dev.install index 4a30c32cd74d5..8bc205072b43d 100644 --- a/debian/libdart6-utils-dev.install +++ b/debian/libdart6-utils-dev.install @@ -1,7 +1,7 @@ usr/include/dart/utils/*.* usr/include/dart/utils/sdf/*.* usr/lib/libdart-utils.so -usr/share/dart/dart_utilsTargets.cmake -usr/share/dart/dart_utilsTargets-*.cmake -usr/share/dart/dart_utilsComponent.cmake +usr/share/dart/cmake/dart_utilsTargets.cmake +usr/share/dart/cmake/dart_utilsTargets-*.cmake +usr/share/dart/cmake/dart_utilsComponent.cmake diff --git a/debian/libdart6-utils-urdf-dev.install b/debian/libdart6-utils-urdf-dev.install index d646c04d986a2..414044b25a262 100644 --- a/debian/libdart6-utils-urdf-dev.install +++ b/debian/libdart6-utils-urdf-dev.install @@ -1,6 +1,6 @@ usr/include/dart/utils/urdf/* usr/lib/libdart-utils-urdf.so -usr/share/dart/dart_utils-urdfTargets.cmake -usr/share/dart/dart_utils-urdfTargets-*.cmake -usr/share/dart/dart_utils-urdfComponent.cmake +usr/share/dart/cmake/dart_utils-urdfTargets.cmake +usr/share/dart/cmake/dart_utils-urdfTargets-*.cmake +usr/share/dart/cmake/dart_utils-urdfComponent.cmake From f8958325e9494f03ac7f02bc5d73fdbe8c4587c6 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Fri, 14 Oct 2016 23:45:19 -0400 Subject: [PATCH 4/4] [debian] Fix cmake config file name --- debian/libdart6-dev.install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/libdart6-dev.install b/debian/libdart6-dev.install index a2828a492f93c..d5804855e3f26 100644 --- a/debian/libdart6-dev.install +++ b/debian/libdart6-dev.install @@ -12,8 +12,8 @@ usr/include/dart/math/* usr/include/dart/optimizer/*.* usr/include/dart/simulation/* usr/lib/libdart.so -usr/share/dart/cmake/dartConfig.cmake -usr/share/dart/cmake/dartConfigVersion.cmake +usr/share/dart/cmake/DARTConfig.cmake +usr/share/dart/cmake/DARTConfigVersion.cmake usr/share/dart/cmake/dart_dartTargets.cmake usr/share/dart/cmake/dart_dartTargets-*.cmake usr/share/dart/cmake/dart_dartComponent.cmake