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

[dartsim] Update to 6.15.0 #43198

Merged
merged 1 commit into from
Jan 14, 2025
Merged
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
13 changes: 8 additions & 5 deletions ports/dartsim/disable_unit_tests_examples_and_tutorials.patch
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 100bfb8b59be..b0779885c788 100644
index fc5249444a5c..39c29e92bb33 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -292,7 +292,7 @@ add_subdirectory(dart)
@@ -376,7 +376,7 @@ add_subdirectory(dart)

set(DART_IN_SOURCE_BUILD TRUE)

-if(TARGET dart)
+if(0)

# Add a "tests" target to build unit tests.
enable_testing()
include(CTest)
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 08ef983cdcfa..7092d89bb17d 100644
index 37cadf4f8de1..fcfbd13cf793 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -1,6 +1,8 @@
@@ -22,9 +22,11 @@ endif()
set(DART_DARTPY_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/dartpy")

add_subdirectory(dartpy)
Expand All @@ -24,3 +24,6 @@ index 08ef983cdcfa..7092d89bb17d 100644
add_subdirectory(examples)
add_subdirectory(tutorials)
+endif()

message(STATUS "")
message(STATUS "[ dartpy ]")
8 changes: 0 additions & 8 deletions ports/dartsim/fix-pc-dependencies.patch

This file was deleted.

5 changes: 2 additions & 3 deletions ports/dartsim/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO dartsim/dart
REF v${VERSION}
SHA512 6d04da37d0eb40a35a3aaec583af024e2edf71d68bb38b6832760de21a349221387644ed9be0cc1e451c669bbf48eb53d8d0cd3be1b1b265a30be2aa17c7e48b
SHA512 3c621245c5dc1bf26932c33c940e2b09aaebd1a15f3620616c60296f18a67e1044728543b4f640f92caf8f98295e350679b70eb11aecadea9e4a28aaf370ea75
HEAD_REF main
PATCHES
disable_unit_tests_examples_and_tutorials.patch
fix-pc-dependencies.patch
)

vcpkg_cmake_configure(
Expand Down Expand Up @@ -41,7 +40,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_ROOT_PATH \"${SOURCE_PATH}/\"" "")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_DATA_PATH \"${SOURCE_PATH}/data/\"" "")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_DATA_LOCAL_PATH \"${SOURCE_PATH}/data/\"" "")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_DATA_GLOBAL_PATH \"${CURRENT_PACKAGES_DIR}/share/doc/dart/data/\"" "")
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dart/config.hpp" "#define DART_DATA_GLOBAL_PATH \\\n \"${CURRENT_PACKAGES_DIR}/share/doc/dart/data/\"" "")
FrankXie05 marked this conversation as resolved.
Show resolved Hide resolved

# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
5 changes: 3 additions & 2 deletions ports/dartsim/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "dartsim",
"version": "6.12.2",
"port-version": 3,
"version": "6.15.0",
"description": "Dynamic Animation and Robotics Toolkit",
"homepage": "https://dartsim.github.io/",
"license": "BSD-2-Clause",
"supports": "!x86",
"dependencies": [
"assimp",
"boost-algorithm",
Expand All @@ -24,6 +24,7 @@
"octomap",
"ode",
"opengl",
"osg",
"tinyxml2",
"urdfdom",
{
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ gamenetworkingsockets:x64-android=fail
# There is an open PR that try to fix that.
gazebo:x64-windows=fail
gazebo:x64-windows-static-md=fail
gazebo:x86-windows=fail
gazebo:x86-windows=skip
gazebo:x64-linux=fail
gdk-pixbuf:arm-neon-android=fail
gdk-pixbuf:arm64-android=fail
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -2205,8 +2205,8 @@
"port-version": 3
},
"dartsim": {
"baseline": "6.12.2",
"port-version": 3
"baseline": "6.15.0",
"port-version": 0
},
"dataframe": {
"baseline": "3.4.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/d-/dartsim.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "76bb71f86f7f9f4d34e002e65db4ccff572f6a1d",
"version": "6.15.0",
"port-version": 0
},
{
"git-tree": "4d586df3f633aafc829fd66b18ad22120a9bbed2",
"version": "6.12.2",
Expand Down