From b8d0500bd752c321614ab2b1a2ff597e168bce45 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <121827174+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 18 May 2023 11:56:22 +0000 Subject: [PATCH 01/14] dummy commit for rerendering --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 2f1960f..5996de6 100644 --- a/README.md +++ b/README.md @@ -204,3 +204,6 @@ Feedstock Maintainers * [@traversaro](https://github.com/traversaro/) * [@wolfv](https://github.com/wolfv/) + + + From 66c0d379201c5aa8a3869ec69c54b606f123cd6f Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 18 May 2023 11:58:30 +0000 Subject: [PATCH 02/14] MNT: Re-rendered with conda-build 3.24.0, conda-smithy 3.23.1, and conda-forge-pinning 2023.05.17.15.05.36 --- .azure-pipelines/azure-pipelines-win.yml | 4 ++-- .ci_support/linux_64_.yaml | 12 ++++++------ .ci_support/linux_aarch64_.yaml | 12 ++++++------ .ci_support/linux_ppc64le_.yaml | 12 ++++++------ .ci_support/migrations/assimp525.yaml | 7 ------- .ci_support/osx_64_.yaml | 12 ++++++------ .ci_support/osx_arm64_.yaml | 12 ++++++------ .ci_support/win_64_.yaml | 8 ++++---- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- README.md | 11 ++++------- 11 files changed, 44 insertions(+), 54 deletions(-) delete mode 100644 .ci_support/migrations/assimp525.yaml diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index a192c0b..8a96a72 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -5,7 +5,7 @@ jobs: - job: win pool: - vmImage: windows-2019 + vmImage: windows-2022 strategy: matrix: win_64_: @@ -36,7 +36,7 @@ jobs: - script: | call activate base - mamba.exe install "python=3.9" conda-build conda pip boa conda-forge-ci-setup=3 "py-lief<0.12" -c conda-forge --strict-channel-priority --yes + mamba.exe install "python=3.10" conda-build conda pip boa conda-forge-ci-setup=3 -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index ed6024d..d0f8037 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,11 +1,9 @@ assimp: - 5.2.5 -boost_cpp: -- 1.78.0 c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos6 channel_sources: @@ -17,18 +15,20 @@ console_bridge: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 flann: - 1.9.1 +fmt: +- '9' lz4_c: - 1.9.3 pin_run_as_build: - boost-cpp: - max_pin: x.x.x flann: max_pin: x.x.x +spdlog: +- '1.11' target_platform: - linux-64 tinyxml2: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index e26e662..be67697 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -2,12 +2,10 @@ BUILD: - aarch64-conda_cos7-linux-gnu assimp: - 5.2.5 -boost_cpp: -- 1.78.0 c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_arch: - aarch64 cdt_name: @@ -21,18 +19,20 @@ console_bridge: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 flann: - 1.9.1 +fmt: +- '9' lz4_c: - 1.9.3 pin_run_as_build: - boost-cpp: - max_pin: x.x.x flann: max_pin: x.x.x +spdlog: +- '1.11' target_platform: - linux-aarch64 tinyxml2: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 762be89..a2b2f0b 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -1,11 +1,9 @@ assimp: - 5.2.5 -boost_cpp: -- 1.78.0 c_compiler: - gcc c_compiler_version: -- '11' +- '12' cdt_name: - cos7 channel_sources: @@ -17,18 +15,20 @@ console_bridge: cxx_compiler: - gxx cxx_compiler_version: -- '11' +- '12' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 flann: - 1.9.1 +fmt: +- '9' lz4_c: - 1.9.3 pin_run_as_build: - boost-cpp: - max_pin: x.x.x flann: max_pin: x.x.x +spdlog: +- '1.11' target_platform: - linux-ppc64le tinyxml2: diff --git a/.ci_support/migrations/assimp525.yaml b/.ci_support/migrations/assimp525.yaml deleted file mode 100644 index 4572bb6..0000000 --- a/.ci_support/migrations/assimp525.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -assimp: -- 5.2.5 -migrator_ts: 1663100710.2627342 diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 56ebd3b..99f1af0 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -2,12 +2,10 @@ MACOSX_DEPLOYMENT_TARGET: - '10.9' assimp: - 5.2.5 -boost_cpp: -- 1.78.0 c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -17,18 +15,20 @@ console_bridge: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' flann: - 1.9.1 +fmt: +- '9' lz4_c: - 1.9.3 macos_machine: - x86_64-apple-darwin13.4.0 pin_run_as_build: - boost-cpp: - max_pin: x.x.x flann: max_pin: x.x.x +spdlog: +- '1.11' target_platform: - osx-64 tinyxml2: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 8125327..00fc1b7 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -2,12 +2,10 @@ MACOSX_DEPLOYMENT_TARGET: - '11.0' assimp: - 5.2.5 -boost_cpp: -- 1.78.0 c_compiler: - clang c_compiler_version: -- '14' +- '15' channel_sources: - conda-forge channel_targets: @@ -17,18 +15,20 @@ console_bridge: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '15' flann: - 1.9.1 +fmt: +- '9' lz4_c: - 1.9.3 macos_machine: - arm64-apple-darwin20.0.0 pin_run_as_build: - boost-cpp: - max_pin: x.x.x flann: max_pin: x.x.x +spdlog: +- '1.11' target_platform: - osx-arm64 tinyxml2: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 13c54d3..45d0be9 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,7 +1,5 @@ assimp: - 5.2.5 -boost_cpp: -- 1.78.0 c_compiler: - vs2019 channel_sources: @@ -14,15 +12,17 @@ cxx_compiler: - vs2019 flann: - 1.9.1 +fmt: +- '9' lz4_c: - 1.9.3 perl: - 5.32.1 pin_run_as_build: - boost-cpp: - max_pin: x.x.x flann: max_pin: x.x.x +spdlog: +- '1.11' target_platform: - win-64 tinyxml2: diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 84431a6..a6b09f6 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index b3abaeb..bb00584 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -24,9 +24,9 @@ source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 diff --git a/README.md b/README.md index 5996de6..985888d 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About dartsim -============= +About dartsim-feedstock +======================= + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/dartsim-feedstock/blob/main/LICENSE.txt) Home: http://dartsim.github.io/ Package license: BSD-2-Clause -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/dartsim-feedstock/blob/main/LICENSE.txt) - Summary: The DART (Dynamic Animation and Robotics Toolkit) library provides data structures and algorithms for kinematic and dynamic applications in robotics and computer animation. Development: https://github.com/dartsim/dart @@ -204,6 +204,3 @@ Feedstock Maintainers * [@traversaro](https://github.com/traversaro/) * [@wolfv](https://github.com/wolfv/) - - - From 7465689bc12f65048b17b0e8f16189863132262f Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 18 May 2023 13:59:22 +0200 Subject: [PATCH 03/14] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8b59801..72def9b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,7 @@ source: - disable_test_Issue1596.patch build: - number: 0 + number: 1 run_exports: - {{ pin_subpackage(name, max_pin='x.x') }} From fc3803e8f9ecacec2c4d9e521443be60273c35ff Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 18 May 2023 14:08:43 +0200 Subject: [PATCH 04/14] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 72def9b..2861b21 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -60,6 +60,7 @@ test: - test -f $PREFIX/share/dart/cmake/dart_collision-odeTargets.cmake # [not win] - test -f $PREFIX/share/dart/cmake/dart_collision-bulletTargets.cmake # [not win] - if not exist %LIBRARY_LIB%\\dart.lib exit 1 # [win] + - if not exist %LIBRARY_BIN%\\dart.dll exit 1 # [win] - if not exist %PREFIX%\\Library\\share\\dart\\cmake\\dart_collision-odeTargets.cmake exit 1 # [win] - if not exist %PREFIX%\\Library\\share\\dart\\cmake\\dart_collision-bulletTargets.cmake exit 1 # [win] From 07d5373f62fdd8e888cc528b3fc3a139ffc5e0f4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 18 May 2023 15:06:40 +0200 Subject: [PATCH 05/14] Update build.sh --- recipe/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/build.sh b/recipe/build.sh index e3857e0..23deaa6 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -24,6 +24,7 @@ cmake ${CMAKE_ARGS} $SRC_DIR \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_LIBDIR=lib \ -DDART_VERBOSE:BOOL=ON \ + -DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF \ ${CMAKE_TEST_CMD} make ${NUM_PARALLEL} From 0221b776f1180da36f0f4325c676f292789622c7 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 18 May 2023 15:07:11 +0200 Subject: [PATCH 06/14] Update bld.bat --- recipe/bld.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index 83b65cf..6b2610d 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -12,6 +12,7 @@ cmake -G "Ninja" ^ -DBUILD_TESTING:BOOL=ON ^ -DASSIMP_AISCENE_CTOR_DTOR_DEFINED:BOOL=ON ^ -DASSIMP_AIMATERIAL_CTOR_DTOR_DEFINED:BOOL=ON ^ + -DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF ^ %SRC_DIR% echo "Print CMakeOutput:" From fbc6911c11909c30f4158dbe1412d613f35f5aa7 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 18 May 2023 15:08:15 +0200 Subject: [PATCH 07/14] Update bld.bat --- recipe/bld.bat | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 6b2610d..502b591 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -14,11 +14,6 @@ cmake -G "Ninja" ^ -DASSIMP_AIMATERIAL_CTOR_DTOR_DEFINED:BOOL=ON ^ -DDART_TREAT_WARNINGS_AS_ERRORS:BOOL=OFF ^ %SRC_DIR% - -echo "Print CMakeOutput:" -type CMakeFiles\CMakeOutput.log -echo "Print CMakeOutput:" -type CMakeFiles\CMakeError.log if errorlevel 1 exit 1 :: Use 3 core to try to avoid out of memory errors From 0cf616d9dae1c61bf3290984eb65bd441a1a6f6b Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 18 May 2023 17:17:28 +0200 Subject: [PATCH 08/14] Update bld.bat --- recipe/bld.bat | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 502b591..b44d4cf 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -16,10 +16,11 @@ cmake -G "Ninja" ^ %SRC_DIR% if errorlevel 1 exit 1 -:: Use 3 core to try to avoid out of memory errors +:: Use 2 core to try to avoid out of memory errors :: See https://github.com/conda-forge/dartsim-feedstock/pull/27#issuecomment-1132570816 (where it was reduced to 4) :: and https://github.com/conda-forge/dartsim-feedstock/pull/30#issuecomment-1149743621 (where it was reduced to 3) -ninja -j 3 +:: and https://github.com/conda-forge/dartsim-feedstock/pull/38#issuecomment-1553091093 (where it was reduced to 2) +ninja -j 2 if errorlevel 1 exit 1 ninja install From 8fc07ee53e971fac258b696c52163e9d23c86f6f Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 19 May 2023 09:59:39 +0200 Subject: [PATCH 09/14] Update bld.bat --- recipe/bld.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipe/bld.bat b/recipe/bld.bat index b44d4cf..743ac9c 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -7,6 +7,8 @@ cmake -G "Ninja" ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ + -DBUILD_SHARED_LIBS:BOOL=ON ^ + -DDART_IN_CI:BOOL=ON ^ -DDART_MSVC_DEFAULT_OPTIONS=ON ^ -DDART_VERBOSE=ON ^ -DBUILD_TESTING:BOOL=ON ^ From 28cd14c9deef8daef3789e0241e110eec052b10f Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 19 May 2023 10:08:40 +0200 Subject: [PATCH 10/14] Create enable_windows_tests.patch --- recipe/enable_windows_tests.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 recipe/enable_windows_tests.patch diff --git a/recipe/enable_windows_tests.patch b/recipe/enable_windows_tests.patch new file mode 100644 index 0000000..0558dec --- /dev/null +++ b/recipe/enable_windows_tests.patch @@ -0,0 +1,13 @@ +diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt +index a495f25550e8b..81dc08f396063 100644 +--- a/unittests/CMakeLists.txt ++++ b/unittests/CMakeLists.txt +@@ -93,7 +93,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + # fixed even after further changes are made + # - "unit": low level tests for one or few classes and functions to verify that + # they performs correctly as expected +-if(NOT MSVC) ++if(TRUE) + # Disabled due to limitied disk space in CI image + add_subdirectory(integration) + add_subdirectory(regression) From e468dac2aba4d5c10b882fd3ad3b8f11257c517c Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 19 May 2023 10:08:56 +0200 Subject: [PATCH 11/14] Update meta.yaml --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2861b21..8c4da83 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,6 +12,7 @@ source: - disable_imgui.patch - disable_gui.patch - disable_test_Issue1596.patch + - enable_windows_tests.patch build: number: 1 @@ -60,7 +61,6 @@ test: - test -f $PREFIX/share/dart/cmake/dart_collision-odeTargets.cmake # [not win] - test -f $PREFIX/share/dart/cmake/dart_collision-bulletTargets.cmake # [not win] - if not exist %LIBRARY_LIB%\\dart.lib exit 1 # [win] - - if not exist %LIBRARY_BIN%\\dart.dll exit 1 # [win] - if not exist %PREFIX%\\Library\\share\\dart\\cmake\\dart_collision-odeTargets.cmake exit 1 # [win] - if not exist %PREFIX%\\Library\\share\\dart\\cmake\\dart_collision-bulletTargets.cmake exit 1 # [win] From 653bdf32220ef2cba3614c44cd84ba76f018dbbc Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 19 May 2023 10:09:14 +0200 Subject: [PATCH 12/14] Update bld.bat --- recipe/bld.bat | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index 743ac9c..b44d4cf 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -7,8 +7,6 @@ cmake -G "Ninja" ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ - -DBUILD_SHARED_LIBS:BOOL=ON ^ - -DDART_IN_CI:BOOL=ON ^ -DDART_MSVC_DEFAULT_OPTIONS=ON ^ -DDART_VERBOSE=ON ^ -DBUILD_TESTING:BOOL=ON ^ From c4b08fd84572f21f7a5c76560241493c3406cfd1 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 19 May 2023 16:05:14 +0200 Subject: [PATCH 13/14] fix --- recipe/enable_windows_tests.patch | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/recipe/enable_windows_tests.patch b/recipe/enable_windows_tests.patch index 0558dec..fbb6bf6 100644 --- a/recipe/enable_windows_tests.patch +++ b/recipe/enable_windows_tests.patch @@ -1,13 +1,13 @@ -diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt -index a495f25550e8b..81dc08f396063 100644 ---- a/unittests/CMakeLists.txt -+++ b/unittests/CMakeLists.txt -@@ -93,7 +93,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - # fixed even after further changes are made - # - "unit": low level tests for one or few classes and functions to verify that - # they performs correctly as expected --if(NOT MSVC) -+if(TRUE) - # Disabled due to limitied disk space in CI image - add_subdirectory(integration) - add_subdirectory(regression) +diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt +index a495f25550e8b..81dc08f396063 100644 +--- a/unittests/CMakeLists.txt ++++ b/unittests/CMakeLists.txt +@@ -93,7 +93,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + # fixed even after further changes are made + # - "unit": low level tests for one or few classes and functions to verify that + # they performs correctly as expected +-if(NOT MSVC) ++if(TRUE) + # Disabled due to limitied disk space in CI image + add_subdirectory(integration) + add_subdirectory(regression) From 8448fbdbd919cfa6b7d70322f2b0d25a571e1325 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 19 May 2023 18:12:07 +0200 Subject: [PATCH 14/14] Update bld.bat --- recipe/bld.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/bld.bat b/recipe/bld.bat index b44d4cf..ed1e91c 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -26,5 +26,6 @@ if errorlevel 1 exit 1 ninja install if errorlevel 1 exit 1 -ctest --output-on-failure +:: https://github.com/conda-forge/dartsim-feedstock/issues/39 +ctest -E "test_Collision" --output-on-failure if errorlevel 1 exit 1