Merge pull request #16 from RoboStack/featureparitywin

Enable more packages on Windows

Author: Tobias-Fischer

.github/workflows/main.yml

@@ -20,7 +20,7 @@ jobs:
         python-version: '3.11' # Version range or exact version of a Python version to use, using SemVer's version range syntax
     - name: Install vinca
       run: |
-        pip install git+https://github.com/RoboStack/vinca.git@rattler-build-humble
+        pip install git+https://github.com/RoboStack/vinca.git
 
     - name: Generate recipes for linux-64
       run: |

.github/workflows/testpr.yml

@@ -14,7 +14,7 @@ jobs:
         include:
           - os: ubuntu-latest
             platform: linux-64
-          - os: cirun-linux-aarch64--${{ github.run_id }}
+          - os: ubuntu-24.04-arm
             platform: linux-aarch64
           - os: macos-13
             platform: osx-64
@@ -45,22 +45,6 @@ jobs:
         # git in C:\Program Files\Git\bin is used by pip install git+
         dirs: 'C:\Program Files\Git\usr\bin;C:\Program Files\Git\bin;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin'
 
-    # - shell: bash -l {0}
-    #   if: matrix.platform == 'linux-aarch64'
-    #   run: |
-    #     echo "::group::Configure binfmt_misc"
-    #     docker run --rm --privileged multiarch/qemu-user-static:register --reset --credential yes
-    #     export FEEDSTOCK_NAME="$(basename $GITHUB_REPOSITORY)"
-    #     export GIT_BRANCH="$(basename $GITHUB_REF)"
-    #     echo "::endgroup::"
-
-    - name: Install libgl1-mesa-dev (only for linux-aarch64)
-      if: matrix.platform == 'linux-aarch64'
-      shell: bash -l {0}
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y libgl1-mesa-dev libglu1-mesa-dev libx11-dev libxi-dev libxmu-dev
-
     # For some reason, the Strawberry perl's pkg-config is found
     # instead of the conda's one, so let's delete the /c/Strawberry directory
     # Furthermore, we also need to remove an older SDK that is used and can result in compilation problems

conda_build_config.yaml

@@ -6,28 +6,38 @@ protobuf:
   - 5.28.2
 spdlog:
   - 1.14
+pugixml:
+  - '1.14'
 
-cdt_name:
-  - ${{ "cos7" if linux }}
+cdt_name:  # [linux]
+  - conda  # [linux]
 
 python:
   - 3.11.* *_cpython
 python_impl:
   - cpython
 
-c_stdlib:
-  - ${{ "sysroot" if linux }}
-  - ${{ "macosx_deployment_target" if osx }}
-  - ${{ "vs" if win }}
-c_stdlib_version:
-  - ${{ "2.17" if linux }}
-  - ${{ "10.14" if osx and x86_64 }}
-  - ${{ "11.0" if osx and arm64 }}
 c_compiler:
-  - ${{ "gcc" if linux }}
-  - ${{ "clang" if osx }}
-  - ${{ "vs2019" if win }}
+  - gcc                        # [linux]
+  - clang                      # [osx]
+  - vs2019                     # [win and x86_64]
+  - vs2022                     # [win and arm64]
+c_compiler_version:            # [unix]
+  - 13                         # [linux]
+  - 18                         # [osx]
+c_stdlib:
+  - sysroot                    # [linux]
+  - macosx_deployment_target   # [osx]
+  - vs                         # [win]
+c_stdlib_version:              # [unix]
+  - 2.17                       # [linux]
+  - 10.13                      # [osx and x86_64]
+  - 11.0                       # [osx and arm64]
 cxx_compiler:
-  - ${{ "gxx" if linux }}
-  - ${{ "clangxx" if osx }}
-  - ${{ "vs2019" if win }}
+  - gxx                        # [linux]
+  - clangxx                    # [osx]
+  - vs2019                     # [win and x86_64]
+  - vs2022                     # [win and arm64]
+cxx_compiler_version:          # [unix]
+  - 13                         # [linux]
+  - 18                         # [osx]

env/robostackenv.yaml

@@ -14,4 +14,4 @@ dependencies:
 - rattler-build
 - pip
 - pip:
-  - git+https://github.com/RoboStack/vinca.git@rattler-build-humble
+  - git+https://github.com/RoboStack/vinca.git

patch/dependencies.yaml

@@ -42,8 +42,8 @@ pcl_ros:
   add_host: ["REQUIRE_OPENGL", "libboost-devel"]
 rviz_rendering:
   add_host: ["glew"]
-behaviortree_cpp_v3:
-  add_host: ["libboost-devel", "cppzmq"]
+behaviortree_cpp:
+  add_host: ["libboost-devel", "cppzmq", "zeromq", "sqlite"]
   add_run: ["libboost"]
 plotjuggler:
   add_host: ["libxcb", "${{ 'elfutils' if linux }}", "ros-jazzy-ros-workspace"]
