[misc] Update C++ dependencies to latest releases.

duburcqa · Feb 11, 2024 · 58bbf1f · 58bbf1f
1 parent 39a1a24
commit 58bbf1f
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 28 deletions.
diff --git a/build_tools/build_install_deps_unix.sh b/build_tools/build_install_deps_unix.sh
@@ -110,7 +110,7 @@ if [ ! -d "${RootDir}/eigenpy" ]; then
 fi
 cd "${RootDir}/eigenpy"
 git reset --hard
-git fetch origin "v3.1.4" && git checkout --force FETCH_HEAD || true
+git fetch origin "v3.3.0" && git checkout --force FETCH_HEAD || true
 git submodule --quiet foreach --recursive git reset --quiet --hard
 git submodule --quiet update --init --recursive --depth 1 --jobs 8
 git apply --reject --whitespace=fix "${RootDir}/build_tools/patch_deps_unix/eigenpy.patch"
@@ -155,7 +155,7 @@ if [ ! -d "${RootDir}/cppad" ]; then
 fi
 cd "${RootDir}/cppad"
 git reset --hard
-git fetch origin "20230000.0" && git checkout --force FETCH_HEAD || true
+git fetch origin "20240000.2" && git checkout --force FETCH_HEAD || true
 
 ### Checkout CppADCodeGen
 if [ ! -d "${RootDir}/cppadcodegen" ]; then
@@ -180,7 +180,7 @@ if [ ! -d "${RootDir}/hpp-fcl" ]; then
 fi
 cd "${RootDir}/hpp-fcl"
 git reset --hard
-git fetch origin "v2.4.0" && git checkout --force FETCH_HEAD || true
+git fetch origin "v2.4.1" && git checkout --force FETCH_HEAD || true
 git submodule --quiet foreach --recursive git reset --quiet --hard
 git submodule --quiet update --init --recursive --depth 1 --jobs 8
 git apply --reject --whitespace=fix "${RootDir}/build_tools/patch_deps_unix/hppfcl.patch"
@@ -194,7 +194,7 @@ if [ ! -d "${RootDir}/pinocchio" ]; then
 fi
 cd "${RootDir}/pinocchio"
 git reset --hard
-git fetch origin "v2.6.21" && git checkout --force FETCH_HEAD || true
+git fetch origin "v2.7.0" && git checkout --force FETCH_HEAD || true
 git submodule --quiet foreach --recursive git reset --quiet --hard
 git submodule --quiet update --init --recursive --depth 1 --jobs 8
 git apply --reject --whitespace=fix "${RootDir}/build_tools/patch_deps_unix/pinocchio.patch"

diff --git a/build_tools/build_install_deps_windows.ps1 b/build_tools/build_install_deps_windows.ps1
@@ -108,7 +108,7 @@ if (-not (Test-Path -PathType Container "$RootDir/eigenpy")) {
 }
 Push-Location -Path "$RootDir/eigenpy"
 git reset --hard
-git fetch origin "v3.1.4"
+git fetch origin "v3.3.0"
 git checkout --force FETCH_HEAD
 git submodule --quiet foreach --recursive git reset --quiet --hard
 git submodule --quiet update --init --recursive --depth 1 --jobs 8
@@ -164,7 +164,7 @@ if (-not (Test-Path -PathType Container "$RootDir/cppad")) {
 }
 Push-Location -Path "$RootDir/cppad"
 git reset --hard
-git fetch origin "20230000.0"
+git fetch origin "20240000.2"
 git checkout --force FETCH_HEAD
 Pop-Location
 
@@ -195,7 +195,7 @@ if (-not (Test-Path -PathType Container "$RootDir/hpp-fcl")) {
 }
 Push-Location -Path "$RootDir/hpp-fcl"
 git reset --hard
-git fetch origin "v2.4.0"
+git fetch origin "v2.4.1"
 git checkout --force FETCH_HEAD
 git submodule --quiet foreach --recursive git reset --quiet --hard
 git submodule --quiet update --init --recursive --depth 1 --jobs 8
@@ -214,7 +214,7 @@ if (-not (Test-Path -PathType Container "$RootDir/pinocchio")) {
 }
 Push-Location -Path "$RootDir/pinocchio"
 git reset --hard
-git fetch origin "v2.6.21"
+git fetch origin "v2.7.0"
 git checkout --force FETCH_HEAD
 git submodule --quiet foreach --recursive git reset --quiet --hard
 git submodule --quiet update --init --recursive --depth 1 --jobs 8

