From 0070050b9bede61dc8651dc3d8c8dd0ae74abb77 Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Wed, 10 Apr 2024 08:55:46 +0200 Subject: [PATCH 1/2] make additional recipes ready for rattler-build --- .../ros-humble-octomap/recipe.yaml | 3 +- .../ros-humble-urdfdom-py/recipe.yaml | 2 +- .../ros2-distro-mutex/recipe.yaml | 11 ++-- conda_build_config.yaml | 58 +++++++++---------- 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/additional_recipes/ros-humble-octomap/recipe.yaml b/additional_recipes/ros-humble-octomap/recipe.yaml index 43a86907..66905928 100644 --- a/additional_recipes/ros-humble-octomap/recipe.yaml +++ b/additional_recipes/ros-humble-octomap/recipe.yaml @@ -11,10 +11,11 @@ requirements: about: - home: https://github.com/conda-forge/octomap-feedstock + homepage: https://github.com/conda-forge/octomap-feedstock license: BSD-3-Clause summary: | An Efficient Probabilistic 3D Mapping Framework Based on Octrees + extra: recipe-maintainers: - ros-forge diff --git a/additional_recipes/ros-humble-urdfdom-py/recipe.yaml b/additional_recipes/ros-humble-urdfdom-py/recipe.yaml index 35da339c..5c88b1f8 100644 --- a/additional_recipes/ros-humble-urdfdom-py/recipe.yaml +++ b/additional_recipes/ros-humble-urdfdom-py/recipe.yaml @@ -10,7 +10,7 @@ requirements: - urdfdom-py 1.2.0 about: - home: https://github.com/ros/urdf_parser_py + homepage: https://github.com/ros/urdf_parser_py license: BSD-3-Clause summary: | Standalone URDF parser for Python. diff --git a/additional_recipes/ros2-distro-mutex/recipe.yaml b/additional_recipes/ros2-distro-mutex/recipe.yaml index 3dedac15..067579a9 100644 --- a/additional_recipes/ros2-distro-mutex/recipe.yaml +++ b/additional_recipes/ros2-distro-mutex/recipe.yaml @@ -5,9 +5,6 @@ package: build: number: 0 string: humble - run_exports: - weak: - - "{{ pin_subpackage('ros2-distro-mutex', max_pin='x.x') }}" requirements: # NOTE: @@ -28,15 +25,19 @@ requirements: # values here should be applied from run_exports! # if the upstream package does not have run_exports # please change it in the conda_build_config.yaml! - run_constrained: + run_constraints: - libboost 1.82 - libboost-devel 1.82 - pcl 1.13.1 - gazebo 11 - libpqxx 6 + run_exports: + weak: + - ${{ pin_subpackage('ros2-distro-mutex', max_pin='x.x') }} + about: - home: https://github.com/robostack/ros-humble + homepage: https://github.com/robostack/ros-humble license: BSD-3-Clause summary: | The ROS2 distro mutex. To switch between ROS2 versions, you need to change the mutex. diff --git a/conda_build_config.yaml b/conda_build_config.yaml index c30cf97f..b84cc41c 100644 --- a/conda_build_config.yaml +++ b/conda_build_config.yaml @@ -17,35 +17,35 @@ python: python_impl: - cpython -# Project overrides -macos_min_version: # [osx and x86_64] - - 10.14 # [osx and x86_64] -macos_machine: # [osx] - - x86_64-apple-darwin13.4.0 # [osx and x86_64] - - arm64-apple-darwin20.0.0 # [osx and arm64] -MACOSX_DEPLOYMENT_TARGET: # [osx] - - 11.0 # [osx and arm64] - - 10.14 # [osx and x86_64] -CONDA_BUILD_SYSROOT: - - /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk # [osx and arm64] +# # Project overrides +# macos_min_version: # [osx and x86_64] +# - 10.14 # [osx and x86_64] +# macos_machine: # [osx] +# - x86_64-apple-darwin13.4.0 # [osx and x86_64] +# - arm64-apple-darwin20.0.0 # [osx and arm64] +# MACOSX_DEPLOYMENT_TARGET: # [osx] +# - 11.0 # [osx and arm64] +# - 10.14 # [osx and x86_64] +# CONDA_BUILD_SYSROOT: +# - /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk # [osx and arm64] # fix build metadata, needed for mapviz and moveit-core -replacements: - all_replacements: - - tag: 'pkg-config build metadata' - glob_patterns: - - '*.pc' - regex_re: '(?:-L|-I)?\"?([^;\s]+\/sysroot\/)' - replacement_re: '$(CONDA_BUILD_SYSROOT_S)' - regex_rg: '([^;\s"]+/sysroot/)' - - tag: 'CMake build metadata' - glob_patterns: - - '*.cmake' - regex_re: '([^;\s"]+/sysroot)' - replacement_re: '$ENV{CONDA_BUILD_SYSROOT}' - - tag: 'CMake build metadata OSX' - glob_patterns: - - '*.cmake' - regex_re: '([^;\s"]+/MacOSX\d*\.?\d*\.sdk)' - replacement_re: '$ENV{CONDA_BUILD_SYSROOT}' +# replacements: +# all_replacements: +# - tag: 'pkg-config build metadata' +# glob_patterns: +# - '*.pc' +# regex_re: '(?:-L|-I)?\"?([^;\s]+\/sysroot\/)' +# replacement_re: '$(CONDA_BUILD_SYSROOT_S)' +# regex_rg: '([^;\s"]+/sysroot/)' +# - tag: 'CMake build metadata' +# glob_patterns: +# - '*.cmake' +# regex_re: '([^;\s"]+/sysroot)' +# replacement_re: '$ENV{CONDA_BUILD_SYSROOT}' +# - tag: 'CMake build metadata OSX' +# glob_patterns: +# - '*.cmake' +# regex_re: '([^;\s"]+/MacOSX\d*\.?\d*\.sdk)' +# replacement_re: '$ENV{CONDA_BUILD_SYSROOT}' From 6408b7c0810c0b05ecba314e5d2a4d516121c624 Mon Sep 17 00:00:00 2001 From: Wolf Vollprecht Date: Wed, 10 Apr 2024 09:02:09 +0200 Subject: [PATCH 2/2] prepare dependencies.yaml for rattler-build --- patch/dependencies.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/patch/dependencies.yaml b/patch/dependencies.yaml index 8ff3cc89..20fa1027 100644 --- a/patch/dependencies.yaml +++ b/patch/dependencies.yaml @@ -13,7 +13,7 @@ yaml_cpp_vendor: add_host: ["yaml-cpp"] add_run: ["yaml-cpp"] zstd_vendor: - add_host: ["zstd", {sel(not win): zstd-static}] + add_host: ["zstd", {"${{ 'zstd-static' if not win }}"}] add_run: ["zstd"] sqlite3_vendor: add_host: ["sqlite"] @@ -45,7 +45,7 @@ behaviortree_cpp_v3: add_host: ["libboost-devel", "cppzmq"] add_run: ["libboost"] plotjuggler: - add_host: ["libxcb", {sel(linux): elfutils}, "ros-humble-ros-workspace"] + add_host: ["libxcb", "${{ 'elfutils' if linux }}", "ros-humble-ros-workspace"] embree_vendor: add_host: ["REQUIRE_OPENGL", "libpng", "libjpeg-turbo", "openimageio", "tbb", "tbb-devel", "embree"] ign_rviz_common: @@ -75,7 +75,7 @@ fmilibrary_vendor: mrpt2: add_host: ["assimp", "octomap", "tinyxml2", "libboost-devel", "jsoncpp", "gtest", "libboost-python-devel", "libdc1394", "xorg-libxcomposite", "libftdi", "ros-humble-octomap"] add_run: ["assimp", "octomap", "tinyxml2", "libboost-devel", "jsoncpp", "gtest", "libboost-python-devel", "libdc1394", "xorg-libxcomposite", "libftdi", "ros-humble-octomap"] - add_build: [{"sel(linux)": "{{ cdt('libxcomposite-devel') }}"}] + add_build: ["${{ cdt('libxcomposite-devel') if linux }}"] ros1_rosbag_storage_vendor: add_host: ["ros-noetic-roscpp", "ros-noetic-roslz4", "ros-noetic-rostest"] add_run: ["ros-noetic-roscpp", "ros-noetic-roslz4"] @@ -84,14 +84,14 @@ popf: rtabmap: add_host: ["REQUIRE_OPENGL", "ceres-solver", "libdc1394", "libusb", "vtk"] backward_ros: - add_host: [{sel(linux or (osx and x86_64)): binutils}, {sel(linux): elfutils}] + add_host: ["${{ 'binutils' if linux or (osx and x86_64)) }}", "${{ 'elfutils' if linux }}"] nav2_smac_planner: - add_build: [{"sel(osx)": "llvm-openmp"}] - add_host: [{"sel(osx)": "llvm-openmp"}, "ompl", "libode"] + add_build: ["${{ 'llvm-openmp' if osx }}"] + add_host: ["${{ 'llvm-openmp' if osx }}", "ompl", "libode"] nav2_util: add_host: ["libboost-devel"] nav2_constrained_smoother: - add_host: [{"sel(win)": "openblas"}] + add_host: ["${{ 'openblas' if win }}"] ompl: add_host: ["ompl"] pybind11_vendor: @@ -101,7 +101,7 @@ python_qt_binding: add_host: ["pyqt-builder"] add_run: ["pyqt-builder"] qt_gui_cpp: - add_build: [{sel(build_platform != target_platform): pyqt}, {sel(build_platform != target_platform): qt-main}] + add_build: ["${{ 'pyqt' if (build_platform != target_platform) }}", "${{ 'qt-main' if (build_platform != target_platform) }}"] add_host: ["REQUIRE_OPENGL", "pyqt-builder", "pep517"] add_run: ["pyqt-builder", "pep517"] rqt_gui_cpp: @@ -153,10 +153,10 @@ ros_image_to_qimage: rqt_image_overlay: add_host: ["REQUIRE_OPENGL"] slam_toolbox: - add_build: [{sel(build_platform != target_platform): qt-main}] + add_build: ["${{ 'qt-main' if (build_platform != target_platform) }}"] add_host: ["REQUIRE_OPENGL"] vision_msgs_rviz_plugins: - add_build: [{sel(build_platform != target_platform): qt-main}] + add_build: ["${{ 'qt-main' if (build_platform != target_platform) }}"] add_host: ["REQUIRE_OPENGL"] velodyne_pointcloud: add_host: ["libboost-devel"]