Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wip: make additional recipes ready for rattler-build #171

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion additional_recipes/ros-humble-octomap/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion additional_recipes/ros-humble-urdfdom-py/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
11 changes: 6 additions & 5 deletions additional_recipes/ros2-distro-mutex/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ package:
build:
number: 0
string: humble
run_exports:
weak:
- "{{ pin_subpackage('ros2-distro-mutex', max_pin='x.x') }}"

requirements:
# NOTE:
Expand All @@ -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.
Expand Down
58 changes: 29 additions & 29 deletions conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,35 @@ python:
python_impl:
- cpython

# Project overrides
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This section can be re-written for the new format

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:
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This section has no equivalent yet in the new format. However, I am planning to add this functionality in the recipe.yaml rather than in the variant config because I don't understand why this was ever placed in that file in the first place.

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}'
20 changes: 10 additions & 10 deletions patch/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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"]
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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"]
Loading