Skip to content

Commit

Permalink
Merge pull request #15 from RoboStack/feature_parity
Browse files Browse the repository at this point in the history
Feature parity between platforms
  • Loading branch information
Tobias-Fischer authored Jan 10, 2025
2 parents 82da002 + b6b01df commit 7546ddd
Show file tree
Hide file tree
Showing 10 changed files with 6,077 additions and 107 deletions.
11 changes: 3 additions & 8 deletions .scripts/build_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,13 @@

set -xeuo pipefail
export PYTHONUNBUFFERED=1
export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}"
export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}"

export FEEDSTOCK_ROOT=`pwd`
export "CONDA_BLD_PATH=$HOME/conda-bld/"

curl -fsSL https://pixi.sh/install.sh | bash
export PATH="$HOME/.pixi/bin:$PATH"

export CONDA_BLD_PATH="/opt/conda/build_artifacts"

pwd

cd ${FEEDSTOCK_ROOT}

for recipe in ${CURRENT_RECIPES[@]}; do
pixi run -v rattler-build build \
--recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \
Expand Down
88 changes: 0 additions & 88 deletions .scripts/run_docker_build.sh

This file was deleted.

26 changes: 26 additions & 0 deletions patch/ros-jazzy-rsl.win.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d47b08..1b0c4f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +37,21 @@ target_link_libraries(rsl PUBLIC
tl_expected::tl_expected
)

+# There is no explicit export of symbols in the library either via
+# hand-written ***_export.h headers or generate_export_header CMake macro,
+# as the header-only functions in this library are quite limited in number,
+# it is perfectly ok to export all of them (as done in *nix) with the
+# WINDOWS_EXPORT_ALL_SYMBOLS property
+if(MSVC)
+ set_target_properties(rsl PROPERTIES
+ WINDOWS_EXPORT_ALL_SYMBOLS TRUE
+ )
+ # On Windows, also ensure that all .dll libraries are placed in the
+ # same build directory so they can be found by the loader (there is
+ # no rpath on Windows)
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}")
+endif()
+
add_subdirectory(docs)

option(RSL_BUILD_TESTING "Build tests" OFF)
12 changes: 6 additions & 6 deletions pixi.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ git = "*"

[feature.beta.pypi-dependencies]
# This is tipically the latest commit on rattler-build-humble branch
vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "c47948cdec7d20d480342161751a34e92a3b0eaf" }
vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "35f09634dbd3c3697c8304a6287d3ba3e47517e1" }
# Uncomment this line to work with a local vinca for faster iteration, but remember to comment it back
# (and regenerate the pixi.lock) once you push the modified commit to the repo
#vinca = { path = "../vinca", editable = true }
Expand All @@ -38,6 +38,7 @@ remove-file = { cmd = "rm vinca.yaml; rm -rf recipes" }
build_additional_recipes = { cmd = "rattler-build build --recipe-dir ./additional_recipes -m ./conda_build_config.yaml --skip-existing" }
build = { cmd = "rattler-build build --recipe-dir ./recipes -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge --skip-existing", depends_on = ["build_additional_recipes", "generate-recipes"] }
build_one_package = { cmd = "cp ./patch/$PACKAGE.*patch ./recipes/$PACKAGE/patch/; rattler-build build --recipe ./recipes/$PACKAGE/recipe.yaml -m ./conda_build_config.yaml -c robostack-staging -c https://repo.prefix.dev/conda-forge", env = { PACKAGE = "ros-jazzy-ros-workspace" } }
create_snapshot = { cmd = "vinca-snapshot -d jazzy -o snapshot_$(date +\"%Y-%m-%d-%H-%M-%S\").yaml" }

[environments]
beta = ["beta"]
Expand Down
Loading

0 comments on commit 7546ddd

Please sign in to comment.