Skip to content

Commit 7546ddd

Browse files
Merge pull request #15 from RoboStack/feature_parity
Feature parity between platforms
2 parents 82da002 + b6b01df commit 7546ddd

10 files changed

+6077
-107
lines changed

.scripts/build_linux.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,13 @@
77

88
set -xeuo pipefail
99
export PYTHONUNBUFFERED=1
10-
export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}"
11-
export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}"
10+
11+
export FEEDSTOCK_ROOT=`pwd`
12+
export "CONDA_BLD_PATH=$HOME/conda-bld/"
1213

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

16-
export CONDA_BLD_PATH="/opt/conda/build_artifacts"
17-
18-
pwd
19-
20-
cd ${FEEDSTOCK_ROOT}
21-
2217
for recipe in ${CURRENT_RECIPES[@]}; do
2318
pixi run -v rattler-build build \
2419
--recipe ${FEEDSTOCK_ROOT}/recipes/${recipe} \

.scripts/run_docker_build.sh

Lines changed: 0 additions & 88 deletions
This file was deleted.

patch/ros-jazzy-rsl.win.patch

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 6d47b08..1b0c4f0 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -30,6 +37,21 @@ target_link_libraries(rsl PUBLIC
6+
tl_expected::tl_expected
7+
)
8+
9+
+# There is no explicit export of symbols in the library either via
10+
+# hand-written ***_export.h headers or generate_export_header CMake macro,
11+
+# as the header-only functions in this library are quite limited in number,
12+
+# it is perfectly ok to export all of them (as done in *nix) with the
13+
+# WINDOWS_EXPORT_ALL_SYMBOLS property
14+
+if(MSVC)
15+
+ set_target_properties(rsl PROPERTIES
16+
+ WINDOWS_EXPORT_ALL_SYMBOLS TRUE
17+
+ )
18+
+ # On Windows, also ensure that all .dll libraries are placed in the
19+
+ # same build directory so they can be found by the loader (there is
20+
+ # no rpath on Windows)
21+
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}")
22+
+endif()
23+
+
24+
add_subdirectory(docs)
25+
26+
option(RSL_BUILD_TESTING "Build tests" OFF)

pixi.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ git = "*"
2727

2828
[feature.beta.pypi-dependencies]
2929
# This is tipically the latest commit on rattler-build-humble branch
30-
vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "c47948cdec7d20d480342161751a34e92a3b0eaf" }
30+
vinca = { git ="https://github.com/RoboStack/vinca.git", rev = "35f09634dbd3c3697c8304a6287d3ba3e47517e1" }
3131
# Uncomment this line to work with a local vinca for faster iteration, but remember to comment it back
3232
# (and regenerate the pixi.lock) once you push the modified commit to the repo
3333
#vinca = { path = "../vinca", editable = true }
@@ -38,6 +38,7 @@ remove-file = { cmd = "rm vinca.yaml; rm -rf recipes" }
3838
build_additional_recipes = { cmd = "rattler-build build --recipe-dir ./additional_recipes -m ./conda_build_config.yaml --skip-existing" }
3939
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"] }
4040
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" } }
41+
create_snapshot = { cmd = "vinca-snapshot -d jazzy -o snapshot_$(date +\"%Y-%m-%d-%H-%M-%S\").yaml" }
4142

4243
[environments]
4344
beta = ["beta"]

0 commit comments

Comments
 (0)