From f42abc7b9ec6855990852d651e2f424f461dde93 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 15 Mar 2024 16:29:40 +0000 Subject: [PATCH 1/8] updated v14.1.0 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 313f7db..b2b5e01 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set repo_name = "sdformat" %} -{% set version = "14.0.0" %} +{% set version = "14.1.0" %} {% set major_version = version.split('.')[0] %} {% set name = repo_name + major_version %} {% set cxx_name = "lib" + name %} @@ -11,14 +11,14 @@ package: source: - url: https://github.com/osrf/sdformat/archive/sdformat{{ major_version }}_{{ version }}.tar.gz - sha256: a4f38865f7e8b79559c238a1aba7bab1a4ff46c22a67bb91325ad48ba7d25728 + sha256: 7870eeb9be95fcf003e2720918b412b2d25a51e91ce6dfb90dce00233b20a335 patches: - standalone_bindings.patch - standalone_bindings_tests.patch - fixgzsdfcommandonwin32.patch build: - number: 2 + number: 0 outputs: From 76b5ca6b70cc61e428ae89a8865585bafca92347 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Fri, 15 Mar 2024 16:30:23 +0000 Subject: [PATCH 2/8] MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.32.0, and conda-forge-pinning 2024.03.15.08.29.55 --- .azure-pipelines/azure-pipelines-linux.yml | 1 + .azure-pipelines/azure-pipelines-osx.yml | 1 + .ci_support/migrations/tinyxml210.yaml | 8 -------- .gitignore | 13 ++++++++++++- .scripts/build_steps.sh | 12 +++--------- .scripts/run_docker_build.sh | 6 ++++++ .scripts/run_osx_build.sh | 6 +++--- .scripts/run_win_build.bat | 4 ++-- azure-pipelines.yml | 4 ++-- build-locally.py | 5 +++-- 10 files changed, 33 insertions(+), 27 deletions(-) delete mode 100644 .ci_support/migrations/tinyxml210.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 2b93a12..aef462c 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -21,6 +21,7 @@ jobs: UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 + variables: {} steps: # configure qemu binfmt-misc running. This allows us to run docker containers diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index f3ff063..730a626 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -15,6 +15,7 @@ jobs: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 + variables: {} steps: # TODO: Fast finish on azure pipelines? diff --git a/.ci_support/migrations/tinyxml210.yaml b/.ci_support/migrations/tinyxml210.yaml deleted file mode 100644 index da7b243..0000000 --- a/.ci_support/migrations/tinyxml210.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for tinyxml2 10 - kind: version - migration_number: 1 -migrator_ts: 1704497957.887235 -tinyxml2: -- '10' diff --git a/.gitignore b/.gitignore index c002910..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,22 @@ # Everything else is managed by the conda-smithy rerender process. # Please do not modify +# Ignore all files and folders in root * !/conda-forge.yml -!/*/ +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders !/recipe/** !/.ci_support/** +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + *.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index eba1dfd..899ba03 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -34,9 +34,9 @@ CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" @@ -57,12 +57,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi -if [[ "${sha:-}" == "" ]]; then - pushd ${FEEDSTOCK_ROOT} - sha=$(git rev-parse HEAD) - popd -fi - if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" @@ -74,7 +68,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then # Drop into an interactive shell /bin/bash else - conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ + conda-build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b70ef01..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 9259eb9..07dff21 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build boa conda-forge-ci-setup=4 + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" @@ -81,7 +81,7 @@ else EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test" fi - conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \ + conda-build ./recipe -m ./.ci_support/${CONFIG}.yaml \ --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \ --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 48734de..6d54697 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1" :: Provision the necessary dependencies to build the recipe later echo Installing dependencies -mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes +mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes if !errorlevel! neq 0 exit /b !errorlevel! :: Set basic configuration @@ -55,7 +55,7 @@ call :end_group :: Build the recipe echo Building recipe -conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% +conda-build.exe "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS% if !errorlevel! neq 0 exit /b !errorlevel! :: Prepare some environment variables for the upload step diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6b346f5..e5306da 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,5 +4,5 @@ jobs: - template: ./.azure-pipelines/azure-pipelines-linux.yml - - template: ./.azure-pipelines/azure-pipelines-win.yml - - template: ./.azure-pipelines/azure-pipelines-osx.yml \ No newline at end of file + - template: ./.azure-pipelines/azure-pipelines-osx.yml + - template: ./.azure-pipelines/azure-pipelines-win.yml \ No newline at end of file diff --git a/build-locally.py b/build-locally.py index 3f4b7a7..e0d408d 100755 --- a/build-locally.py +++ b/build-locally.py @@ -64,8 +64,9 @@ def verify_config(ns): elif ns.config.startswith("osx"): if "OSX_SDK_DIR" not in os.environ: raise RuntimeError( - "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' " - "to download the SDK automatically to 'SDKs/MacOSX.sdk'. " + "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' " + "to download the SDK automatically to '$PWD/SDKs/MacOSX.sdk'. " + "Note: OSX_SDK_DIR must be set to an absolute path. " "Setting this variable implies agreement to the licensing terms of the SDK by Apple." ) From 685fab458a90aa58a9e7d56324628ee38b42010a Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 15 Mar 2024 18:49:44 +0100 Subject: [PATCH 3/8] Update meta.yaml --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b2b5e01..a21ab4a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,6 @@ source: patches: - standalone_bindings.patch - standalone_bindings_tests.patch - - fixgzsdfcommandonwin32.patch build: number: 0 From 727e432f418a506f5b71194d8ba45313ec7b03b1 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 15 Mar 2024 18:49:55 +0100 Subject: [PATCH 4/8] Delete recipe/fixgzsdfcommandonwin32.patch --- recipe/fixgzsdfcommandonwin32.patch | 34 ----------------------------- 1 file changed, 34 deletions(-) delete mode 100644 recipe/fixgzsdfcommandonwin32.patch diff --git a/recipe/fixgzsdfcommandonwin32.patch b/recipe/fixgzsdfcommandonwin32.patch deleted file mode 100644 index ec55159..0000000 --- a/recipe/fixgzsdfcommandonwin32.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index feab8e716..ad3eb9682 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -126,6 +126,4 @@ target_include_directories(${PROJECT_LIBRARY_TARGET_NAME} - ${CMAKE_CURRENT_SOURCE_DIR} - ) - --if(NOT WIN32) -- add_subdirectory(cmd) --endif() -+add_subdirectory(cmd) - -diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt -index 0c4c1a2f0..bd00ffbba 100644 ---- a/src/cmd/CMakeLists.txt -+++ b/src/cmd/CMakeLists.txt -@@ -29,7 +29,15 @@ set(cmd_script_configured "${cmd_script_generated}.configured") - - # Set the library_location variable to the relative path to the library file - # within the install directory structure. --set(library_location "../../../${CMAKE_INSTALL_LIBDIR}/$") -+if(WIN32) -+ set(plugin_location ${CMAKE_INSTALL_BINDIR}) -+else() -+ set(plugin_location ${CMAKE_INSTALL_LIBDIR}) -+endif() -+ -+# Set the library_location variable to the relative path to the library file -+# within the install directory structure. -+set(library_location "../../../${plugin_location}/$") - - configure_file( - "cmd${PROJECT_NAME_NO_VERSION_LOWER}.rb.in" From 7edb16a9f29602be37f9332e65cf4a6e7aa38809 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 15 Mar 2024 18:50:37 +0100 Subject: [PATCH 5/8] Update conda-forge.yml --- conda-forge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-forge.yml b/conda-forge.yml index c4f0164..49c6331 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -16,4 +16,4 @@ github: provider: linux_aarch64: default linux_ppc64le: default -test_on_native_only: true +test: native_and_emulated From f71fbb9e2fca4455020ae4e646577af06e9e41ab Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 15 Mar 2024 18:56:09 +0100 Subject: [PATCH 6/8] Create 1344.patch --- recipe/1344.patch | 314 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 314 insertions(+) create mode 100644 recipe/1344.patch diff --git a/recipe/1344.patch b/recipe/1344.patch new file mode 100644 index 0000000..742628f --- /dev/null +++ b/recipe/1344.patch @@ -0,0 +1,314 @@ +From 913c8a09f9b9a2b3557d2073f1c81a8e1e422eef Mon Sep 17 00:00:00 2001 +From: "Addisu Z. Taddese" +Date: Thu, 9 Nov 2023 22:41:30 -0600 +Subject: [PATCH 1/2] Fix `gz sdf` command on windows + +Signed-off-by: Addisu Z. Taddese +--- + src/Console.cc | 6 ----- + src/cmd/CMakeLists.txt | 8 ++++++- + src/cmd/cmdsdformat.rb.in | 4 +++- + src/gz_TEST.cc | 48 ++++++++++++++++++--------------------- + 4 files changed, 32 insertions(+), 34 deletions(-) + +diff --git a/src/Console.cc b/src/Console.cc +index d9ec8d044..558f10d87 100644 +--- a/src/Console.cc ++++ b/src/Console.cc +@@ -34,13 +34,7 @@ using namespace sdf; + static std::shared_ptr myself; + static std::mutex g_instance_mutex; + +-/// \todo Output disabled for windows, to allow tests to pass. We should +-/// disable output just for tests on windows. +-#ifndef _WIN32 + static bool g_quiet = false; +-#else +-static bool g_quiet = true; +-#endif + + static Console::ConsoleStream g_NullStream(nullptr); + +diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt +index a869d5fca..222ce5c5e 100644 +--- a/src/cmd/CMakeLists.txt ++++ b/src/cmd/CMakeLists.txt +@@ -31,7 +31,13 @@ set(cmd_script_configured "${CMAKE_CURRENT_BINARY_DIR}/cmd${PROJECT_NAME}.rb.con + + # Set the library_location variable to the relative path to the library file + # within the install directory structure. +-set(library_location "../../../${CMAKE_INSTALL_LIBDIR}/$") ++if (MSVC) ++ set(library_location_prefix "${CMAKE_INSTALL_BINDIR}") ++else() ++ set(library_location_prefix "${CMAKE_INSTALL_LIBDIR}") ++endif() ++ ++set(library_location "../../../${library_location_prefix}/$") + + configure_file( + "cmd${PROJECT_NAME_NO_VERSION_LOWER}.rb.in" +diff --git a/src/cmd/cmdsdformat.rb.in b/src/cmd/cmdsdformat.rb.in +index 7c93d7680..b642ce956 100644 +--- a/src/cmd/cmdsdformat.rb.in ++++ b/src/cmd/cmdsdformat.rb.in +@@ -26,6 +26,8 @@ else + end + + require 'optparse' ++require 'pathname' ++ + + # Constants. + LIBRARY_NAME = '@library_location@' +@@ -174,7 +176,7 @@ class Cmd + # puts options + + # Read the plugin that handles the command. +- if LIBRARY_NAME[0] == '/' ++ if Pathname.new(LIBRARY_NAME).absolute? + # If the first character is a slash, we'll assume that we've been given an + # absolute path to the library. This is only used during test mode. + plugin = LIBRARY_NAME +diff --git a/src/gz_TEST.cc b/src/gz_TEST.cc +index 72ff7e5cb..e83afb8ca 100644 +--- a/src/gz_TEST.cc ++++ b/src/gz_TEST.cc +@@ -72,7 +72,7 @@ std::string custom_exec_str(std::string _cmd) + } + + ///////////////////////////////////////////////// +-TEST(checkUnrecognizedElements, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(checkUnrecognizedElements, SDF) + { + std::string pathBase = PROJECT_SOURCE_PATH; + pathBase += "/test/sdf"; +@@ -120,7 +120,7 @@ TEST(checkUnrecognizedElements, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) + } + + ///////////////////////////////////////////////// +-TEST(check, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(check, SDF) + { + std::string pathBase = PROJECT_SOURCE_PATH; + pathBase += "/test/sdf"; +@@ -916,7 +916,7 @@ TEST(check, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) + } + + ///////////////////////////////////////////////// +-TEST(check_shapes_sdf, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(check_shapes_sdf, SDF) + { + std::string pathBase = PROJECT_SOURCE_PATH; + pathBase += "/test/sdf"; +@@ -939,7 +939,7 @@ TEST(check_shapes_sdf, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) + } + + ///////////////////////////////////////////////// +-TEST(check_model_sdf, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(check_model_sdf, SDF) + { + std::string pathBase = PROJECT_SOURCE_PATH; + pathBase += "/test/integration/model/box"; +@@ -965,7 +965,7 @@ TEST(check_model_sdf, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) + } + + ///////////////////////////////////////////////// +-TEST(describe, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(describe, SDF) + { + // Get the description + std::string output = +@@ -977,7 +977,7 @@ TEST(describe, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) + } + + ///////////////////////////////////////////////// +-TEST(print, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(print, SDF) + { + std::string pathBase = PROJECT_SOURCE_PATH; + pathBase += "/test/sdf"; +@@ -1007,7 +1007,7 @@ TEST(print, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) + } + + ///////////////////////////////////////////////// +-TEST(print_rotations_in_degrees, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(print_rotations_in_degrees, SDF) + { + const std::string path = + sdf::testing::TestFile("sdf", "rotations_in_degrees.sdf"); +@@ -1075,7 +1075,7 @@ TEST(print_rotations_in_degrees, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) + } + + ///////////////////////////////////////////////// +-TEST(print_rotations_in_radians, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(print_rotations_in_radians, SDF) + { + const std::string path = + sdf::testing::TestFile("sdf", "rotations_in_radians.sdf"); +@@ -1143,7 +1143,7 @@ TEST(print_rotations_in_radians, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) + } + + ///////////////////////////////////////////////// +-TEST(print_rotations_in_quaternions, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(print_rotations_in_quaternions, SDF) + { + const auto path = sdf::testing::TestFile( + "sdf", "rotations_in_quaternions.sdf"); +@@ -1212,7 +1212,7 @@ TEST(print_rotations_in_quaternions, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) + } + + ///////////////////////////////////////////////// +-TEST(print_includes_rotations_in_degrees, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(print_includes_rotations_in_degrees, SDF) + { + // Set SDF_PATH so that included models can be found + gz::utils::setenv( +@@ -1283,7 +1283,7 @@ TEST(print_includes_rotations_in_degrees, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) + } + + ///////////////////////////////////////////////// +-TEST(print_includes_rotations_in_radians, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(print_includes_rotations_in_radians, SDF) + { + // Set SDF_PATH so that included models can be found + gz::utils::setenv( +@@ -1354,8 +1354,7 @@ TEST(print_includes_rotations_in_radians, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) + } + + ///////////////////////////////////////////////// +-TEST(print_includes_rotations_in_quaternions, +- GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(print_includes_rotations_in_quaternions, SDF) + { + // Set SDF_PATH so that included models can be found + gz::utils::setenv( +@@ -1427,8 +1426,7 @@ TEST(print_includes_rotations_in_quaternions, + } + + ///////////////////////////////////////////////// +-TEST(print_rotations_in_unnormalized_degrees, +- GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(print_rotations_in_unnormalized_degrees, SDF) + { + const std::string path = + sdf::testing::TestFile("sdf", "rotations_in_unnormalized_degrees.sdf"); +@@ -1499,8 +1497,7 @@ TEST(print_rotations_in_unnormalized_degrees, + } + + ///////////////////////////////////////////////// +-TEST(print_rotations_in_unnormalized_radians, +- GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(print_rotations_in_unnormalized_radians, SDF) + { + const std::string path = + sdf::testing::TestFile("sdf", "rotations_in_unnormalized_radians.sdf"); +@@ -1568,7 +1565,7 @@ TEST(print_rotations_in_unnormalized_radians, + } + + ///////////////////////////////////////////////// +-TEST(shuffled_cmd_flags, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(shuffled_cmd_flags, SDF) + { + const std::string path = + sdf::testing::TestFile("sdf", "rotations_in_unnormalized_radians.sdf"); +@@ -1617,8 +1614,7 @@ TEST(shuffled_cmd_flags, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) + } + + ///////////////////////////////////////////////// +-TEST(print_snap_to_degrees_tolerance_too_high, +- GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(print_snap_to_degrees_tolerance_too_high, SDF) + { + const std::string path = sdf::testing::TestFile( + "sdf", +@@ -1635,7 +1631,7 @@ TEST(print_snap_to_degrees_tolerance_too_high, + } + + ///////////////////////////////////////////////// +-TEST(GraphCmd, GZ_UTILS_TEST_DISABLED_ON_WIN32(WorldPoseRelativeTo)) ++TEST(GraphCmd, WorldPoseRelativeTo) + { + const std::string pathBase = std::string(PROJECT_SOURCE_PATH) + "/test/sdf"; + +@@ -1686,7 +1682,7 @@ TEST(GraphCmd, GZ_UTILS_TEST_DISABLED_ON_WIN32(WorldPoseRelativeTo)) + } + + ///////////////////////////////////////////////// +-TEST(GraphCmd, GZ_UTILS_TEST_DISABLED_ON_WIN32(ModelPoseRelativeTo)) ++TEST(GraphCmd, ModelPoseRelativeTo) + { + const std::string pathBase = std::string(PROJECT_SOURCE_PATH) + "/test/sdf"; + const std::string path = pathBase + "/model_relative_to_nested_reference.sdf"; +@@ -1762,7 +1758,7 @@ TEST(GraphCmd, GZ_UTILS_TEST_DISABLED_ON_WIN32(ModelPoseRelativeTo)) + } + + ///////////////////////////////////////////////// +-TEST(GraphCmd, GZ_UTILS_TEST_DISABLED_ON_WIN32(WorldFrameAttachedTo)) ++TEST(GraphCmd, WorldFrameAttachedTo) + { + const std::string pathBase = std::string(PROJECT_SOURCE_PATH) + "/test/sdf"; + const std::string path = pathBase + "/world_nested_frame_attached_to.sdf"; +@@ -1808,7 +1804,7 @@ TEST(GraphCmd, GZ_UTILS_TEST_DISABLED_ON_WIN32(WorldFrameAttachedTo)) + } + + ///////////////////////////////////////////////// +-TEST(GraphCmd, GZ_UTILS_TEST_DISABLED_ON_WIN32(ModelFrameAttachedTo)) ++TEST(GraphCmd, ModelFrameAttachedTo) + { + const std::string pathBase = std::string(PROJECT_SOURCE_PATH) + "/test/sdf"; + const std::string path = pathBase + "/model_nested_frame_attached_to.sdf"; +@@ -1859,7 +1855,7 @@ TEST(GraphCmd, GZ_UTILS_TEST_DISABLED_ON_WIN32(ModelFrameAttachedTo)) + // Disable on arm + #if !defined __ARM_ARCH + ///////////////////////////////////////////////// +-TEST(inertial_stats, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) ++TEST(inertial_stats, SDF) + { + std::string pathBase = PROJECT_SOURCE_PATH; + pathBase += "/test/sdf"; +@@ -1948,7 +1944,7 @@ TEST(inertial_stats, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) + + ////////////////////////////////////////////////// + /// \brief Check help message and bash completion script for consistent flags +-TEST(HelpVsCompletionFlags, SDF) ++TEST(HelpVsCompletionFlags, GZ_UTILS_TEST_DISABLED_ON_WIN32(SDF)) + { + // Flags in help message + std::string helpOutput = custom_exec_str(GzCommand() + " sdf --help"); + +From 9b730b572900d03286277c7183d16d6ec4b98dcd Mon Sep 17 00:00:00 2001 +From: "Addisu Z. Taddese" +Date: Fri, 10 Nov 2023 11:41:55 -0600 +Subject: [PATCH 2/2] Print exception message + +Signed-off-by: Addisu Z. Taddese +--- + src/cmd/cmdsdformat.rb.in | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/cmd/cmdsdformat.rb.in b/src/cmd/cmdsdformat.rb.in +index b642ce956..45560acc6 100644 +--- a/src/cmd/cmdsdformat.rb.in ++++ b/src/cmd/cmdsdformat.rb.in +@@ -177,8 +177,6 @@ class Cmd + + # Read the plugin that handles the command. + if Pathname.new(LIBRARY_NAME).absolute? +- # If the first character is a slash, we'll assume that we've been given an +- # absolute path to the library. This is only used during test mode. + plugin = LIBRARY_NAME + else + # We're assuming that the library path is relative to the current +@@ -189,8 +187,9 @@ class Cmd + + begin + Importer.dlload plugin +- rescue DLError ++ rescue DLError => error + puts "Library error: [#{plugin}] not found." ++ puts "DLError: #{error.message}" + exit(-1) + end + + From 8b6cf69c1bca945d22d6f284ecc9899011a9910e Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 15 Mar 2024 18:56:32 +0100 Subject: [PATCH 7/8] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a21ab4a..4039a04 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,6 +15,7 @@ source: patches: - standalone_bindings.patch - standalone_bindings_tests.patch + - 1344.patch build: number: 0 From b0bdbcf65afe609b3ae2afb9d4f98a658a0781a9 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 15 Mar 2024 18:56:44 +0100 Subject: [PATCH 8/8] Delete recipe/1183.patch --- recipe/1183.patch | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 recipe/1183.patch diff --git a/recipe/1183.patch b/recipe/1183.patch deleted file mode 100644 index e13ead5..0000000 --- a/recipe/1183.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt -index e536c749f..fc4adcf09 100644 ---- a/python/CMakeLists.txt -+++ b/python/CMakeLists.txt -@@ -22,6 +22,9 @@ if(USE_SYSTEM_PATHS_FOR_PYTHON_INSTALLATION) - - if(USE_DIST_PACKAGES_FOR_PYTHON) - string(REPLACE "site-packages" "dist-packages" GZ_PYTHON_INSTALL_PATH ${Python3_SITEARCH}) -+ else() -+ # custom cmake command is returning dist-packages -+ string(REPLACE "dist-packages" "site-packages" GZ_PYTHON_INSTALL_PATH ${Python3_SITEARCH}) - endif() - else() - # If not a system installation, respect local paths