Updates for Windows compatibility

RoboStack · Jan 9, 2025 · 1815dc5 · 1815dc5
1 parent f9c7e0f
commit 1815dc5
Show file tree

Hide file tree

Showing 18 changed files with 66 additions and 53 deletions.
diff --git a/additional_recipes/ros-noetic-eigenpy/recipe.yaml b/additional_recipes/ros-noetic-eigenpy/recipe.yaml
@@ -1,13 +1,15 @@
 package:
   name: ros-noetic-eigenpy
-  version: "3.10.1"
+  # We use 3.10.0 as 3.10.1 is not compatible with numpy 1.26
+  # Once we bump the numpy version, we can update this back to 3.10.1
+  version: "3.10.0"
 
 build:
   number: 21
 
 requirements:
   run:
-    - eigenpy ==3.10.1
+    - eigenpy ==3.10.0
 
 about:
   homepage: https://github.com/conda-forge/eigenpy-feedstock

diff --git a/additional_recipes/ros-noetic-jackal-base/recipe.yaml b/additional_recipes/ros-noetic-jackal-base/recipe.yaml
@@ -11,7 +11,7 @@ extra:
     - robostack
 build:
   number: 21
-  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }}
+  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\..\\..\\bld_catkin.bat' }}
 
 
 source:

diff --git a/additional_recipes/ros-noetic-jackal-control/recipe.yaml b/additional_recipes/ros-noetic-jackal-control/recipe.yaml
@@ -11,7 +11,7 @@ extra:
     - robostack
 build:
   number: 21
-  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }}
+  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\..\\..\\bld_catkin.bat' }}
 
 
 

diff --git a/additional_recipes/ros-noetic-jackal-description/recipe.yaml b/additional_recipes/ros-noetic-jackal-description/recipe.yaml
@@ -11,7 +11,7 @@ extra:
     - robostack
 build:
   number: 21
-  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }}
+  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\..\\..\\bld_catkin.bat' }}
 
 source:
   git: https://github.com/clearpath-gbp/jackal-release.git

diff --git a/additional_recipes/ros-noetic-jackal-desktop/recipe.yaml b/additional_recipes/ros-noetic-jackal-desktop/recipe.yaml
@@ -11,7 +11,7 @@ extra:
     - robostack
 build:
   number: 21
-  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }}
+  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\..\\..\\bld_catkin.bat' }}
 
 
 source:

diff --git a/additional_recipes/ros-noetic-jackal-gazebo/recipe.yaml b/additional_recipes/ros-noetic-jackal-gazebo/recipe.yaml
@@ -11,7 +11,7 @@ extra:
     - robostack
 build:
   number: 21
-  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }}
+  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\..\\..\\bld_catkin.bat' }}
 
 source:
   git: https://github.com/clearpath-gbp/jackal_simulator-release.git

diff --git a/additional_recipes/ros-noetic-jackal-msgs/recipe.yaml b/additional_recipes/ros-noetic-jackal-msgs/recipe.yaml
@@ -11,7 +11,7 @@ extra:
     - robostack
 build:
   number: 21
-  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }}
+  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\..\\..\\bld_catkin.bat' }}
 
 
 source:

diff --git a/additional_recipes/ros-noetic-jackal-navigation/recipe.yaml b/additional_recipes/ros-noetic-jackal-navigation/recipe.yaml
@@ -11,7 +11,7 @@ extra:
     - robostack
 build:
   number: 21
-  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }}
+  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\..\\..\\bld_catkin.bat' }}
 
 
 source:

diff --git a/additional_recipes/ros-noetic-jackal-simulator/recipe.yaml b/additional_recipes/ros-noetic-jackal-simulator/recipe.yaml
@@ -11,7 +11,7 @@ extra:
     - robostack
 build:
   number: 21
-  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }}
+  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\..\\..\\bld_catkin.bat' }}
 
 source:
   git: https://github.com/clearpath-gbp/jackal_simulator-release.git

diff --git a/additional_recipes/ros-noetic-jackal-viz/recipe.yaml b/additional_recipes/ros-noetic-jackal-viz/recipe.yaml
@@ -11,7 +11,7 @@ extra:
     - robostack
 build:
   number: 21
-  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\bld_catkin.bat' }}
+  script: ${{ '$RECIPE_DIR/build_catkin.sh' if unix else '%RECIPE_DIR%\\..\\..\\bld_catkin.bat' }}
 
 
 source:

diff --git a/patch/ros-noetic-moveit-ros-planning.win.patch b/patch/ros-noetic-moveit-ros-planning.win.patch
@@ -144,16 +144,3 @@ index 22a7ee9ee..c2945f930 100644
    /// Definition of the function signature that is called when the execution of all the pushed trajectories completes.
    /// The status of the overall execution is passed as argument
 