diff --git a/build_tools/easy_install_deps_ubuntu.sh b/build_tools/easy_install_deps_ubuntu.sh
@@ -81,8 +81,8 @@ fi
 # Note that `apt-get` is used instead of `apt` because it supports wildcard in package names
 apt-mark unhold "robotpkg-py3*-eigenpy" "robotpkg-py3*-hpp-fcl" "robotpkg-py3*-pinocchio"
 apt-get install -y --allow-downgrades --allow-unauthenticated \
-    robotpkg-urdfdom-headers=1.0.4 robotpkg-hpp-fcl=2.4.0 robotpkg-pinocchio=2.6.21 \
-    robotpkg-py3*-eigenpy=3.1.4 robotpkg-py3*-hpp-fcl=2.4.0 robotpkg-py3*-pinocchio=2.6.21
+    robotpkg-urdfdom-headers=1.0.4 robotpkg-hpp-fcl=2.4.1 robotpkg-pinocchio=2.7.0 \
+    robotpkg-py3*-eigenpy=3.3.0 robotpkg-py3*-hpp-fcl=2.4.1 robotpkg-py3*-pinocchio=2.7.0
 apt-mark hold "robotpkg-py3*-eigenpy" "robotpkg-py3*-hpp-fcl" "robotpkg-py3*-pinocchio"
 
 # Add openrobots libraries to python packages search path

diff --git a/build_tools/patch_deps_unix/hppfcl.patch b/build_tools/patch_deps_unix/hppfcl.patch
@@ -15,17 +15,17 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
  SET_BOOST_DEFAULT_OPTIONS()
  EXPORT_BOOST_DEFAULT_OPTIONS()
 -IF(WIN32)
--  ADD_PROJECT_DEPENDENCY(Boost REQUIRED COMPONENTS chrono thread date_time serialization)
+-  ADD_PROJECT_DEPENDENCY(Boost REQUIRED COMPONENTS chrono thread date_time serialization filesystem)
 -ELSE(WIN32)
--  ADD_PROJECT_DEPENDENCY(Boost REQUIRED chrono serialization)
+-  ADD_PROJECT_DEPENDENCY(Boost REQUIRED chrono serialization filesystem)
 -ENDIF(WIN32)
  if(BUILD_PYTHON_INTERFACE)
    find_package(Boost REQUIRED COMPONENTS system)
  endif(BUILD_PYTHON_INTERFACE)
 +IF(WIN32)
-+  ADD_PROJECT_DEPENDENCY(Boost REQUIRED COMPONENTS chrono thread date_time serialization)
++  ADD_PROJECT_DEPENDENCY(Boost REQUIRED COMPONENTS chrono thread date_time serialization filesystem)
 +ELSE(WIN32)
-+  ADD_PROJECT_DEPENDENCY(Boost REQUIRED chrono serialization)
++  ADD_PROJECT_DEPENDENCY(Boost REQUIRED chrono serialization filesystem)
 +ENDIF(WIN32)
 
  if(Boost_VERSION_STRING VERSION_LESS 1.81)

diff --git a/build_tools/patch_deps_windows/hppfcl.patch b/build_tools/patch_deps_windows/hppfcl.patch
@@ -10,7 +10,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
  if(BUILD_PYTHON_INTERFACE)
    FIND_PACKAGE(eigenpy 2.7.10 REQUIRED)
 @@ -121,34 +122,24 @@
-   ADD_PROJECT_DEPENDENCY(Boost REQUIRED chrono serialization)
+   ADD_PROJECT_DEPENDENCY(Boost REQUIRED chrono serialization filesystem)
  ENDIF(WIN32)
  if(BUILD_PYTHON_INTERFACE)
 +  ADD_PROJECT_DEPENDENCY(Boost REQUIRED system)

diff --git a/build_tools/patch_deps_windows/pinocchio.patch b/build_tools/patch_deps_windows/pinocchio.patch
@@ -83,16 +83,3 @@ diff --git a/cmake/boost.cmake b/cmake/boost.cmake
      set(Boost_NO_BOOST_CMAKE ON)
    endif("${Boost_SHORT_VERSION}" VERSION_GREATER "1.70"
          OR "${Boost_SHORT_VERSION}" VERSION_EQUAL "1.70")
-diff --git a/bindings/python/utils/conversions.cpp b/bindings/python/utils/conversions.cpp
-index 87800d2b..c73707e5 100644
---- a/bindings/python/utils/conversions.cpp
-+++ b/bindings/python/utils/conversions.cpp
-@@ -37,7 +37,7 @@ namespace pinocchio
-     template <typename TupleOrList>
-     SE3 XYZQUATToSE3_bp(const TupleOrList& v)
-     {
--      ssize_t size = bp::len(v);
-+      bp::ssize_t size = bp::len(v);
-       if(size != 7)
-       {
-         throw std::invalid_argument(