From b43440ac14aeba536460ed11653f610d9791518a Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 1 Oct 2021 08:46:53 +0000 Subject: [PATCH 01/11] updated v5_5.0.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cccfc8c..2082c58 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set base_name = "libignition-physics" %} -{% set version = "4_4.1.0" %} +{% set version = "5_5.0.0" %} {% set version_package = version.split('_')[1] %} {% set major_version = version_package.split('.')[0] %} {% set name = base_name + major_version %} @@ -10,7 +10,7 @@ package: source: - url: https://github.com/ignitionrobotics/ign-physics/archive/ignition-physics{{ version }}.tar.gz - sha256: 5b0c9603e453e4c4b45d46d50903ed92b957d31cf21743da90fa3e787fda3a3e + sha256: e77ee0088911a5b379134466e79b7d842438378dc2b09a0fc6edf93efbe180a7 patches: - vs2017_support.patch - disable_fake_install.patch From 85ac6e8aca2e535bcf0a402336278db9c4b07ca4 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 1 Oct 2021 08:47:37 +0000 Subject: [PATCH 02/11] MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.12, and conda-forge-pinning 2021.09.30.20.35.40 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .ci_support/linux_64_.yaml | 2 +- .ci_support/linux_ppc64le_.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/win_64_.yaml | 2 +- README.md | 22 +++++++++++----------- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index c8ee2d3..80bddc9 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -86,7 +86,7 @@ jobs: - script: | call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml + conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables displayName: Build recipe env: PYTHONUNBUFFERED: 1 diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 0f6e58e..c08c78a 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index 5053317..e78c812 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index bac0dab..0c0e7e5 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -7,7 +7,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 8a75dc7..2614db3 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2019 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main cxx_compiler: diff --git a/README.md b/README.md index 896699f..cb31690 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -About libignition-physics4 +About libignition-physics5 ========================== Home: https://github.com/ignitionrobotics/ign-physics @@ -90,28 +90,28 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libignition--physics4-green.svg)](https://anaconda.org/conda-forge/libignition-physics4) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libignition-physics4.svg)](https://anaconda.org/conda-forge/libignition-physics4) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libignition-physics4.svg)](https://anaconda.org/conda-forge/libignition-physics4) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libignition-physics4.svg)](https://anaconda.org/conda-forge/libignition-physics4) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libignition--physics5-green.svg)](https://anaconda.org/conda-forge/libignition-physics5) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libignition-physics5.svg)](https://anaconda.org/conda-forge/libignition-physics5) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libignition-physics5.svg)](https://anaconda.org/conda-forge/libignition-physics5) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libignition-physics5.svg)](https://anaconda.org/conda-forge/libignition-physics5) | -Installing libignition-physics4 +Installing libignition-physics5 =============================== -Installing `libignition-physics4` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `libignition-physics5` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: ``` conda config --add channels conda-forge conda config --set channel_priority strict ``` -Once the `conda-forge` channel has been enabled, `libignition-physics4` can be installed with: +Once the `conda-forge` channel has been enabled, `libignition-physics5` can be installed with: ``` -conda install libignition-physics4 +conda install libignition-physics5 ``` -It is possible to list all of the versions of `libignition-physics4` available on your platform with: +It is possible to list all of the versions of `libignition-physics5` available on your platform with: ``` -conda search libignition-physics4 --channel conda-forge +conda search libignition-physics5 --channel conda-forge ``` @@ -153,17 +153,17 @@ Terminology produce the finished article (built conda distributions) -Updating libignition-physics4-feedstock +Updating libignition-physics5-feedstock ======================================= -If you would like to improve the libignition-physics4 recipe or build a new +If you would like to improve the libignition-physics5 recipe or build a new package version, please fork this repository and submit a PR. Upon submission, your changes will be run on the appropriate platforms to give the reviewer an opportunity to confirm that the changes result in a successful build. Once merged, the recipe will be re-built and uploaded automatically to the `conda-forge` channel, whereupon the built conda packages will be available for everybody to install and use from the `conda-forge` channel. -Note that all branches in the conda-forge/libignition-physics4-feedstock are +Note that all branches in the conda-forge/libignition-physics5-feedstock are immediately built and any created packages are uploaded, so PRs should be based on branches in forks and branches in the main repository should only be used to build distinct package versions. From 42de5f127b2bfbd56df65a10927d400bbd22abe7 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 8 Oct 2021 09:39:46 +1000 Subject: [PATCH 03/11] Update vs2017_support.patch --- recipe/vs2017_support.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/recipe/vs2017_support.patch b/recipe/vs2017_support.patch index d873e69..8f0bef0 100644 --- a/recipe/vs2017_support.patch +++ b/recipe/vs2017_support.patch @@ -8,19 +8,19 @@ Subject: [PATCH] Update CMakeLists.txt 1 file changed, 5 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3df39ced..86dffa19 100644 +index a22dd97f..4cb2d0a8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -7,6 +7,12 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} - ${ignition-math${IGN_MATH_VER}_LIBRARIES} - ignition-plugin${IGN_PLUGIN_VER}::register) +@@ -9,6 +9,12 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} + ignition-plugin${IGN_PLUGIN_VER}::register + Eigen3::Eigen) +if(MSVC) -+ target_compile_definitions(${PROJECT_LIBRARY_TARGET_NAME} ++ target_compile_definitions(${PROJECT_LIBRARY_TARGET_NAME} + PUBLIC _ENABLE_EXTENDED_ALIGNED_STORAGE) + target_compile_options(${PROJECT_LIBRARY_TARGET_NAME} PRIVATE /permissive-) -+endif() ++endif() + - target_include_directories(${PROJECT_LIBRARY_TARGET_NAME} - SYSTEM PUBLIC - ${EIGEN3_INCLUDE_DIRS}) + ign_build_tests( + TYPE UNIT + SOURCES ${gtest_sources}) From 90d000f252d63243e9d6ab3bfd6a30a0f2d01f0d Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 8 Oct 2021 09:40:48 +1000 Subject: [PATCH 04/11] Delete 249.patch --- recipe/249.patch | 50 ------------------------------------------------ 1 file changed, 50 deletions(-) delete mode 100644 recipe/249.patch diff --git a/recipe/249.patch b/recipe/249.patch deleted file mode 100644 index 427cd8b..0000000 --- a/recipe/249.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 13ba0fd7f38441cb25fbb93bf91534410cc80277 Mon Sep 17 00:00:00 2001 -From: Steve Peters -Date: Thu, 22 Apr 2021 15:59:08 -0700 -Subject: [PATCH] Use [gs]etPrimarySlipCompliance with dart 6.10.0 - -These APIs are used in the upstream release of dartsim 6.10.0 -but are missing from our fork. We should add them to the fork and -build more debs before merging this. - -Signed-off-by: Steve Peters ---- - dartsim/src/SDFFeatures.cc | 2 +- - dartsim/src/ShapeFeatures.cc | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/dartsim/src/SDFFeatures.cc b/dartsim/src/SDFFeatures.cc -index 8baff95a..3dc16fc4 100644 ---- a/dartsim/src/SDFFeatures.cc -+++ b/dartsim/src/SDFFeatures.cc -@@ -818,7 +818,7 @@ Identity SDFFeatures::ConstructSdfCollision( - } - if (odeFriction->HasElement("slip1")) - { -- aspect->setSlipCompliance(odeFriction->Get("slip1")); -+ aspect->setPrimarySlipCompliance(odeFriction->Get("slip1")); - } - if (odeFriction->HasElement("slip2")) - { -diff --git a/dartsim/src/ShapeFeatures.cc b/dartsim/src/ShapeFeatures.cc -index c5126414..4cec3feb 100644 ---- a/dartsim/src/ShapeFeatures.cc -+++ b/dartsim/src/ShapeFeatures.cc -@@ -469,7 +469,7 @@ double ShapeFeatures::GetShapeFrictionPyramidPrimarySlipCompliance( - << std::endl; - return 0.0; - } -- return aspect->getSlipCompliance(); -+ return aspect->getPrimarySlipCompliance(); - } - - ///////////////////////////////////////////////// -@@ -505,7 +505,7 @@ bool ShapeFeatures::SetShapeFrictionPyramidPrimarySlipCompliance( - << std::endl; - return false; - } -- aspect->setSlipCompliance(_value); -+ aspect->setPrimarySlipCompliance(_value); - return true; - } - From 6342fb16c7a32215c4f929b0457d33965b5850c6 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 8 Oct 2021 09:41:00 +1000 Subject: [PATCH 05/11] Update meta.yaml --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2082c58..569c20a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -14,7 +14,6 @@ source: patches: - vs2017_support.patch - disable_fake_install.patch - - 249.patch build: number: 0 From 968f057037cb2a6a97bdc88e83bc9f51fd84a3d7 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sat, 9 Oct 2021 17:23:03 +1000 Subject: [PATCH 06/11] 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 569c20a..cb78974 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -34,7 +34,7 @@ requirements: - libignition-math6 - libignition-common4 - libignition-utils1 - - libsdformat11 + - libsdformat12 - eigen - dartsim - libode From 3b5fad60498de4ea6062d536364b1971cd3e0370 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sun, 10 Oct 2021 06:29:25 +1000 Subject: [PATCH 07/11] 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 cb78974..b83b040 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - url: https://github.com/ignitionrobotics/ign-physics/archive/ignition-physics{{ version }}.tar.gz sha256: e77ee0088911a5b379134466e79b7d842438378dc2b09a0fc6edf93efbe180a7 patches: - - vs2017_support.patch + # - vs2017_support.patch - disable_fake_install.patch build: From c4fcd76b78ac1b1be37291470913b0bc177ea30c Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sun, 10 Oct 2021 06:31:33 +1000 Subject: [PATCH 08/11] Update build.sh --- recipe/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index a0a6823..6aff386 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -29,5 +29,5 @@ if [ ${target_platform} != "linux-ppc64le" ]; then # Remove test that fail on arm64: https://github.com/ignitionrobotics/ign-physics/issues/70 # Remove test that fail on macOS: https://github.com/conda-forge/libignition-physics-feedstock/issues/13 # Remove test INTEGRATION_ExamplesBuild_TEST that fails on multiple platforms: https://github.com/conda-forge/libignition-physics-feedstock/pull/14 - ctest --output-on-failure -C Release -E "INTEGRATION_FrameSemantics2d|INTEGRATION_JointTypes2f|UNIT_Collisions_TEST|UNIT_EntityManagement_TEST|UNIT_JointFeatures_TEST|UNIT_LinkFeatures_TEST|UNIT_SDFFeatures_TEST|UNIT_SimulationFeatures_TEST|INTEGRATION_ExamplesBuild_TEST|UNIT_WorldFeatures_TEST|UNIT_ShapeFeatures_TEST" + ctest --output-on-failure -C Release -E "INTEGRATION_FrameSemantics2d|INTEGRATION_JointTypes2f|UNIT_Collisions_TEST|UNIT_EntityManagement_TEST|UNIT_JointFeatures_TEST|UNIT_LinkFeatures_TEST|UNIT_SDFFeatures_TEST|UNIT_SimulationFeatures_TEST|INTEGRATION_ExamplesBuild_TEST|UNIT_WorldFeatures_TEST|UNIT_ShapeFeatures_TEST|UNIT_FreeGroupFeatures_TEST|UNIT_KinematicsFeatures_TEST" fi From a1e7c84944ddce2d7cc0840dbcec1c59fbe57ee5 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sun, 10 Oct 2021 06:59:55 +1000 Subject: [PATCH 09/11] Create 297.patch --- recipe/297.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 recipe/297.patch diff --git a/recipe/297.patch b/recipe/297.patch new file mode 100644 index 0000000..f361658 --- /dev/null +++ b/recipe/297.patch @@ -0,0 +1,13 @@ +diff --git a/bullet/CMakeLists.txt b/bullet/CMakeLists.txt +index 7402946b..ad1af1d5 100644 +--- a/bullet/CMakeLists.txt ++++ b/bullet/CMakeLists.txt +@@ -34,7 +34,7 @@ set(versioned ${CMAKE_SHARED_LIBRARY_PREFIX}${bullet_plugin}${CMAKE_SHARED_LIBRA + set(unversioned ${CMAKE_SHARED_LIBRARY_PREFIX}${PROJECT_NAME_NO_VERSION_LOWER}-${engine_name}${CMAKE_SHARED_LIBRARY_SUFFIX}) + if (WIN32) + # disable MSVC inherit via dominance warning +- target_compile_options(${dartsim_plugin} PUBLIC "/wd4250") ++ target_compile_options(${bullet_plugin} PUBLIC "/wd4250") + INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy + ${IGNITION_PHYSICS_ENGINE_INSTALL_DIR}\/${versioned} + ${IGNITION_PHYSICS_ENGINE_INSTALL_DIR}\/${unversioned})") From 77686372220b9a93f356530f01236126f7effb0b Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sun, 10 Oct 2021 07:00:08 +1000 Subject: [PATCH 10/11] Update meta.yaml --- recipe/meta.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b83b040..f6b7fa8 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,8 +12,9 @@ source: - url: https://github.com/ignitionrobotics/ign-physics/archive/ignition-physics{{ version }}.tar.gz sha256: e77ee0088911a5b379134466e79b7d842438378dc2b09a0fc6edf93efbe180a7 patches: - # - vs2017_support.patch + - vs2017_support.patch - disable_fake_install.patch + - 297.patch build: number: 0 From dd16a751fa25919411d2f9fdf8330d65ed8f1f05 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sun, 10 Oct 2021 10:41:21 +0200 Subject: [PATCH 11/11] 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 a452cc5..42f6d89 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -14,7 +14,8 @@ cmake ^ if errorlevel 1 exit 1 :: Build. -cmake --build . --config Release +:: Only use one thread to avoid out of memory issues (https://github.com/conda-forge/libignition-physics-feedstock/pull/21#issuecomment-938662928) +cmake --build . --parallel 1 --config Release if errorlevel 1 exit 1 :: Install.