-diff --git a/moveit_cpp/CMakeLists.txt b/moveit_cpp/CMakeLists.txt
-index 897af9fc8..6675d1bc6 100644
---- a/moveit_cpp/CMakeLists.txt
-+++ b/moveit_cpp/CMakeLists.txt
-@@ -22,6 +22,8 @@ endif()
-
- install(TARGETS ${MOVEIT_LIB_NAME}
-   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
--  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
-+  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-+  RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
-+  )
-
diff --git a/patch/ros-noetic-openslam-gmapping.win.patch b/patch/ros-noetic-openslam-gmapping.win.patch
@@ -0,0 +1,7 @@
+diff --git a/utils/stat.cpp b/utils/stat.cpp
+index 30536c4..d99056b 100644
+--- a/utils/stat.cpp
++++ b/utils/stat.cpp
+@@ -7,1 +7,1 @@
+-#include <math.h>
++#include <cmath>
diff --git a/patch/ros-noetic-plotjuggler.patch b/patch/ros-noetic-plotjuggler.patch
@@ -604,23 +604,3 @@ index f399fdad..4c89c787 100644
 
  if( Protobuf_FOUND)
 
-diff --git a/3rdparty/sol/sol.hpp b/3rdparty/sol/sol.hpp
-index 0bb68ebe..20855338 100644
---- a/3rdparty/sol/sol.hpp
-+++ b/3rdparty/sol/sol.hpp
-@@ -6747,12 +6747,9 @@ namespace sol {
- 		/// one.
- 		///
- 		/// \group emplace
--		template <class... Args>
--		T& emplace(Args&&... args) noexcept {
--			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
--
--			*this = nullopt;
--			this->construct(std::forward<Args>(args)...);
-+		T& emplace(T& arg) noexcept {
-+				m_value = &arg;
-+				return **this;
- 		}
-
- 		/// Swaps this optional with the other.
diff --git a/patch/ros-noetic-plotjuggler.unix.patch b/patch/ros-noetic-plotjuggler.unix.patch
@@ -0,0 +1,20 @@
+diff --git a/3rdparty/sol/sol.hpp b/3rdparty/sol/sol.hpp
+index 0bb68ebe..20855338 100644
+--- a/3rdparty/sol/sol.hpp
++++ b/3rdparty/sol/sol.hpp
+@@ -6747,12 +6747,9 @@ namespace sol {
+ 		/// one.
+ 		///
+ 		/// \group emplace
+-		template <class... Args>
+-		T& emplace(Args&&... args) noexcept {
+-			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
+-
+-			*this = nullopt;
+-			this->construct(std::forward<Args>(args)...);
++		T& emplace(T& arg) noexcept {
++				m_value = &arg;
++				return **this;
+ 		}
+
+ 		/// Swaps this optional with the other.
diff --git a/patch/ros-noetic-plotjuggler.win.patch b/patch/ros-noetic-plotjuggler.win.patch
@@ -0,0 +1,20 @@
+diff --git a/3rdparty/sol/sol.hpp b/3rdparty/sol/sol.hpp
+index 0bb68ebe..20855338 100644
+--- a/3rdparty/sol/sol.hpp
++++ b/3rdparty/sol/sol.hpp
+@@ -6747,12 +6747,9 @@ namespace sol {
+ 		/// one.
+ 		///
+ 		/// \group emplace
+-		template <class... Args>
+-		T& emplace(Args&&... args) noexcept {
+-			static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args");
+-
+-			*this = nullopt;
+-			this->construct(std::forward<Args>(args)...);
++		T& emplace(T& arg) noexcept {
++				m_value = &arg;
++				return **this;
+ 		}
+
+ 		/// Swaps this optional with the other.
diff --git a/patch/ros-noetic-robot-localization.patch b/patch/ros-noetic-robot-localization.patch
@@ -2,10 +2,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index cc7f334..bb20912 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -49,9 +49,6 @@ if(NOT EIGEN3_FOUND)
-   set(EIGEN_PACKAGE Eigen)
- endif()
-
+@@ -52,6 +52,3 @@ if(NOT EIGEN3_FOUND)
 -if(NOT MSVC)
 -  set_directory_properties(PROPERTIES COMPILE_OPTIONS "-Wall;-Werror")
 -endif()

diff --git a/patch/ros-noetic-robot-localization.win.patch b/patch/ros-noetic-robot-localization.win.patch
@@ -10,12 +10,8 @@ index cc7f3341..eac0a60f 100644
  )
 
  ###########
-@@ -128,8 +127,6 @@ include_directories(
-   ${EIGEN3_INCLUDE_DIRS}
-   ${YAML_CPP_INCLUDE_DIRS})
-
+@@ -131,4 +130,2 @@ include_directories(
 -link_directories(${YAML_CPP_LIBRARY_DIRS})
 -
  # Library definitions
  add_library(filter_utilities src/filter_utilities.cpp)
- add_library(filter_base src/filter_base.cpp)
diff --git a/vinca_win.yaml b/vinca_win.yaml
@@ -124,6 +124,10 @@ packages_select_by_deps:
   - plotjuggler
   - rosserial-arduino
   - tf2_web_republisher
+  # Required by jackal-gazebo
+  - hector-gazebo-plugins
+  # Required by jackal-navigation
+  - gmapping
 
   ##
   ## PREVIOUSLY SUPPORTED PACKAGES, NOW NOT PACKAGED ANYMORE UNTIL REQUESTED