@@ -157,7 +157,7 @@ rqt_image_overlay:
   add_host: ["REQUIRE_OPENGL"]
 slam_toolbox:
   add_build: ["${{ 'qt-main' if (build_platform != target_platform) }}"]
-  add_host: ["REQUIRE_OPENGL"]
+  add_host: ["REQUIRE_OPENGL", "blas-devel"]
 vision_msgs_rviz_plugins:
   add_build: ["${{ 'qt-main' if (build_platform != target_platform) }}"]
   add_host: ["REQUIRE_OPENGL"]

patch/ros-jazzy-angles.win.patch

@@ -0,0 +1,11 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f909972..5b6b6e8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,3 +19,6 @@ find_package(ament_cmake REQUIRED)
++if(WIN32)
++  target_compile_definitions(angles INTERFACE _USE_MATH_DEFINES)
++endif()
+ 
+ if(BUILD_TESTING)
+   find_package(ament_cmake_gtest REQUIRED)

patch/ros-jazzy-behaviortree-cpp.win.patch

@@ -0,0 +1,24 @@
+diff --git a/cmake/ament_build.cmake b/cmake/ament_build.cmake
+index 55c3011b2..152268032 100644
+--- a/cmake/ament_build.cmake
++++ b/cmake/ament_build.cmake
+@@ -10,7 +10,10 @@ if(BTCPP_SQLITE_LOGGING)
+     find_package(SQLite3 REQUIRED)
+ endif()
+ 
+-find_package(ament_index_cpp REQUIRED)
++find_package(ament_index_cpp REQUIRED)
++
++set(BTCPP_EXTRA_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIRS}
++                             ${SQLite3_INCLUDE_DIRS})
+ 
+ set( BTCPP_EXTRA_LIBRARIES
+     $<BUILD_INTERFACE:ament_index_cpp::ament_index_cpp>
+@@ -26,6 +29,7 @@ set( BTCPP_BIN_DESTINATION     bin )
+ 
+ mark_as_advanced(
+     BTCPP_EXTRA_LIBRARIES
++    BTCPP_EXTRA_INCLUDE_DIRS
+     BTCPP_LIB_DESTINATION
+     BTCPP_INCLUDE_DESTINATION
+     BTCPP_BIN_DESTINATION )

patch/ros-jazzy-control-toolbox.win.patch

@@ -0,0 +1,32 @@
+From 791d063ea62837e86831b7b4dda48b22e680d8cc Mon Sep 17 00:00:00 2001
+From: Christoph Froehlich <[email protected]>
+Date: Mon, 25 Nov 2024 20:11:09 +0000
+Subject: [PATCH] Export symbols on windows
+
+---
+ CMakeLists.txt | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cc1f551..30f4bad 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,11 +7,16 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
+ endif()
+ 
+ if(WIN32)
+-  # Enable Math Constants
+-  # https://docs.microsoft.com/en-us/cpp/c-runtime-library/math-constants?view=vs-2019
+   add_compile_definitions(
++    # For math constants
++    # https://docs.microsoft.com/en-us/cpp/c-runtime-library/math-constants?view=vs-2019
+     _USE_MATH_DEFINES
++    # Minimize Windows namespace collision
++    NOMINMAX
++    WIN32_LEAN_AND_MEAN
+   )
++  # set the same behavior for windows as it is on linux
++  set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+ endif()
+
+ set(THIS_PACKAGE_INCLUDE_DEPENDS

patch/ros-jazzy-diagnostic-aggregator.win.patch

@@ -0,0 +1,9 @@
+diff --git a/diagnostic_aggregator/CMakeLists.txt b/diagnostic_aggregator/CMakeLists.txt
+index 6014edf3..bbcee116 100644
+--- a/diagnostic_aggregator/CMakeLists.txt
++++ b/diagnostic_aggregator/CMakeLists.txt
+@@ -6,3 +6,4 @@ endif()
++set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+ 
+ find_package(ament_cmake REQUIRED)
+ find_package(diagnostic_msgs REQUIRED)

patch/ros-jazzy-diagnostic-updater.win.patch

@@ -0,0 +1,9 @@
+diff --git a/diagnostic_updater/CMakeLists.txt b/diagnostic_updater/CMakeLists.txt
+index eafa9891..9199df0d 100644
+--- a/diagnostic_updater/CMakeLists.txt
++++ b/diagnostic_updater/CMakeLists.txt
+@@ -6,3 +6,4 @@ endif()
++set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+ 
+ find_package(ament_cmake REQUIRED)
+ find_package(ament_cmake_ros REQUIRED)