From b48c9aabb6edd25990ac23afe954786877c5aeba Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 22 Sep 2022 16:19:27 +0200 Subject: [PATCH 01/55] Add regression test for #148 --- recipe/build.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 72475d6a..efe864e3 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -51,6 +51,13 @@ cmake ${CMAKE_ARGS} .. \ cmake --build . --config Release -- -j$CPU_COUNT cmake --build . --config Release --target install +# Regression test for https://github.com/conda-forge/gazebo-feedstock/issues/148 +if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then + cmake -DBUILD_TESTING:BOOL=ON . + ninja INTEGRATION_transport INTEGRATION_transporter INTEGRATION_transport_msg_count + ctest --output-on-failure -C Release -R INTEGRATION_transport +fi + # Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d. # This will allow them to be run on environment activation. for CHANGE in "activate" "deactivate" From e01e82b016aee8165ffaa0e0ccd4d00b19d2fc10 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 22 Sep 2022 21:21:30 +0200 Subject: [PATCH 02/55] Update build.sh --- recipe/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index efe864e3..295a55c0 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -53,9 +53,9 @@ cmake --build . --config Release --target install # Regression test for https://github.com/conda-forge/gazebo-feedstock/issues/148 if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then - cmake -DBUILD_TESTING:BOOL=ON . - ninja INTEGRATION_transport INTEGRATION_transporter INTEGRATION_transport_msg_count - ctest --output-on-failure -C Release -R INTEGRATION_transport + cmake ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON . + ninja INTEGRATION_transport_msg_count + ctest --output-on-failure -C Release -R INTEGRATION_transport_msg_count fi # Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d. From f769e3eb27e737d448bdf42873189a891870aa78 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 22 Sep 2022 23:40:11 +0200 Subject: [PATCH 03/55] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 1eb6b40d..4e377074 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -12,6 +12,10 @@ c_compiler: # [win] - vs2019 # [win] cxx_compiler: # [win] - vs2019 # [win] +c_compiler_version: # [osx] + - 11 # [osx] +cxx_compiler_version: # [osx] + - 11 # [osx] cudnn: # [linux64] - undefined # [linux64] cuda_compiler_version: # [linux64] From 8562a75252c96e2152db7e2411f60c907a7e1e75 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 22 Sep 2022 23:41:03 +0200 Subject: [PATCH 04/55] 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 21913966..d47db595 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -15,7 +15,7 @@ source: - 3190.patch build: - number: 0 + number: 1 run_exports: - {{ pin_subpackage('gazebo', max_pin='x') }} From 68c124ba2f3a39836e6a3ecd08309c0508b6af72 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 22 Sep 2022 21:42:05 +0000 Subject: [PATCH 05/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.21.18.22.03 --- .ci_support/osx_64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_64_OGRE_VERSION1.12.yaml | 4 ++-- .ci_support/osx_arm64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_arm64_OGRE_VERSION1.12.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml index f9c56ffb..2a129a49 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.10.yaml @@ -11,7 +11,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '14' +- '11' channel_sources: - conda-forge channel_targets: @@ -21,7 +21,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '11' ffmpeg: - '4.4' graphviz: diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml index b074a890..177c1f50 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.12.yaml @@ -11,7 +11,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '14' +- '11' channel_sources: - conda-forge channel_targets: @@ -21,7 +21,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '11' ffmpeg: - '4.4' graphviz: diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml index 1028026c..5db094d3 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml @@ -11,7 +11,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '14' +- '11' channel_sources: - conda-forge channel_targets: @@ -21,7 +21,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '11' ffmpeg: - '4.4' graphviz: diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml index 35407d1c..1db2afee 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml @@ -11,7 +11,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '14' +- '11' channel_sources: - conda-forge channel_targets: @@ -21,7 +21,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '14' +- '11' ffmpeg: - '4.4' graphviz: From 1d7dd836d7b5939fcd63a1e462ce1491b9c67df8 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Fri, 23 Sep 2022 10:09:35 +1000 Subject: [PATCH 06/55] Try if newer osx version helps Address ld: warning: dylib ($PREFIX/lib/libignition-transport8.8.3.0.dylib) was built for newer macOS version (10.15) than being linked (10.14) --- recipe/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 4e377074..e0ad9f58 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,7 +1,7 @@ macos_min_version: # [osx and x86_64] - - 10.14 # [osx and x86_64] + - 10.15 # [osx and x86_64] MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - 10.14 # [osx and x86_64] + - 10.15 # [osx and x86_64] # This is done to de-prioritize 1.12 OGRE_VERSION: From d786fecdfa8ba315b98cd7d41aba5f8feb8b9b8d Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 23 Sep 2022 00:11:39 +0000 Subject: [PATCH 07/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.21.18.22.03 --- .ci_support/osx_64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_64_OGRE_VERSION1.12.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml index 2a129a49..8316fb8f 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.14' +- '10.15' OGRE_VERSION: - '1.10' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '10.14' +- '10.15' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml index 177c1f50..20b158bf 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.14' +- '10.15' OGRE_VERSION: - '1.12' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '10.14' +- '10.15' pin_run_as_build: boost-cpp: max_pin: x.x.x From a1860440e7ee0ee62e73e90505ea4ece877888f6 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 23 Sep 2022 09:27:30 +0200 Subject: [PATCH 08/55] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index e0ad9f58..80e50900 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,7 +1,7 @@ macos_min_version: # [osx and x86_64] - - 10.15 # [osx and x86_64] + - 11.00 # [osx and x86_64] MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - 10.15 # [osx and x86_64] + - 11.00 # [osx and x86_64] # This is done to de-prioritize 1.12 OGRE_VERSION: From 4d8fa4679fd9cc20406c19bba678bce49f49cce0 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 23 Sep 2022 07:29:12 +0000 Subject: [PATCH 09/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.21.18.22.03 --- .ci_support/osx_64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_64_OGRE_VERSION1.12.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml index 8316fb8f..688d5bb9 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.15' +- '11.00' OGRE_VERSION: - '1.10' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '10.15' +- '11.00' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml index 20b158bf..9154e682 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.15' +- '11.00' OGRE_VERSION: - '1.12' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '10.15' +- '11.00' pin_run_as_build: boost-cpp: max_pin: x.x.x From ae48f30b792ed3ac528420db392bc27eba46f1ce Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 23 Sep 2022 09:43:00 +0200 Subject: [PATCH 10/55] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 80e50900..1ad7e097 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,7 +1,7 @@ macos_min_version: # [osx and x86_64] - - 11.00 # [osx and x86_64] + - 11.0 m # [osx and x86_64] MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - 11.00 # [osx and x86_64] + - 11.0 # [osx and x86_64] # This is done to de-prioritize 1.12 OGRE_VERSION: From ce4a17af4521e243656a3a852373e92af8d32079 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 23 Sep 2022 07:44:54 +0000 Subject: [PATCH 11/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.21.18.22.03 --- .ci_support/osx_64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_64_OGRE_VERSION1.12.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml index 688d5bb9..41b64ef5 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.00' +- '11.0' OGRE_VERSION: - '1.10' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '11.00' +- 11.0 m pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml index 9154e682..293b1bd1 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.00' +- '11.0' OGRE_VERSION: - '1.12' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '11.00' +- 11.0 m pin_run_as_build: boost-cpp: max_pin: x.x.x From 3b339449a37e78c7b187deb5a81cf7f1cc405fbf Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 23 Sep 2022 11:33:24 +0200 Subject: [PATCH 12/55] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 1ad7e097..71d07bad 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,7 +1,7 @@ -macos_min_version: # [osx and x86_64] - - 11.0 m # [osx and x86_64] -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - 11.0 # [osx and x86_64] +macos_min_version: # [osx] + - 12.0 # [osx] +MACOSX_DEPLOYMENT_TARGET: # [osx] + - 12.0 # [osx] # This is done to de-prioritize 1.12 OGRE_VERSION: From b229b8012293e03f9fa077cdde537efb38933a88 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 23 Sep 2022 09:35:45 +0000 Subject: [PATCH 13/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.21.18.22.03 --- .ci_support/osx_64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_64_OGRE_VERSION1.12.yaml | 4 ++-- .ci_support/osx_arm64_OGRE_VERSION1.10.yaml | 4 +++- .ci_support/osx_arm64_OGRE_VERSION1.12.yaml | 4 +++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml index 41b64ef5..92eb1dc8 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.0' +- '12.0' OGRE_VERSION: - '1.10' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- 11.0 m +- '12.0' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml index 293b1bd1..41602b80 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.0' +- '12.0' OGRE_VERSION: - '1.12' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- 11.0 m +- '12.0' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml index 5db094d3..9dd735a5 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.0' +- '12.0' OGRE_VERSION: - '1.10' assimp: @@ -40,6 +40,8 @@ libprotobuf: - '3.21' macos_machine: - arm64-apple-darwin20.0.0 +macos_min_version: +- '12.0' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml index 1db2afee..3f9985e2 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.0' +- '12.0' OGRE_VERSION: - '1.12' assimp: @@ -40,6 +40,8 @@ libprotobuf: - '3.21' macos_machine: - arm64-apple-darwin20.0.0 +macos_min_version: +- '12.0' pin_run_as_build: boost-cpp: max_pin: x.x.x From 5cac884aba74e6ca4516bd5161ab8eb8527f3da5 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 23 Sep 2022 11:42:46 +0200 Subject: [PATCH 14/55] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 71d07bad..284b9410 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,7 +1,7 @@ macos_min_version: # [osx] - - 12.0 # [osx] + - 12.1 # [osx] MACOSX_DEPLOYMENT_TARGET: # [osx] - - 12.0 # [osx] + - 12.1 # [osx] # This is done to de-prioritize 1.12 OGRE_VERSION: From 4bbab376596067d01339093e47e2ee2482b3741b Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 23 Sep 2022 09:44:44 +0000 Subject: [PATCH 15/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.21.18.22.03 --- .ci_support/osx_64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_64_OGRE_VERSION1.12.yaml | 4 ++-- .ci_support/osx_arm64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_arm64_OGRE_VERSION1.12.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml index 92eb1dc8..3f0f8402 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.0' +- '12.1' OGRE_VERSION: - '1.10' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '12.0' +- '12.1' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml index 41602b80..5fa04aef 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.0' +- '12.1' OGRE_VERSION: - '1.12' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '12.0' +- '12.1' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml index 9dd735a5..423a8f2f 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.0' +- '12.1' OGRE_VERSION: - '1.10' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - arm64-apple-darwin20.0.0 macos_min_version: -- '12.0' +- '12.1' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml index 3f9985e2..7f995913 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.0' +- '12.1' OGRE_VERSION: - '1.12' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - arm64-apple-darwin20.0.0 macos_min_version: -- '12.0' +- '12.1' pin_run_as_build: boost-cpp: max_pin: x.x.x From 702b87f1ef3528445e9113afe628ba66422a432f Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 23 Sep 2022 12:07:25 +0200 Subject: [PATCH 16/55] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 284b9410..da09bd7d 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,7 +1,7 @@ macos_min_version: # [osx] - - 12.1 # [osx] + - 11.3 # [osx] MACOSX_DEPLOYMENT_TARGET: # [osx] - - 12.1 # [osx] + - 11.3 # [osx] # This is done to de-prioritize 1.12 OGRE_VERSION: From e28529a50075d80720e9be6260292c877877520a Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 23 Sep 2022 10:09:23 +0000 Subject: [PATCH 17/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.21.18.22.03 --- .ci_support/osx_64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_64_OGRE_VERSION1.12.yaml | 4 ++-- .ci_support/osx_arm64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_arm64_OGRE_VERSION1.12.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml index 3f0f8402..154dfc44 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.1' +- '11.3' OGRE_VERSION: - '1.10' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '12.1' +- '11.3' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml index 5fa04aef..bd71b18f 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.1' +- '11.3' OGRE_VERSION: - '1.12' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '12.1' +- '11.3' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml index 423a8f2f..5ceebe5d 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.1' +- '11.3' OGRE_VERSION: - '1.10' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - arm64-apple-darwin20.0.0 macos_min_version: -- '12.1' +- '11.3' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml index 7f995913..6004238c 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.1' +- '11.3' OGRE_VERSION: - '1.12' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - arm64-apple-darwin20.0.0 macos_min_version: -- '12.1' +- '11.3' pin_run_as_build: boost-cpp: max_pin: x.x.x From 3b3349a3bce7a0865a87feb73ec4cdee1ab57138 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 23 Sep 2022 14:59:42 +0200 Subject: [PATCH 18/55] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index da09bd7d..19b8fd53 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,8 +1,3 @@ -macos_min_version: # [osx] - - 11.3 # [osx] -MACOSX_DEPLOYMENT_TARGET: # [osx] - - 11.3 # [osx] - # This is done to de-prioritize 1.12 OGRE_VERSION: - "1.10" From 8a698a40a0f49a993fcf10e7ead653d9b4a186d7 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 23 Sep 2022 13:01:54 +0000 Subject: [PATCH 19/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.21.18.22.03 --- .ci_support/osx_64_OGRE_VERSION1.10.yaml | 4 +--- .ci_support/osx_64_OGRE_VERSION1.12.yaml | 4 +--- .ci_support/osx_arm64_OGRE_VERSION1.10.yaml | 4 +--- .ci_support/osx_arm64_OGRE_VERSION1.12.yaml | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml index 154dfc44..fde54c85 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.3' +- '10.9' OGRE_VERSION: - '1.10' assimp: @@ -40,8 +40,6 @@ libprotobuf: - '3.21' macos_machine: - x86_64-apple-darwin13.4.0 -macos_min_version: -- '11.3' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml index bd71b18f..dcef9180 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.3' +- '10.9' OGRE_VERSION: - '1.12' assimp: @@ -40,8 +40,6 @@ libprotobuf: - '3.21' macos_machine: - x86_64-apple-darwin13.4.0 -macos_min_version: -- '11.3' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml index 5ceebe5d..5db094d3 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.3' +- '11.0' OGRE_VERSION: - '1.10' assimp: @@ -40,8 +40,6 @@ libprotobuf: - '3.21' macos_machine: - arm64-apple-darwin20.0.0 -macos_min_version: -- '11.3' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml index 6004238c..1db2afee 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.3' +- '11.0' OGRE_VERSION: - '1.12' assimp: @@ -40,8 +40,6 @@ libprotobuf: - '3.21' macos_machine: - arm64-apple-darwin20.0.0 -macos_min_version: -- '11.3' pin_run_as_build: boost-cpp: max_pin: x.x.x From abd14ea251057d737725cf26c4e046da48faafa1 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 23 Sep 2022 15:23:59 +0200 Subject: [PATCH 20/55] Update build.sh --- recipe/build.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/build.sh b/recipe/build.sh index 295a55c0..e1c0fc7c 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -34,6 +34,12 @@ if [[ "${target_platform}" == "osx-64" ]]; then export CXXFLAGS="-DBOOST_ASIO_DISABLE_STD_ALIGNED_ALLOC ${CXXFLAGS}" fi +# See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk +if [[ "${target_platform}" == "osx-64" ]]; then + export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" +fi + + if [[ "${CONDA_BUILD_CROSS_COMPILATION}" == "1" ]]; then export CMAKE_ARGS="${CMAKE_ARGS} -DFREEIMAGE_RUNS:BOOL=ON -DFREEIMAGE_RUNS__TRYRUN_OUTPUT:STRING="" -DFREEIMAGE_COMPILES:BOOL=ON -DProtobuf_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc -DGAZEBOMSGS_OUT_EXECUTABLE:STRING=`pwd`/../build-host/gazebo/msgs/gazebomsgs_out" fi From f6d845e07b13c50866569d584c54c2b3c0632f30 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 23 Sep 2022 16:24:11 +0200 Subject: [PATCH 21/55] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 19b8fd53..284b9410 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,3 +1,8 @@ +macos_min_version: # [osx] + - 12.1 # [osx] +MACOSX_DEPLOYMENT_TARGET: # [osx] + - 12.1 # [osx] + # This is done to de-prioritize 1.12 OGRE_VERSION: - "1.10" From 1d17860937468d4735d07640beb65be8efc1fc89 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 23 Sep 2022 16:24:42 +0200 Subject: [PATCH 22/55] 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 d47db595..fc44ccc7 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -145,7 +145,7 @@ requirements: - tbb-devel # graphviz is not found on win - graphviz # [not win] - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] + #- __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] test: commands: From 504975af082f8037ff741c2d83792ce4bb56f397 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 23 Sep 2022 14:26:36 +0000 Subject: [PATCH 23/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.21.18.22.03 --- .ci_support/osx_64_OGRE_VERSION1.10.yaml | 4 +++- .ci_support/osx_64_OGRE_VERSION1.12.yaml | 4 +++- .ci_support/osx_arm64_OGRE_VERSION1.10.yaml | 4 +++- .ci_support/osx_arm64_OGRE_VERSION1.12.yaml | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml index fde54c85..3f0f8402 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '12.1' OGRE_VERSION: - '1.10' assimp: @@ -40,6 +40,8 @@ libprotobuf: - '3.21' macos_machine: - x86_64-apple-darwin13.4.0 +macos_min_version: +- '12.1' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml index dcef9180..5fa04aef 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.9' +- '12.1' OGRE_VERSION: - '1.12' assimp: @@ -40,6 +40,8 @@ libprotobuf: - '3.21' macos_machine: - x86_64-apple-darwin13.4.0 +macos_min_version: +- '12.1' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml index 5db094d3..423a8f2f 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.0' +- '12.1' OGRE_VERSION: - '1.10' assimp: @@ -40,6 +40,8 @@ libprotobuf: - '3.21' macos_machine: - arm64-apple-darwin20.0.0 +macos_min_version: +- '12.1' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml index 1db2afee..7f995913 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '11.0' +- '12.1' OGRE_VERSION: - '1.12' assimp: @@ -40,6 +40,8 @@ libprotobuf: - '3.21' macos_machine: - arm64-apple-darwin20.0.0 +macos_min_version: +- '12.1' pin_run_as_build: boost-cpp: max_pin: x.x.x From 37ba10ae70f123bef077c8b060dcedf27d6ab695 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 23 Sep 2022 16:40:31 +0200 Subject: [PATCH 24/55] Update conda-forge.yml --- conda-forge.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index c6495923..2e25b890 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -8,3 +8,7 @@ github: provider: linux_aarch64: default test_on_native_only: true +azure: + settings_osx: + pool: + vmImage: macos-12 From 1fd0c74da6569e773caf080f09e5dd51920a9dfb Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 23 Sep 2022 14:47:20 +0000 Subject: [PATCH 25/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.21.18.22.03 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 553bd419..51b3e49a 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-11 + vmImage: macos-12 strategy: matrix: osx_64_OGRE_VERSION1.10: From 60940fa20b7b176ec1070ece1952d8b0ebb27b74 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 23 Sep 2022 16:50:39 +0200 Subject: [PATCH 26/55] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 284b9410..8c1a0b46 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,7 +1,7 @@ macos_min_version: # [osx] - - 12.1 # [osx] + - 12.3 # [osx] MACOSX_DEPLOYMENT_TARGET: # [osx] - - 12.1 # [osx] + - 12.3 # [osx] # This is done to de-prioritize 1.12 OGRE_VERSION: From 228b85e780cd6a92f4e84b9d4dcd4901802ebaf7 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 23 Sep 2022 16:52:22 +0200 Subject: [PATCH 27/55] 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 fc44ccc7..30b89df2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -145,7 +145,7 @@ requirements: - tbb-devel # graphviz is not found on win - graphviz # [not win] - #- __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] + __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx] test: commands: From 531b6919ca247c227b6d9a2f078358d92f3bb6f0 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 23 Sep 2022 16:54:04 +0200 Subject: [PATCH 28/55] 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 30b89df2..b193b457 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -145,7 +145,7 @@ requirements: - tbb-devel # graphviz is not found on win - graphviz # [not win] - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx] + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx] test: commands: From 0e0a26501fdd6927ee4aa4985c9544c1ede33fa5 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 24 Sep 2022 10:09:29 +0000 Subject: [PATCH 29/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.23.15.53.14 --- .ci_support/osx_64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_64_OGRE_VERSION1.12.yaml | 4 ++-- .ci_support/osx_arm64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_arm64_OGRE_VERSION1.12.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml index 3f0f8402..d4bb81f5 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.1' +- '12.3' OGRE_VERSION: - '1.10' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '12.1' +- '12.3' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml index 5fa04aef..5c05d76d 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.1' +- '12.3' OGRE_VERSION: - '1.12' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '12.1' +- '12.3' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml index 423a8f2f..cb2472ea 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.1' +- '12.3' OGRE_VERSION: - '1.10' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - arm64-apple-darwin20.0.0 macos_min_version: -- '12.1' +- '12.3' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml index 7f995913..f64c90f2 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.1' +- '12.3' OGRE_VERSION: - '1.12' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - arm64-apple-darwin20.0.0 macos_min_version: -- '12.1' +- '12.3' pin_run_as_build: boost-cpp: max_pin: x.x.x From 54b2eb87d378434b468462c6c856cc9f96ce3af5 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Sat, 24 Sep 2022 15:11:16 +0200 Subject: [PATCH 30/55] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 8c1a0b46..d3f56484 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -12,10 +12,6 @@ c_compiler: # [win] - vs2019 # [win] cxx_compiler: # [win] - vs2019 # [win] -c_compiler_version: # [osx] - - 11 # [osx] -cxx_compiler_version: # [osx] - - 11 # [osx] cudnn: # [linux64] - undefined # [linux64] cuda_compiler_version: # [linux64] From 7efea3c81f42d7537b618e5254087d689ab662a6 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Sat, 24 Sep 2022 13:13:11 +0000 Subject: [PATCH 31/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.1, and conda-forge-pinning 2022.09.23.15.53.14 --- .ci_support/osx_64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_64_OGRE_VERSION1.12.yaml | 4 ++-- .ci_support/osx_arm64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_arm64_OGRE_VERSION1.12.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml index d4bb81f5..aca45178 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.10.yaml @@ -11,7 +11,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '14' channel_sources: - conda-forge channel_targets: @@ -21,7 +21,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '14' ffmpeg: - '4.4' graphviz: diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml index 5c05d76d..5088dde4 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.12.yaml @@ -11,7 +11,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '14' channel_sources: - conda-forge channel_targets: @@ -21,7 +21,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '14' ffmpeg: - '4.4' graphviz: diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml index cb2472ea..6deb90ef 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml @@ -11,7 +11,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '14' channel_sources: - conda-forge channel_targets: @@ -21,7 +21,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '14' ffmpeg: - '4.4' graphviz: diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml index f64c90f2..fa00452a 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml @@ -11,7 +11,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '11' +- '14' channel_sources: - conda-forge channel_targets: @@ -21,7 +21,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '11' +- '14' ffmpeg: - '4.4' graphviz: From 5431e87106d2aa42676034d7224bcbdb5ffe1f92 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 6 Oct 2022 19:41:52 +0200 Subject: [PATCH 32/55] Update conda-forge.yml --- conda-forge.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conda-forge.yml b/conda-forge.yml index 2e25b890..c6495923 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -8,7 +8,3 @@ github: provider: linux_aarch64: default test_on_native_only: true -azure: - settings_osx: - pool: - vmImage: macos-12 From 9cd22f54a753d2ca574e6ded5e73fb717a5557f4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 6 Oct 2022 19:42:50 +0200 Subject: [PATCH 33/55] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index d3f56484..1eb6b40d 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,7 +1,7 @@ -macos_min_version: # [osx] - - 12.3 # [osx] -MACOSX_DEPLOYMENT_TARGET: # [osx] - - 12.3 # [osx] +macos_min_version: # [osx and x86_64] + - 10.14 # [osx and x86_64] +MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] + - 10.14 # [osx and x86_64] # This is done to de-prioritize 1.12 OGRE_VERSION: From b2ba46eea087917c72143affe86cd1c09648d318 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 6 Oct 2022 19:43:10 +0200 Subject: [PATCH 34/55] 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 b193b457..d47db595 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -145,7 +145,7 @@ requirements: - tbb-devel # graphviz is not found on win - graphviz # [not win] - - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx] + - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64] test: commands: From ca0deb12d76bf35c21ec709e36fcc3e45d7f8093 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 6 Oct 2022 19:43:42 +0200 Subject: [PATCH 35/55] Update build.sh --- recipe/build.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index e1c0fc7c..295a55c0 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -34,12 +34,6 @@ if [[ "${target_platform}" == "osx-64" ]]; then export CXXFLAGS="-DBOOST_ASIO_DISABLE_STD_ALIGNED_ALLOC ${CXXFLAGS}" fi -# See https://conda-forge.org/docs/maintainer/knowledge_base.html#newer-c-features-with-old-sdk -if [[ "${target_platform}" == "osx-64" ]]; then - export CXXFLAGS="${CXXFLAGS} -D_LIBCPP_DISABLE_AVAILABILITY" -fi - - if [[ "${CONDA_BUILD_CROSS_COMPILATION}" == "1" ]]; then export CMAKE_ARGS="${CMAKE_ARGS} -DFREEIMAGE_RUNS:BOOL=ON -DFREEIMAGE_RUNS__TRYRUN_OUTPUT:STRING="" -DFREEIMAGE_COMPILES:BOOL=ON -DProtobuf_PROTOC_EXECUTABLE=$BUILD_PREFIX/bin/protoc -DGAZEBOMSGS_OUT_EXECUTABLE:STRING=`pwd`/../build-host/gazebo/msgs/gazebomsgs_out" fi From 5bafa4e826ffbd48a15ff17ddea30750949537c1 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Thu, 6 Oct 2022 17:45:26 +0000 Subject: [PATCH 36/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.2, and conda-forge-pinning 2022.10.05.18.50.28 --- .azure-pipelines/azure-pipelines-osx.yml | 2 +- .ci_support/linux_64_OGRE_VERSION1.10.yaml | 8 -------- .ci_support/linux_64_OGRE_VERSION1.12.yaml | 8 -------- .ci_support/linux_aarch64_OGRE_VERSION1.10.yaml | 8 -------- .ci_support/linux_aarch64_OGRE_VERSION1.12.yaml | 8 -------- .ci_support/migrations/graphviz6.yaml | 7 ------- .ci_support/osx_64_OGRE_VERSION1.10.yaml | 14 ++------------ .ci_support/osx_64_OGRE_VERSION1.12.yaml | 14 ++------------ .ci_support/osx_arm64_OGRE_VERSION1.10.yaml | 14 +------------- .ci_support/osx_arm64_OGRE_VERSION1.12.yaml | 14 +------------- .ci_support/win_64_OGRE_VERSION1.10.yaml | 6 ------ .ci_support/win_64_OGRE_VERSION1.12.yaml | 6 ------ 12 files changed, 7 insertions(+), 102 deletions(-) delete mode 100644 .ci_support/migrations/graphviz6.yaml diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 51b3e49a..553bd419 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macos-12 + vmImage: macOS-11 strategy: matrix: osx_64_OGRE_VERSION1.10: diff --git a/.ci_support/linux_64_OGRE_VERSION1.10.yaml b/.ci_support/linux_64_OGRE_VERSION1.10.yaml index c49be5cc..734ea6d2 100644 --- a/.ci_support/linux_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/linux_64_OGRE_VERSION1.10.yaml @@ -43,16 +43,8 @@ libuuid: pin_run_as_build: boost-cpp: max_pin: x.x.x - curl: - max_pin: x graphviz: max_pin: x - libcurl: - max_pin: x - libgdal: - max_pin: x.x - libuuid: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/linux_64_OGRE_VERSION1.12.yaml b/.ci_support/linux_64_OGRE_VERSION1.12.yaml index 401c9810..8dd9c5a8 100644 --- a/.ci_support/linux_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/linux_64_OGRE_VERSION1.12.yaml @@ -43,16 +43,8 @@ libuuid: pin_run_as_build: boost-cpp: max_pin: x.x.x - curl: - max_pin: x graphviz: max_pin: x - libcurl: - max_pin: x - libgdal: - max_pin: x.x - libuuid: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/linux_aarch64_OGRE_VERSION1.10.yaml b/.ci_support/linux_aarch64_OGRE_VERSION1.10.yaml index ca91133c..a0896692 100644 --- a/.ci_support/linux_aarch64_OGRE_VERSION1.10.yaml +++ b/.ci_support/linux_aarch64_OGRE_VERSION1.10.yaml @@ -47,16 +47,8 @@ libuuid: pin_run_as_build: boost-cpp: max_pin: x.x.x - curl: - max_pin: x graphviz: max_pin: x - libcurl: - max_pin: x - libgdal: - max_pin: x.x - libuuid: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml b/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml index 7fd6dc56..2f78d80a 100644 --- a/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml +++ b/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml @@ -47,16 +47,8 @@ libuuid: pin_run_as_build: boost-cpp: max_pin: x.x.x - curl: - max_pin: x graphviz: max_pin: x - libcurl: - max_pin: x - libgdal: - max_pin: x.x - libuuid: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/migrations/graphviz6.yaml b/.ci_support/migrations/graphviz6.yaml deleted file mode 100644 index d590d4bc..00000000 --- a/.ci_support/migrations/graphviz6.yaml +++ /dev/null @@ -1,7 +0,0 @@ -__migrator: - build_number: 1 - kind: version - migration_number: 1 -graphviz: -- '6' -migrator_ts: 1662854030.4341326 diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml index aca45178..f55e14ff 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.3' +- '10.14' OGRE_VERSION: - '1.10' assimp: @@ -41,22 +41,12 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '12.3' +- '10.14' pin_run_as_build: boost-cpp: max_pin: x.x.x - bzip2: - max_pin: x - curl: - max_pin: x graphviz: max_pin: x - libcurl: - max_pin: x - libgdal: - max_pin: x.x - zlib: - max_pin: x.x qt_main: - '5.15' target_platform: diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml index 5088dde4..a6cc819e 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.3' +- '10.14' OGRE_VERSION: - '1.12' assimp: @@ -41,22 +41,12 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '12.3' +- '10.14' pin_run_as_build: boost-cpp: max_pin: x.x.x - bzip2: - max_pin: x - curl: - max_pin: x graphviz: max_pin: x - libcurl: - max_pin: x - libgdal: - max_pin: x.x - zlib: - max_pin: x.x qt_main: - '5.15' target_platform: diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml index 6deb90ef..e703a4ef 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.3' +- '11.0' OGRE_VERSION: - '1.10' assimp: @@ -40,23 +40,11 @@ libprotobuf: - '3.21' macos_machine: - arm64-apple-darwin20.0.0 -macos_min_version: -- '12.3' pin_run_as_build: boost-cpp: max_pin: x.x.x - bzip2: - max_pin: x - curl: - max_pin: x graphviz: max_pin: x - libcurl: - max_pin: x - libgdal: - max_pin: x.x - zlib: - max_pin: x.x qt_main: - '5.15' target_platform: diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml index fa00452a..65b7ddfa 100644 --- a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '12.3' +- '11.0' OGRE_VERSION: - '1.12' assimp: @@ -40,23 +40,11 @@ libprotobuf: - '3.21' macos_machine: - arm64-apple-darwin20.0.0 -macos_min_version: -- '12.3' pin_run_as_build: boost-cpp: max_pin: x.x.x - bzip2: - max_pin: x - curl: - max_pin: x graphviz: max_pin: x - libcurl: - max_pin: x - libgdal: - max_pin: x.x - zlib: - max_pin: x.x qt_main: - '5.15' target_platform: diff --git a/.ci_support/win_64_OGRE_VERSION1.10.yaml b/.ci_support/win_64_OGRE_VERSION1.10.yaml index 1a371bb5..ee64a28d 100644 --- a/.ci_support/win_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/win_64_OGRE_VERSION1.10.yaml @@ -31,12 +31,6 @@ libprotobuf: pin_run_as_build: boost-cpp: max_pin: x.x.x - curl: - max_pin: x - libcurl: - max_pin: x - libgdal: - max_pin: x.x qt_main: - '5.15' target_platform: diff --git a/.ci_support/win_64_OGRE_VERSION1.12.yaml b/.ci_support/win_64_OGRE_VERSION1.12.yaml index bed6d60f..1ba8f60b 100644 --- a/.ci_support/win_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/win_64_OGRE_VERSION1.12.yaml @@ -31,12 +31,6 @@ libprotobuf: pin_run_as_build: boost-cpp: max_pin: x.x.x - curl: - max_pin: x - libcurl: - max_pin: x - libgdal: - max_pin: x.x qt_main: - '5.15' target_platform: From ebeea0fe50498bcbf6a4246595921ee94340f7a4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 6 Oct 2022 19:45:31 +0200 Subject: [PATCH 37/55] Create add_explicit_template_instantiation_on_clang.patch --- ...icit_template_instantiation_on_clang.patch | 462 ++++++++++++++++++ 1 file changed, 462 insertions(+) create mode 100644 recipe/add_explicit_template_instantiation_on_clang.patch diff --git a/recipe/add_explicit_template_instantiation_on_clang.patch b/recipe/add_explicit_template_instantiation_on_clang.patch new file mode 100644 index 00000000..2ec13a37 --- /dev/null +++ b/recipe/add_explicit_template_instantiation_on_clang.patch @@ -0,0 +1,462 @@ +diff --git a/gazebo/common/FuelModelDatabase.hh b/gazebo/common/FuelModelDatabase.hh +index 81daafbefc..5bf760b6c6 100644 +--- a/gazebo/common/FuelModelDatabase.hh ++++ b/gazebo/common/FuelModelDatabase.hh +@@ -38,9 +38,6 @@ + /// \brief The file name of model database XML configuration. + #define GZ_MODEL_DB_MANIFEST_FILENAME "database.config" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo, common, FuelModelDatabase) +- + namespace gazebo + { + namespace common +@@ -134,4 +131,8 @@ namespace gazebo + }; + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_COMMON_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/common/MeshManager.hh b/gazebo/common/MeshManager.hh +index a6778cc07d..92846a65c8 100644 +--- a/gazebo/common/MeshManager.hh ++++ b/gazebo/common/MeshManager.hh +@@ -30,9 +30,6 @@ + #include "gazebo/common/CommonTypes.hh" + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo, common, MeshManager) +- + namespace gazebo + { + namespace common +@@ -271,4 +268,8 @@ namespace gazebo + /// \} + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_COMMON_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/common/ModelDatabase.hh b/gazebo/common/ModelDatabase.hh +index 0821abad8d..698475ea42 100644 +--- a/gazebo/common/ModelDatabase.hh ++++ b/gazebo/common/ModelDatabase.hh +@@ -33,9 +33,6 @@ + /// \brief The file name of model database XML configuration. + #define GZ_MODEL_DB_MANIFEST_FILENAME "database.config" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo, common, ModelDatabase) +- + namespace gazebo + { + namespace common +@@ -162,4 +159,8 @@ namespace gazebo + }; + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_COMMON_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/common/SystemPaths.hh b/gazebo/common/SystemPaths.hh +index 3c62d28c07..e315747d60 100644 +--- a/gazebo/common/SystemPaths.hh ++++ b/gazebo/common/SystemPaths.hh +@@ -37,9 +37,6 @@ + #include "gazebo/common/SingletonT.hh" + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo, common, SystemPaths) +- + namespace gazebo + { + namespace common +@@ -223,4 +220,8 @@ namespace gazebo + /// \} + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_COMMON_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/gui/KeyEventHandler.hh b/gazebo/gui/KeyEventHandler.hh +index 61e4d9046e..05bcd125c6 100644 +--- a/gazebo/gui/KeyEventHandler.hh ++++ b/gazebo/gui/KeyEventHandler.hh +@@ -25,9 +25,6 @@ + #include "gazebo/common/SingletonT.hh" + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, KeyEventHandler) +- + namespace gazebo + { + namespace common +@@ -154,4 +151,8 @@ namespace gazebo + }; + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_GUI_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/gui/ModelAlign.hh b/gazebo/gui/ModelAlign.hh +index 2b38a6a355..392257564a 100644 +--- a/gazebo/gui/ModelAlign.hh ++++ b/gazebo/gui/ModelAlign.hh +@@ -33,9 +33,6 @@ + + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, ModelAlign) +- + namespace gazebo + { + namespace gui +@@ -106,4 +103,8 @@ namespace gazebo + }; + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_GUI_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/gui/ModelManipulator.hh b/gazebo/gui/ModelManipulator.hh +index ecd06954b7..403b06ff7e 100644 +--- a/gazebo/gui/ModelManipulator.hh ++++ b/gazebo/gui/ModelManipulator.hh +@@ -31,9 +31,6 @@ + #include "gazebo/common/SingletonT.hh" + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, ModelManipulator) +- + namespace gazebo + { + namespace gui +@@ -188,4 +185,8 @@ namespace gazebo + }; + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_GUI_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/gui/ModelSnap.hh b/gazebo/gui/ModelSnap.hh +index e942a256c6..166400fd24 100644 +--- a/gazebo/gui/ModelSnap.hh ++++ b/gazebo/gui/ModelSnap.hh +@@ -26,9 +26,6 @@ + #include "gazebo/rendering/RenderTypes.hh" + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, ModelSnap) +- + namespace gazebo + { + namespace common +@@ -120,4 +117,8 @@ namespace gazebo + }; + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_GUI_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/gui/MouseEventHandler.hh b/gazebo/gui/MouseEventHandler.hh +index 42c09c3042..5239661f84 100644 +--- a/gazebo/gui/MouseEventHandler.hh ++++ b/gazebo/gui/MouseEventHandler.hh +@@ -25,9 +25,6 @@ + #include "gazebo/common/MouseEvent.hh" + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, MouseEventHandler) +- + namespace gazebo + { + namespace gui +@@ -173,4 +170,8 @@ namespace gazebo + }; + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_GUI_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/gui/plot/PlotManager.hh b/gazebo/gui/plot/PlotManager.hh +index 0a31e7ac3e..fdb6f6c549 100644 +--- a/gazebo/gui/plot/PlotManager.hh ++++ b/gazebo/gui/plot/PlotManager.hh +@@ -25,9 +25,6 @@ + #include "gazebo/gui/plot/PlottingTypes.hh" + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, PlotManager) +- + namespace gazebo + { + namespace gui +@@ -96,4 +93,8 @@ namespace gazebo + }; + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_GUI_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/rendering/RTShaderSystem.hh b/gazebo/rendering/RTShaderSystem.hh +index 61da4d25ee..5a380d2f15 100644 +--- a/gazebo/rendering/RTShaderSystem.hh ++++ b/gazebo/rendering/RTShaderSystem.hh +@@ -28,9 +28,6 @@ + #include "gazebo/common/SingletonT.hh" + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_RENDERING_VISIBLE, gazebo, rendering, RTShaderSystem) +- + namespace gazebo + { + namespace rendering +@@ -197,4 +194,8 @@ namespace gazebo + /// \} + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_RENDERING_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/rendering/RenderEngine.hh b/gazebo/rendering/RenderEngine.hh +index ae62ae8457..f8857c7dca 100644 +--- a/gazebo/rendering/RenderEngine.hh ++++ b/gazebo/rendering/RenderEngine.hh +@@ -27,9 +27,6 @@ + #include "gazebo/rendering/RenderTypes.hh" + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_RENDERING_VISIBLE, gazebo, rendering, RenderEngine) +- + namespace Ogre + { + class Root; +@@ -188,4 +185,8 @@ namespace gazebo + /// \} + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_RENDERING_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/sensors/SensorManager.hh b/gazebo/sensors/SensorManager.hh +index dea9caee49..10c6f57f4c 100644 +--- a/gazebo/sensors/SensorManager.hh ++++ b/gazebo/sensors/SensorManager.hh +@@ -33,9 +33,6 @@ + #include "gazebo/sensors/Sensor.hh" + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_SENSORS_VISIBLE, gazebo, sensors, SensorManager) +- + namespace gazebo + { + /// \ingroup gazebo_sensors +@@ -344,4 +341,8 @@ namespace gazebo + /// \} + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_SENSORS_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/transport/ConnectionManager.hh b/gazebo/transport/ConnectionManager.hh +index 6dc212bc13..9c9e4e0caa 100644 +--- a/gazebo/transport/ConnectionManager.hh ++++ b/gazebo/transport/ConnectionManager.hh +@@ -34,9 +34,6 @@ + #endif + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_TRANSPORT_VISIBLE, gazebo, transport, ConnectionManager) +- + namespace gazebo + { + namespace transport +@@ -208,4 +205,8 @@ namespace gazebo + /// \} + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_TRANSPORT_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/transport/TopicManager.hh b/gazebo/transport/TopicManager.hh +index b2adc04c8d..a9189aa380 100644 +--- a/gazebo/transport/TopicManager.hh ++++ b/gazebo/transport/TopicManager.hh +@@ -44,9 +44,6 @@ + #include "gazebo/transport/Subscriber.hh" + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_TRANSPORT_VISIBLE, gazebo, transport, TopicManager) +- + namespace gazebo + { + namespace transport +@@ -272,4 +269,8 @@ namespace gazebo + /// \} + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_TRANSPORT_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/util/Diagnostics.hh b/gazebo/util/Diagnostics.hh +index 1b5782fdb1..d9f7e321c2 100644 +--- a/gazebo/util/Diagnostics.hh ++++ b/gazebo/util/Diagnostics.hh +@@ -29,9 +29,6 @@ + #include "gazebo/util/UtilTypes.hh" + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo, util, DiagnosticManager) +- + namespace gazebo + { + namespace util +@@ -190,4 +187,8 @@ namespace gazebo + /// \} + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_UTIL_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/util/IntrospectionManager.hh b/gazebo/util/IntrospectionManager.hh +index b471a7a907..6f16f220f7 100644 +--- a/gazebo/util/IntrospectionManager.hh ++++ b/gazebo/util/IntrospectionManager.hh +@@ -31,9 +31,6 @@ + #include "gazebo/msgs/param_v.pb.h" + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo, util, IntrospectionManager) +- + namespace gazebo + { + namespace util +@@ -203,4 +200,8 @@ namespace gazebo + /// \} + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_UTIL_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/util/LogPlay.hh b/gazebo/util/LogPlay.hh +index d3ba5a31e2..270926d473 100644 +--- a/gazebo/util/LogPlay.hh ++++ b/gazebo/util/LogPlay.hh +@@ -24,9 +24,6 @@ + #include "gazebo/common/Time.hh" + #include "gazebo/util/system.hh" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo, util, LogPlay) +- + namespace gazebo + { + namespace util +@@ -195,4 +192,7 @@ namespace gazebo + } + } + ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_UTIL_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/util/LogRecord.hh b/gazebo/util/LogRecord.hh +index 525d6d4e4a..fda4fe2c83 100644 +--- a/gazebo/util/LogRecord.hh ++++ b/gazebo/util/LogRecord.hh +@@ -27,9 +27,6 @@ + + #define GZ_LOG_VERSION "1.0" + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo, util, LogRecord) +- + namespace gazebo + { + namespace util +@@ -272,4 +269,8 @@ namespace gazebo + /// \} + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_UTIL_VISIBLE ::SingletonT; ++ + #endif +diff --git a/gazebo/util/OpenAL.hh b/gazebo/util/OpenAL.hh +index a98c926e31..4ae05db282 100644 +--- a/gazebo/util/OpenAL.hh ++++ b/gazebo/util/OpenAL.hh +@@ -33,9 +33,6 @@ + + #ifdef HAVE_OPENAL + +-/// \brief Explicit instantiation for typed SingletonT. +-GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo, util, OpenAL) +- + namespace gazebo + { + namespace util +@@ -201,5 +198,10 @@ namespace gazebo + /// \} + } + } ++ ++/// \brief Explicit instantiation for typed SingletonT. ++template class GZ_UTIL_VISIBLE ::SingletonT; ++ ++ + #endif + #endif + From 11cb1538e9f8ff5ed5d062b19388139b1a690a3b Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 6 Oct 2022 19:45:43 +0200 Subject: [PATCH 38/55] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d47db595..7e9b33d4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,6 +13,7 @@ source: - use-external-libs-config.patch - fix-invisible-meshes.patch - 3190.patch + - add_explicit_template_instantiation_on_clang.patch build: number: 1 From fe2f9ff0550b7a1147be43aa1d0b461fb5ceb424 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 6 Oct 2022 23:32:52 +0200 Subject: [PATCH 39/55] Update add_explicit_template_instantiation_on_clang.patch --- ...icit_template_instantiation_on_clang.patch | 446 ++---------------- 1 file changed, 29 insertions(+), 417 deletions(-) diff --git a/recipe/add_explicit_template_instantiation_on_clang.patch b/recipe/add_explicit_template_instantiation_on_clang.patch index 2ec13a37..7b32f373 100644 --- a/recipe/add_explicit_template_instantiation_on_clang.patch +++ b/recipe/add_explicit_template_instantiation_on_clang.patch @@ -1,304 +1,19 @@ -diff --git a/gazebo/common/FuelModelDatabase.hh b/gazebo/common/FuelModelDatabase.hh -index 81daafbefc..5bf760b6c6 100644 ---- a/gazebo/common/FuelModelDatabase.hh -+++ b/gazebo/common/FuelModelDatabase.hh -@@ -38,9 +38,6 @@ - /// \brief The file name of model database XML configuration. - #define GZ_MODEL_DB_MANIFEST_FILENAME "database.config" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo, common, FuelModelDatabase) -- - namespace gazebo - { - namespace common -@@ -134,4 +131,8 @@ namespace gazebo - }; - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_COMMON_VISIBLE ::SingletonT; -+ - #endif -diff --git a/gazebo/common/MeshManager.hh b/gazebo/common/MeshManager.hh -index a6778cc07d..92846a65c8 100644 ---- a/gazebo/common/MeshManager.hh -+++ b/gazebo/common/MeshManager.hh -@@ -30,9 +30,6 @@ - #include "gazebo/common/CommonTypes.hh" - #include "gazebo/util/system.hh" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo, common, MeshManager) -- - namespace gazebo - { - namespace common -@@ -271,4 +268,8 @@ namespace gazebo - /// \} - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_COMMON_VISIBLE ::SingletonT; -+ - #endif -diff --git a/gazebo/common/ModelDatabase.hh b/gazebo/common/ModelDatabase.hh -index 0821abad8d..698475ea42 100644 ---- a/gazebo/common/ModelDatabase.hh -+++ b/gazebo/common/ModelDatabase.hh -@@ -33,9 +33,6 @@ - /// \brief The file name of model database XML configuration. - #define GZ_MODEL_DB_MANIFEST_FILENAME "database.config" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo, common, ModelDatabase) -- - namespace gazebo - { - namespace common -@@ -162,4 +159,8 @@ namespace gazebo - }; - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_COMMON_VISIBLE ::SingletonT; -+ - #endif -diff --git a/gazebo/common/SystemPaths.hh b/gazebo/common/SystemPaths.hh -index 3c62d28c07..e315747d60 100644 ---- a/gazebo/common/SystemPaths.hh -+++ b/gazebo/common/SystemPaths.hh -@@ -37,9 +37,6 @@ - #include "gazebo/common/SingletonT.hh" - #include "gazebo/util/system.hh" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_COMMON_VISIBLE, gazebo, common, SystemPaths) -- - namespace gazebo - { - namespace common -@@ -223,4 +220,8 @@ namespace gazebo - /// \} - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_COMMON_VISIBLE ::SingletonT; -+ - #endif -diff --git a/gazebo/gui/KeyEventHandler.hh b/gazebo/gui/KeyEventHandler.hh -index 61e4d9046e..05bcd125c6 100644 ---- a/gazebo/gui/KeyEventHandler.hh -+++ b/gazebo/gui/KeyEventHandler.hh -@@ -25,9 +25,6 @@ - #include "gazebo/common/SingletonT.hh" - #include "gazebo/util/system.hh" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, KeyEventHandler) -- - namespace gazebo - { - namespace common -@@ -154,4 +151,8 @@ namespace gazebo - }; - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_GUI_VISIBLE ::SingletonT; -+ - #endif -diff --git a/gazebo/gui/ModelAlign.hh b/gazebo/gui/ModelAlign.hh -index 2b38a6a355..392257564a 100644 ---- a/gazebo/gui/ModelAlign.hh -+++ b/gazebo/gui/ModelAlign.hh -@@ -33,9 +33,6 @@ - - #include "gazebo/util/system.hh" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, ModelAlign) -- - namespace gazebo - { - namespace gui -@@ -106,4 +103,8 @@ namespace gazebo - }; - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_GUI_VISIBLE ::SingletonT; -+ - #endif -diff --git a/gazebo/gui/ModelManipulator.hh b/gazebo/gui/ModelManipulator.hh -index ecd06954b7..403b06ff7e 100644 ---- a/gazebo/gui/ModelManipulator.hh -+++ b/gazebo/gui/ModelManipulator.hh -@@ -31,9 +31,6 @@ - #include "gazebo/common/SingletonT.hh" - #include "gazebo/util/system.hh" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, ModelManipulator) -- - namespace gazebo - { - namespace gui -@@ -188,4 +185,8 @@ namespace gazebo - }; - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_GUI_VISIBLE ::SingletonT; -+ - #endif -diff --git a/gazebo/gui/ModelSnap.hh b/gazebo/gui/ModelSnap.hh -index e942a256c6..166400fd24 100644 ---- a/gazebo/gui/ModelSnap.hh -+++ b/gazebo/gui/ModelSnap.hh -@@ -26,9 +26,6 @@ - #include "gazebo/rendering/RenderTypes.hh" - #include "gazebo/util/system.hh" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, ModelSnap) -- - namespace gazebo - { - namespace common -@@ -120,4 +117,8 @@ namespace gazebo - }; - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_GUI_VISIBLE ::SingletonT; -+ - #endif -diff --git a/gazebo/gui/MouseEventHandler.hh b/gazebo/gui/MouseEventHandler.hh -index 42c09c3042..5239661f84 100644 ---- a/gazebo/gui/MouseEventHandler.hh -+++ b/gazebo/gui/MouseEventHandler.hh -@@ -25,9 +25,6 @@ - #include "gazebo/common/MouseEvent.hh" - #include "gazebo/util/system.hh" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, MouseEventHandler) -- - namespace gazebo - { - namespace gui -@@ -173,4 +170,8 @@ namespace gazebo - }; - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_GUI_VISIBLE ::SingletonT; -+ - #endif -diff --git a/gazebo/gui/plot/PlotManager.hh b/gazebo/gui/plot/PlotManager.hh -index 0a31e7ac3e..fdb6f6c549 100644 ---- a/gazebo/gui/plot/PlotManager.hh -+++ b/gazebo/gui/plot/PlotManager.hh -@@ -25,9 +25,6 @@ - #include "gazebo/gui/plot/PlottingTypes.hh" - #include "gazebo/util/system.hh" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_GUI_VISIBLE, gazebo, gui, PlotManager) -- - namespace gazebo - { - namespace gui -@@ -96,4 +93,8 @@ namespace gazebo - }; - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_GUI_VISIBLE ::SingletonT; -+ - #endif -diff --git a/gazebo/rendering/RTShaderSystem.hh b/gazebo/rendering/RTShaderSystem.hh -index 61da4d25ee..5a380d2f15 100644 ---- a/gazebo/rendering/RTShaderSystem.hh -+++ b/gazebo/rendering/RTShaderSystem.hh -@@ -28,9 +28,6 @@ - #include "gazebo/common/SingletonT.hh" - #include "gazebo/util/system.hh" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_RENDERING_VISIBLE, gazebo, rendering, RTShaderSystem) -- - namespace gazebo - { - namespace rendering -@@ -197,4 +194,8 @@ namespace gazebo - /// \} - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_RENDERING_VISIBLE ::SingletonT; -+ - #endif -diff --git a/gazebo/rendering/RenderEngine.hh b/gazebo/rendering/RenderEngine.hh -index ae62ae8457..f8857c7dca 100644 ---- a/gazebo/rendering/RenderEngine.hh -+++ b/gazebo/rendering/RenderEngine.hh -@@ -27,9 +27,6 @@ - #include "gazebo/rendering/RenderTypes.hh" - #include "gazebo/util/system.hh" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_RENDERING_VISIBLE, gazebo, rendering, RenderEngine) -- - namespace Ogre - { - class Root; -@@ -188,4 +185,8 @@ namespace gazebo - /// \} - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_RENDERING_VISIBLE ::SingletonT; +diff --git a/gazebo/transport/ConnectionManager.cc b/gazebo/transport/ConnectionManager.cc +index 17016a4362..8042c9d6fb 100644 +--- a/gazebo/transport/ConnectionManager.cc ++++ b/gazebo/transport/ConnectionManager.cc +@@ -67,6 +67,9 @@ class TopicManagerConnectionTask + private: msgs::Publish pub; + }; + ++////////////////////////////////////////////////// ++template class GZ_TRANSPORT_VISIBLE ::SingletonT; + - #endif -diff --git a/gazebo/sensors/SensorManager.hh b/gazebo/sensors/SensorManager.hh -index dea9caee49..10c6f57f4c 100644 ---- a/gazebo/sensors/SensorManager.hh -+++ b/gazebo/sensors/SensorManager.hh -@@ -33,9 +33,6 @@ - #include "gazebo/sensors/Sensor.hh" - #include "gazebo/util/system.hh" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_SENSORS_VISIBLE, gazebo, sensors, SensorManager) -- - namespace gazebo + ////////////////////////////////////////////////// + ConnectionManager::ConnectionManager() { - /// \ingroup gazebo_sensors -@@ -344,4 +341,8 @@ namespace gazebo - /// \} - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_SENSORS_VISIBLE ::SingletonT; -+ - #endif diff --git a/gazebo/transport/ConnectionManager.hh b/gazebo/transport/ConnectionManager.hh -index 6dc212bc13..9c9e4e0caa 100644 +index 6dc212bc13..45ab732661 100644 --- a/gazebo/transport/ConnectionManager.hh +++ b/gazebo/transport/ConnectionManager.hh @@ -34,9 +34,6 @@ @@ -317,11 +32,24 @@ index 6dc212bc13..9c9e4e0caa 100644 } + +/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_TRANSPORT_VISIBLE ::SingletonT; ++extern template class GZ_TRANSPORT_VISIBLE ::SingletonT; + #endif +diff --git a/gazebo/transport/TopicManager.cc b/gazebo/transport/TopicManager.cc +index 14fa782fa4..6c036205ee 100644 +--- a/gazebo/transport/TopicManager.cc ++++ b/gazebo/transport/TopicManager.cc +@@ -48,6 +48,8 @@ class NodeProcess_TBB + private: std::vector *nodes; + }; + ++////////////////////////////////////////////////// ++template class GZ_TRANSPORT_VISIBLE ::SingletonT; + + ////////////////////////////////////////////////// + TopicManager::TopicManager() diff --git a/gazebo/transport/TopicManager.hh b/gazebo/transport/TopicManager.hh -index b2adc04c8d..a9189aa380 100644 +index b2adc04c8d..c7df09af63 100644 --- a/gazebo/transport/TopicManager.hh +++ b/gazebo/transport/TopicManager.hh @@ -44,9 +44,6 @@ @@ -340,123 +68,7 @@ index b2adc04c8d..a9189aa380 100644 } + +/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_TRANSPORT_VISIBLE ::SingletonT; -+ - #endif -diff --git a/gazebo/util/Diagnostics.hh b/gazebo/util/Diagnostics.hh -index 1b5782fdb1..d9f7e321c2 100644 ---- a/gazebo/util/Diagnostics.hh -+++ b/gazebo/util/Diagnostics.hh -@@ -29,9 +29,6 @@ - #include "gazebo/util/UtilTypes.hh" - #include "gazebo/util/system.hh" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo, util, DiagnosticManager) -- - namespace gazebo - { - namespace util -@@ -190,4 +187,8 @@ namespace gazebo - /// \} - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_UTIL_VISIBLE ::SingletonT; -+ - #endif -diff --git a/gazebo/util/IntrospectionManager.hh b/gazebo/util/IntrospectionManager.hh -index b471a7a907..6f16f220f7 100644 ---- a/gazebo/util/IntrospectionManager.hh -+++ b/gazebo/util/IntrospectionManager.hh -@@ -31,9 +31,6 @@ - #include "gazebo/msgs/param_v.pb.h" - #include "gazebo/util/system.hh" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo, util, IntrospectionManager) -- - namespace gazebo - { - namespace util -@@ -203,4 +200,8 @@ namespace gazebo - /// \} - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_UTIL_VISIBLE ::SingletonT; -+ - #endif -diff --git a/gazebo/util/LogPlay.hh b/gazebo/util/LogPlay.hh -index d3ba5a31e2..270926d473 100644 ---- a/gazebo/util/LogPlay.hh -+++ b/gazebo/util/LogPlay.hh -@@ -24,9 +24,6 @@ - #include "gazebo/common/Time.hh" - #include "gazebo/util/system.hh" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo, util, LogPlay) -- - namespace gazebo - { - namespace util -@@ -195,4 +192,7 @@ namespace gazebo - } - } - -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_UTIL_VISIBLE ::SingletonT; -+ - #endif -diff --git a/gazebo/util/LogRecord.hh b/gazebo/util/LogRecord.hh -index 525d6d4e4a..fda4fe2c83 100644 ---- a/gazebo/util/LogRecord.hh -+++ b/gazebo/util/LogRecord.hh -@@ -27,9 +27,6 @@ - - #define GZ_LOG_VERSION "1.0" - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo, util, LogRecord) -- - namespace gazebo - { - namespace util -@@ -272,4 +269,8 @@ namespace gazebo - /// \} - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_UTIL_VISIBLE ::SingletonT; ++extern template class GZ_TRANSPORT_VISIBLE ::SingletonT; + #endif -diff --git a/gazebo/util/OpenAL.hh b/gazebo/util/OpenAL.hh -index a98c926e31..4ae05db282 100644 ---- a/gazebo/util/OpenAL.hh -+++ b/gazebo/util/OpenAL.hh -@@ -33,9 +33,6 @@ - #ifdef HAVE_OPENAL - --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_UTIL_VISIBLE, gazebo, util, OpenAL) -- - namespace gazebo - { - namespace util -@@ -201,5 +198,10 @@ namespace gazebo - /// \} - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+template class GZ_UTIL_VISIBLE ::SingletonT; -+ -+ - #endif - #endif - From e317e6bbef683422ab9f216ea76416676786cac0 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Fri, 7 Oct 2022 13:25:30 +0200 Subject: [PATCH 40/55] Update conda_build_config.yaml --- recipe/conda_build_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 1eb6b40d..194e25c4 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,7 +1,7 @@ macos_min_version: # [osx and x86_64] - - 10.14 # [osx and x86_64] + - 10.15 # [osx and x86_64] MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - 10.14 # [osx and x86_64] + - 10.15 # [osx and x86_64] # This is done to de-prioritize 1.12 OGRE_VERSION: From b7f99d6fdc1f2a1c48d9b666cb5f9c3c02a981bf Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Fri, 7 Oct 2022 11:27:12 +0000 Subject: [PATCH 41/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.2, and conda-forge-pinning 2022.10.06.21.48.30 --- .ci_support/osx_64_OGRE_VERSION1.10.yaml | 4 ++-- .ci_support/osx_64_OGRE_VERSION1.12.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml index f55e14ff..9e601e06 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.10.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.10.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.14' +- '10.15' OGRE_VERSION: - '1.10' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '10.14' +- '10.15' pin_run_as_build: boost-cpp: max_pin: x.x.x diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml index a6cc819e..8fb24bdc 100644 --- a/.ci_support/osx_64_OGRE_VERSION1.12.yaml +++ b/.ci_support/osx_64_OGRE_VERSION1.12.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.14' +- '10.15' OGRE_VERSION: - '1.12' assimp: @@ -41,7 +41,7 @@ libprotobuf: macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: -- '10.14' +- '10.15' pin_run_as_build: boost-cpp: max_pin: x.x.x From d2082abf885bd1342a904a32226f55cd056d69bf Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 11 Oct 2022 09:45:25 +0200 Subject: [PATCH 42/55] Update add_explicit_template_instantiation_on_clang.patch --- ...icit_template_instantiation_on_clang.patch | 89 ++++++++----------- 1 file changed, 39 insertions(+), 50 deletions(-) diff --git a/recipe/add_explicit_template_instantiation_on_clang.patch b/recipe/add_explicit_template_instantiation_on_clang.patch index 7b32f373..0d9136b7 100644 --- a/recipe/add_explicit_template_instantiation_on_clang.patch +++ b/recipe/add_explicit_template_instantiation_on_clang.patch @@ -1,74 +1,63 @@ diff --git a/gazebo/transport/ConnectionManager.cc b/gazebo/transport/ConnectionManager.cc -index 17016a4362..8042c9d6fb 100644 +index 17016a4362..4463a258ff 100644 --- a/gazebo/transport/ConnectionManager.cc +++ b/gazebo/transport/ConnectionManager.cc -@@ -67,6 +67,9 @@ class TopicManagerConnectionTask - private: msgs::Publish pub; - }; +@@ -88,6 +88,12 @@ ConnectionManager::~ConnectionManager() + this->Fini(); + } +////////////////////////////////////////////////// -+template class GZ_TRANSPORT_VISIBLE ::SingletonT; ++static ConnectionManager* Instance() ++{ ++ return SingletonT::Instance(); ++} + ////////////////////////////////////////////////// - ConnectionManager::ConnectionManager() - { + bool ConnectionManager::Init(const std::string &_masterHost, + unsigned int _masterPort, diff --git a/gazebo/transport/ConnectionManager.hh b/gazebo/transport/ConnectionManager.hh -index 6dc212bc13..45ab732661 100644 +index 6dc212bc13..65169d1e69 100644 --- a/gazebo/transport/ConnectionManager.hh +++ b/gazebo/transport/ConnectionManager.hh -@@ -34,9 +34,6 @@ - #endif - #include "gazebo/util/system.hh" +@@ -167,6 +167,9 @@ namespace gazebo + /// \brief Run the manager update loop once + private: void RunUpdate(); --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_TRANSPORT_VISIBLE, gazebo, transport, ConnectionManager) -- - namespace gazebo - { - namespace transport -@@ -208,4 +205,8 @@ namespace gazebo - /// \} - } - } ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static ConnectionManager* Instance(); + -+/// \brief Explicit instantiation for typed SingletonT. -+extern template class GZ_TRANSPORT_VISIBLE ::SingletonT; -+ - #endif + /// \brief Condition used to trigger an update. + private: boost::condition_variable updateCondition; + diff --git a/gazebo/transport/TopicManager.cc b/gazebo/transport/TopicManager.cc -index 14fa782fa4..6c036205ee 100644 +index 14fa782fa4..19587fb884 100644 --- a/gazebo/transport/TopicManager.cc +++ b/gazebo/transport/TopicManager.cc -@@ -48,6 +48,8 @@ class NodeProcess_TBB - private: std::vector *nodes; - }; +@@ -65,6 +65,12 @@ TopicManager::~TopicManager() + { + } +////////////////////////////////////////////////// -+template class GZ_TRANSPORT_VISIBLE ::SingletonT; - ++static TopicManager* Instance() ++{ ++ return SingletonT::Instance(); ++} ++ ////////////////////////////////////////////////// - TopicManager::TopicManager() + void TopicManager::Init() + { diff --git a/gazebo/transport/TopicManager.hh b/gazebo/transport/TopicManager.hh -index b2adc04c8d..c7df09af63 100644 +index b2adc04c8d..6c05abae6e 100644 --- a/gazebo/transport/TopicManager.hh +++ b/gazebo/transport/TopicManager.hh -@@ -44,9 +44,6 @@ - #include "gazebo/transport/Subscriber.hh" - #include "gazebo/util/system.hh" +@@ -244,6 +244,9 @@ namespace gazebo + /// \param[in] _ptr Node to process. + public: void AddNodeToProcess(NodePtr _ptr); --/// \brief Explicit instantiation for typed SingletonT. --GZ_SINGLETON_DECLARE(GZ_TRANSPORT_VISIBLE, gazebo, transport, TopicManager) -- - namespace gazebo - { - namespace transport -@@ -272,4 +269,8 @@ namespace gazebo - /// \} - } - } -+ -+/// \brief Explicit instantiation for typed SingletonT. -+extern template class GZ_TRANSPORT_VISIBLE ::SingletonT; ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static TopicManager* Instance(); + - #endif + /// \brief A map of string->list of Node pointers + typedef std::map > SubNodeMap; + From e17752c773aa7138a1e6bc899715ca8ef7ca53bf Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 11 Oct 2022 11:47:33 +0200 Subject: [PATCH 43/55] Update add_explicit_template_instantiation_on_clang.patch --- recipe/add_explicit_template_instantiation_on_clang.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/add_explicit_template_instantiation_on_clang.patch b/recipe/add_explicit_template_instantiation_on_clang.patch index 0d9136b7..59004bf3 100644 --- a/recipe/add_explicit_template_instantiation_on_clang.patch +++ b/recipe/add_explicit_template_instantiation_on_clang.patch @@ -7,7 +7,7 @@ index 17016a4362..4463a258ff 100644 } +////////////////////////////////////////////////// -+static ConnectionManager* Instance() ++ConnectionManager* Instance() +{ + return SingletonT::Instance(); +} @@ -38,7 +38,7 @@ index 14fa782fa4..19587fb884 100644 } +////////////////////////////////////////////////// -+static TopicManager* Instance() ++TopicManager* Instance() +{ + return SingletonT::Instance(); +} From 483b6c4acffdb71816d626ffce79717a7832dd6e Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 11 Oct 2022 13:30:44 +0200 Subject: [PATCH 44/55] Update add_explicit_template_instantiation_on_clang.patch --- recipe/add_explicit_template_instantiation_on_clang.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/add_explicit_template_instantiation_on_clang.patch b/recipe/add_explicit_template_instantiation_on_clang.patch index 59004bf3..065d6da2 100644 --- a/recipe/add_explicit_template_instantiation_on_clang.patch +++ b/recipe/add_explicit_template_instantiation_on_clang.patch @@ -7,7 +7,7 @@ index 17016a4362..4463a258ff 100644 } +////////////////////////////////////////////////// -+ConnectionManager* Instance() ++ConnectionManager* ConnectionManager::Instance() +{ + return SingletonT::Instance(); +} @@ -38,7 +38,7 @@ index 14fa782fa4..19587fb884 100644 } +////////////////////////////////////////////////// -+TopicManager* Instance() ++TopicManager* TopicManager::Instance() +{ + return SingletonT::Instance(); +} From 2b2b8170e116c0997db6a1e87a2f39350c31f4b8 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 11 Oct 2022 16:50:55 +0200 Subject: [PATCH 45/55] Update conda-forge.yml --- conda-forge.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index c6495923..80375751 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -8,3 +8,5 @@ github: provider: linux_aarch64: default test_on_native_only: true +azure: + store_build_artifacts: true From f3bd494153afc61ee3600a6972be145a82bd6254 Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Tue, 11 Oct 2022 14:52:38 +0000 Subject: [PATCH 46/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.2, and conda-forge-pinning 2022.10.11.03.04.53 --- .azure-pipelines/azure-pipelines-linux.yml | 35 ++++++- .azure-pipelines/azure-pipelines-osx.yml | 35 ++++++- .azure-pipelines/azure-pipelines-win.yml | 29 ++++++ .scripts/create_conda_build_artifacts.bat | 80 +++++++++++++++ .scripts/create_conda_build_artifacts.sh | 113 +++++++++++++++++++++ 5 files changed, 290 insertions(+), 2 deletions(-) create mode 100755 .scripts/create_conda_build_artifacts.bat create mode 100755 .scripts/create_conda_build_artifacts.sh diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 54eb8385..a071fa4f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -12,18 +12,22 @@ jobs: CONFIG: linux_64_OGRE_VERSION1.10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_64_OGRE_VERSION1.10 linux_64_OGRE_VERSION1.12: CONFIG: linux_64_OGRE_VERSION1.12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_64_OGRE_VERSION1.12 linux_aarch64_OGRE_VERSION1.10: CONFIG: linux_aarch64_OGRE_VERSION1.10 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_aarch64_OGRE_VERSION1.10 linux_aarch64_OGRE_VERSION1.12: CONFIG: linux_aarch64_OGRE_VERSION1.12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_aarch64_OGRE_VERSION1.12 timeoutInMinutes: 360 steps: @@ -54,4 +58,33 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + - script: | + export CI=azure + export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + export CONDA_BLD_DIR=build_artifacts + export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" + # Archive everything in CONDA_BLD_DIR except environments + export BLD_ARTIFACT_PREFIX=conda_artifacts + if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then + # Archive the CONDA_BLD_DIR environments only when the job fails + export ENV_ARTIFACT_PREFIX=conda_envs + fi + ./.scripts/create_conda_build_artifacts.sh + displayName: Prepare conda build artifacts + condition: succeededOrFailed() + + - task: PublishPipelineArtifact@1 + displayName: Store conda build artifacts + condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) + inputs: + targetPath: $(BLD_ARTIFACT_PATH) + artifactName: $(BLD_ARTIFACT_NAME) + + - task: PublishPipelineArtifact@1 + displayName: Store conda build environment artifacts + condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) + inputs: + targetPath: $(ENV_ARTIFACT_PATH) + artifactName: $(ENV_ARTIFACT_NAME) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 553bd419..b2ff8954 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -11,15 +11,19 @@ jobs: osx_64_OGRE_VERSION1.10: CONFIG: osx_64_OGRE_VERSION1.10 UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_64_OGRE_VERSION1.10 osx_64_OGRE_VERSION1.12: CONFIG: osx_64_OGRE_VERSION1.12 UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_64_OGRE_VERSION1.12 osx_arm64_OGRE_VERSION1.10: CONFIG: osx_arm64_OGRE_VERSION1.10 UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_OGRE_VERSION1.10 osx_arm64_OGRE_VERSION1.12: CONFIG: osx_arm64_OGRE_VERSION1.12 UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_OGRE_VERSION1.12 timeoutInMinutes: 360 steps: @@ -39,4 +43,33 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) + - script: | + export CI=azure + export CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) + export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + export CONDA_BLD_DIR=/Users/runner/miniforge3/conda-bld + export ARTIFACT_STAGING_DIR="$(Build.ArtifactStagingDirectory)" + # Archive everything in CONDA_BLD_DIR except environments + export BLD_ARTIFACT_PREFIX=conda_artifacts + if [[ "$AGENT_JOBSTATUS" == "Failed" ]]; then + # Archive the CONDA_BLD_DIR environments only when the job fails + export ENV_ARTIFACT_PREFIX=conda_envs + fi + ./.scripts/create_conda_build_artifacts.sh + displayName: Prepare conda build artifacts + condition: succeededOrFailed() + + - task: PublishPipelineArtifact@1 + displayName: Store conda build artifacts + condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) + inputs: + targetPath: $(BLD_ARTIFACT_PATH) + artifactName: $(BLD_ARTIFACT_NAME) + + - task: PublishPipelineArtifact@1 + displayName: Store conda build environment artifacts + condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) + inputs: + targetPath: $(ENV_ARTIFACT_PATH) + artifactName: $(ENV_ARTIFACT_NAME) \ No newline at end of file diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index bcf6d38d..4b849873 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -11,9 +11,11 @@ jobs: win_64_OGRE_VERSION1.10: CONFIG: win_64_OGRE_VERSION1.10 UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: win_64_OGRE_VERSION1.10 win_64_OGRE_VERSION1.12: CONFIG: win_64_OGRE_VERSION1.12 UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: win_64_OGRE_VERSION1.12 timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ @@ -66,6 +68,33 @@ jobs: displayName: Build recipe env: PYTHONUNBUFFERED: 1 + - script: | + set CI=azure + set CI_RUN_ID=$(build.BuildNumber).$(system.JobAttempt) + set FEEDSTOCK_NAME=$(build.Repository.Name) + set ARTIFACT_STAGING_DIR=$(Build.ArtifactStagingDirectory) + set CONDA_BLD_DIR=$(CONDA_BLD_PATH) + set BLD_ARTIFACT_PREFIX=conda_artifacts + if "%AGENT_JOBSTATUS%" == "Failed" ( + set ENV_ARTIFACT_PREFIX=conda_envs + ) + call ".scripts\create_conda_build_artifacts.bat" + displayName: Prepare conda build artifacts + condition: succeededOrFailed() + + - task: PublishPipelineArtifact@1 + displayName: Store conda build artifacts + condition: not(eq(variables.BLD_ARTIFACT_PATH, '')) + inputs: + targetPath: $(BLD_ARTIFACT_PATH) + artifactName: $(BLD_ARTIFACT_NAME) + + - task: PublishPipelineArtifact@1 + displayName: Store conda build environment artifacts + condition: not(eq(variables.ENV_ARTIFACT_PATH, '')) + inputs: + targetPath: $(ENV_ARTIFACT_PATH) + artifactName: $(ENV_ARTIFACT_NAME) - script: | set "FEEDSTOCK_NAME=%BUILD_REPOSITORY_NAME:*/=%" call activate base diff --git a/.scripts/create_conda_build_artifacts.bat b/.scripts/create_conda_build_artifacts.bat new file mode 100755 index 00000000..79ce625d --- /dev/null +++ b/.scripts/create_conda_build_artifacts.bat @@ -0,0 +1,80 @@ +setlocal enableextensions enabledelayedexpansion + +rem INPUTS (environment variables that need to be set before calling this script): +rem +rem CI (azure/github_actions/UNSET) +rem CI_RUN_ID (unique identifier for the CI job run) +rem FEEDSTOCK_NAME +rem CONFIG (build matrix configuration string) +rem SHORT_CONFIG (uniquely-shortened configuration string) +rem CONDA_BLD_DIR (path to the conda-bld directory) +rem ARTIFACT_STAGING_DIR (use working directory if unset) +rem BLD_ARTIFACT_PREFIX (prefix for the conda build artifact name, skip if unset) +rem ENV_ARTIFACT_PREFIX (prefix for the conda build environments artifact name, skip if unset) + +rem OUTPUTS +rem +rem BLD_ARTIFACT_NAME +rem BLD_ARTIFACT_PATH +rem ENV_ARTIFACT_NAME +rem ENV_ARTIFACT_PATH + +rem Check that the conda-build directory exists +if not exist %CONDA_BLD_DIR% ( + echo conda-build directory does not exist + exit 1 +) + +if not defined ARTIFACT_STAGING_DIR ( + rem Set staging dir to the working dir + set ARTIFACT_STAGING_DIR=%cd% +) + +rem Set a unique ID for the artifact(s), specialized for this particular job run +set ARTIFACT_UNIQUE_ID=%CI_RUN_ID%_%CONFIG% +if not "%ARTIFACT_UNIQUE_ID%" == "%ARTIFACT_UNIQUE_ID:~0,80%" ( + set ARTIFACT_UNIQUE_ID=%CI_RUN_ID%_%SHORT_CONFIG% +) + +rem Set a descriptive ID for the archive(s), specialized for this particular job run +set ARCHIVE_UNIQUE_ID=%CI_RUN_ID%_%CONFIG% + +rem Make the build artifact zip +if defined BLD_ARTIFACT_PREFIX ( + set BLD_ARTIFACT_NAME=%BLD_ARTIFACT_PREFIX%_%ARTIFACT_UNIQUE_ID% + echo BLD_ARTIFACT_NAME: !BLD_ARTIFACT_NAME! + + set "BLD_ARTIFACT_PATH=%ARTIFACT_STAGING_DIR%\%FEEDSTOCK_NAME%_%BLD_ARTIFACT_PREFIX%_%ARCHIVE_UNIQUE_ID%.zip" + 7z a "!BLD_ARTIFACT_PATH!" "%CONDA_BLD_DIR%" -xr^^!.git/ -xr^^!_*_env*/ -xr^^!*_cache/ -bb + if errorlevel 1 exit 1 + echo BLD_ARTIFACT_PATH: !BLD_ARTIFACT_PATH! + + if "%CI%" == "azure" ( + echo ##vso[task.setVariable variable=BLD_ARTIFACT_NAME]!BLD_ARTIFACT_NAME! + echo ##vso[task.setVariable variable=BLD_ARTIFACT_PATH]!BLD_ARTIFACT_PATH! + ) + if "%CI%" == "github_actions" ( + echo ::set-output name=BLD_ARTIFACT_NAME::!BLD_ARTIFACT_NAME! + echo ::set-output name=BLD_ARTIFACT_PATH::!BLD_ARTIFACT_PATH! + ) +) + +rem Make the environments artifact zip +if defined ENV_ARTIFACT_PREFIX ( + set ENV_ARTIFACT_NAME=!ENV_ARTIFACT_PREFIX!_%ARTIFACT_UNIQUE_ID% + echo ENV_ARTIFACT_NAME: !ENV_ARTIFACT_NAME! + + set "ENV_ARTIFACT_PATH=%ARTIFACT_STAGING_DIR%\%FEEDSTOCK_NAME%_%ENV_ARTIFACT_PREFIX%_%ARCHIVE_UNIQUE_ID%.zip" + 7z a "!ENV_ARTIFACT_PATH!" -r "%CONDA_BLD_DIR%"/_*_env*/ -bb + if errorlevel 1 exit 1 + echo ENV_ARTIFACT_PATH: !ENV_ARTIFACT_PATH! + + if "%CI%" == "azure" ( + echo ##vso[task.setVariable variable=ENV_ARTIFACT_NAME]!ENV_ARTIFACT_NAME! + echo ##vso[task.setVariable variable=ENV_ARTIFACT_PATH]!ENV_ARTIFACT_PATH! + ) + if "%CI%" == "github_actions" ( + echo ::set-output name=ENV_ARTIFACT_NAME::!ENV_ARTIFACT_NAME! + echo ::set-output name=ENV_ARTIFACT_PATH::!ENV_ARTIFACT_PATH! + ) +) \ No newline at end of file diff --git a/.scripts/create_conda_build_artifacts.sh b/.scripts/create_conda_build_artifacts.sh new file mode 100755 index 00000000..cba0faee --- /dev/null +++ b/.scripts/create_conda_build_artifacts.sh @@ -0,0 +1,113 @@ +#!/usr/bin/env bash + +# INPUTS (environment variables that need to be set before calling this script): +# +# CI (azure/github_actions/UNSET) +# CI_RUN_ID (unique identifier for the CI job run) +# FEEDSTOCK_NAME +# CONFIG (build matrix configuration string) +# SHORT_CONFIG (uniquely-shortened configuration string) +# CONDA_BLD_DIR (path to the conda-bld directory) +# ARTIFACT_STAGING_DIR (use working directory if unset) +# BLD_ARTIFACT_PREFIX (prefix for the conda build artifact name, skip if unset) +# ENV_ARTIFACT_PREFIX (prefix for the conda build environments artifact name, skip if unset) + +# OUTPUTS +# +# BLD_ARTIFACT_NAME +# BLD_ARTIFACT_PATH +# ENV_ARTIFACT_NAME +# ENV_ARTIFACT_PATH + +source .scripts/logging_utils.sh + +# DON'T do set -x, because it results in double echo-ing pipeline commands +# and that might end up inserting extraneous quotation marks in output variables +set -e + +# Check that the conda-build directory exists +if [ ! -d "$CONDA_BLD_DIR" ]; then + echo "conda-build directory does not exist" + exit 1 +fi + +# Set staging dir to the working dir, in Windows style if applicable +if [[ -z "${ARTIFACT_STAGING_DIR}" ]]; then + if pwd -W; then + ARTIFACT_STAGING_DIR=$(pwd -W) + else + ARTIFACT_STAGING_DIR=$PWD + fi +fi +echo "ARTIFACT_STAGING_DIR: $ARTIFACT_STAGING_DIR" + +FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;) +if [ -z ${FEEDSTOCK_NAME} ]; then + export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) +fi + +# Set a unique ID for the artifact(s), specialized for this particular job run +ARTIFACT_UNIQUE_ID="${CI_RUN_ID}_${CONFIG}" +if [[ ${#ARTIFACT_UNIQUE_ID} -gt 80 ]]; then + ARTIFACT_UNIQUE_ID="${CI_RUN_ID}_${SHORT_CONFIG}" +fi +echo "ARTIFACT_UNIQUE_ID: $ARTIFACT_UNIQUE_ID" + +# Set a descriptive ID for the archive(s), specialized for this particular job run +ARCHIVE_UNIQUE_ID="${CI_RUN_ID}_${CONFIG}" + +# Make the build artifact zip +if [[ ! -z "$BLD_ARTIFACT_PREFIX" ]]; then + export BLD_ARTIFACT_NAME="${BLD_ARTIFACT_PREFIX}_${ARTIFACT_UNIQUE_ID}" + export BLD_ARTIFACT_PATH="${ARTIFACT_STAGING_DIR}/${FEEDSTOCK_NAME}_${BLD_ARTIFACT_PREFIX}_${ARCHIVE_UNIQUE_ID}.zip" + + ( startgroup "Archive conda build directory" ) 2> /dev/null + + # Try 7z and fall back to zip if it fails (for cross-platform use) + if ! 7z a "$BLD_ARTIFACT_PATH" "$CONDA_BLD_DIR" '-xr!.git/' '-xr!_*_env*/' '-xr!*_cache/' -bb; then + pushd "$CONDA_BLD_DIR" + zip -r -y -T "$BLD_ARTIFACT_PATH" . -x '*.git/*' '*_*_env*/*' '*_cache/*' + popd + fi + + ( endgroup "Archive conda build directory" ) 2> /dev/null + + echo "BLD_ARTIFACT_NAME: $BLD_ARTIFACT_NAME" + echo "BLD_ARTIFACT_PATH: $BLD_ARTIFACT_PATH" + + if [[ "$CI" == "azure" ]]; then + echo "##vso[task.setVariable variable=BLD_ARTIFACT_NAME]$BLD_ARTIFACT_NAME" + echo "##vso[task.setVariable variable=BLD_ARTIFACT_PATH]$BLD_ARTIFACT_PATH" + elif [[ "$CI" == "github_actions" ]]; then + echo "::set-output name=BLD_ARTIFACT_NAME::$BLD_ARTIFACT_NAME" + echo "::set-output name=BLD_ARTIFACT_PATH::$BLD_ARTIFACT_PATH" + fi +fi + +# Make the environments artifact zip +if [[ ! -z "$ENV_ARTIFACT_PREFIX" ]]; then + export ENV_ARTIFACT_NAME="${ENV_ARTIFACT_PREFIX}_${ARTIFACT_UNIQUE_ID}" + export ENV_ARTIFACT_PATH="${ARTIFACT_STAGING_DIR}/${FEEDSTOCK_NAME}_${ENV_ARTIFACT_PREFIX}_${ARCHIVE_UNIQUE_ID}.zip" + + ( startgroup "Archive conda build environments" ) 2> /dev/null + + # Try 7z and fall back to zip if it fails (for cross-platform use) + if ! 7z a "$ENV_ARTIFACT_PATH" -r "$CONDA_BLD_DIR"/'_*_env*/' -bb; then + pushd "$CONDA_BLD_DIR" + zip -r -y -T "$ENV_ARTIFACT_PATH" . -i '*_*_env*/*' + popd + fi + + ( endgroup "Archive conda build environments" ) 2> /dev/null + + echo "ENV_ARTIFACT_NAME: $ENV_ARTIFACT_NAME" + echo "ENV_ARTIFACT_PATH: $ENV_ARTIFACT_PATH" + + if [[ "$CI" == "azure" ]]; then + echo "##vso[task.setVariable variable=ENV_ARTIFACT_NAME]$ENV_ARTIFACT_NAME" + echo "##vso[task.setVariable variable=ENV_ARTIFACT_PATH]$ENV_ARTIFACT_PATH" + elif [[ "$CI" == "github_actions" ]]; then + echo "::set-output name=ENV_ARTIFACT_NAME::$ENV_ARTIFACT_NAME" + echo "::set-output name=ENV_ARTIFACT_PATH::$ENV_ARTIFACT_PATH" + fi +fi \ No newline at end of file From e56ab7aa0357b9b7dd4dd46bd0c0722f361120fe Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 12 Oct 2022 13:46:56 +0200 Subject: [PATCH 47/55] 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 295a55c0..d1e501f8 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -55,7 +55,7 @@ cmake --build . --config Release --target install if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then cmake ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON . ninja INTEGRATION_transport_msg_count - ctest --output-on-failure -C Release -R INTEGRATION_transport_msg_count + # ctest --output-on-failure -C Release -R INTEGRATION_transport_msg_count fi # Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d. From 479cb3d9f8774e23179613104c51f388e76d440f Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 12 Oct 2022 14:42:08 +0200 Subject: [PATCH 48/55] 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 7e9b33d4..8dc50330 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -7,7 +7,7 @@ package: source: - url: https://github.com/osrf/{{ name }}/archive/{{ name }}{{ version.split('.')[0] }}_{{ version }}.tar.gz - sha256: 6ef2721c1279bc836a845022784fb8bf9860468b36abbc5c1887446ea594d261 + sha256: c4d32b76c213b0f74f01a10d2134232280a13fb58529f9a2ce8a7ab7bca8691a patches: - fix_build.patch # [unix] - use-external-libs-config.patch From 2459269936df185a98561582ee0e9049be72c205 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Thu, 13 Oct 2022 07:10:56 +1000 Subject: [PATCH 49/55] Fix annoying liblief segfault See https://github.com/conda-forge/conda-forge.github.io/issues/1823 --- conda-forge.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conda-forge.yml b/conda-forge.yml index 80375751..343ef7a9 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -10,3 +10,6 @@ provider: test_on_native_only: true azure: store_build_artifacts: true +remote_ci_setup: + - liblief=0.11.5 + - conda-forge-ci-setup=3 From a26f56f68cd0a8e2d90e2c6682e9064d0dffd64b Mon Sep 17 00:00:00 2001 From: "conda-forge-webservices[bot]" <91080706+conda-forge-webservices[bot]@users.noreply.github.com> Date: Wed, 12 Oct 2022 21:12:34 +0000 Subject: [PATCH 50/55] MNT: Re-rendered with conda-build 3.22.0, conda-smithy 3.21.2, and conda-forge-pinning 2022.10.12.08.17.18 --- .azure-pipelines/azure-pipelines-win.yml | 2 +- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 4b849873..c240097b 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -40,7 +40,7 @@ jobs: - script: | call activate base - mamba.exe install 'python=3.9' conda-build conda pip boa 'conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes + mamba.exe install 'python=3.9' conda-build conda pip boa 'liblief=0.11.5 conda-forge-ci-setup=3' -c conda-forge --strict-channel-priority --yes displayName: Install conda-build - script: set PYTHONUNBUFFERED=1 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index b138b735..463bf1d7 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 + conda-build pip boa liblief=0.11.5 conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa liblief=0.11.5 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 736a39a0..65cbdd91 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -23,11 +23,11 @@ bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base -echo -e "\n\nInstalling ['conda-forge-ci-setup=3'] and conda-build." +echo -e "\n\nInstalling ['liblief=0.11.5', 'conda-forge-ci-setup=3'] and conda-build." mamba install --update-specs --quiet --yes --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa liblief=0.11.5 conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 + conda-build pip boa liblief=0.11.5 conda-forge-ci-setup=3 From 3235a2ea2c117e981355cfb387b09bf27c0141fc Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 13 Oct 2022 11:12:25 +0200 Subject: [PATCH 51/55] Create 3269.patch --- recipe/3269.patch | 814 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 814 insertions(+) create mode 100644 recipe/3269.patch diff --git a/recipe/3269.patch b/recipe/3269.patch new file mode 100644 index 00000000..9253f193 --- /dev/null +++ b/recipe/3269.patch @@ -0,0 +1,814 @@ +From f96ee7492e18e8677e02bdf55ce7bf704cbfa331 Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro +Date: Thu, 13 Oct 2022 11:03:55 +0200 +Subject: [PATCH] Fix Instance() method of Singleton classes + +In particular, make sure that all the Instance() methods +of the same class always use the same instantiation. +--- + gazebo/common/FuelModelDatabase.cc | 13 +++++++++++++ + gazebo/common/FuelModelDatabase.hh | 3 +++ + gazebo/common/MeshManager.cc | 13 +++++++++++++ + gazebo/common/MeshManager.hh | 3 +++ + gazebo/common/ModelDatabase.cc | 13 +++++++++++++ + gazebo/common/ModelDatabase.hh | 3 +++ + gazebo/common/SingletonT.hh | 2 +- + gazebo/common/SystemPaths.cc | 13 +++++++++++++ + gazebo/common/SystemPaths.hh | 3 +++ + gazebo/gui/KeyEventHandler.cc | 13 +++++++++++++ + gazebo/gui/KeyEventHandler.hh | 3 +++ + gazebo/gui/ModelAlign.cc | 13 +++++++++++++ + gazebo/gui/ModelAlign.hh | 3 +++ + gazebo/gui/ModelManipulator.cc | 13 +++++++++++++ + gazebo/gui/ModelManipulator.hh | 3 +++ + gazebo/gui/ModelSnap.cc | 13 +++++++++++++ + gazebo/gui/ModelSnap.hh | 3 +++ + gazebo/gui/MouseEventHandler.cc | 13 +++++++++++++ + gazebo/gui/MouseEventHandler.hh | 3 +++ + gazebo/gui/plot/PlotManager.cc | 13 +++++++++++++ + gazebo/gui/plot/PlotManager.hh | 3 +++ + gazebo/gui/plot/TopicCurveHandler.cc | 16 ++++++++++++++++ + gazebo/rendering/RTShaderSystem.cc | 13 +++++++++++++ + gazebo/rendering/RTShaderSystem.hh | 3 +++ + gazebo/rendering/RenderEngine.cc | 13 +++++++++++++ + gazebo/rendering/RenderEngine.hh | 3 +++ + gazebo/sensors/SensorManager.cc | 14 ++++++++++++++ + gazebo/sensors/SensorManager.hh | 3 +++ + gazebo/transport/ConnectionManager.cc | 13 +++++++++++++ + gazebo/transport/ConnectionManager.hh | 3 +++ + gazebo/transport/TopicManager.cc | 13 +++++++++++++ + gazebo/transport/TopicManager.hh | 3 +++ + gazebo/util/Diagnostics.cc | 13 +++++++++++++ + gazebo/util/Diagnostics.hh | 3 +++ + gazebo/util/IntrospectionManager.cc | 13 +++++++++++++ + gazebo/util/IntrospectionManager.hh | 3 +++ + gazebo/util/LogPlay.cc | 13 +++++++++++++ + gazebo/util/LogPlay.hh | 3 +++ + gazebo/util/LogRecord.cc | 13 +++++++++++++ + gazebo/util/LogRecord.hh | 3 +++ + gazebo/util/OpenAL.cc | 13 +++++++++++++ + gazebo/util/OpenAL.hh | 3 +++ + 42 files changed, 338 insertions(+), 1 deletion(-) + +diff --git a/gazebo/common/FuelModelDatabase.cc b/gazebo/common/FuelModelDatabase.cc +index 3ba2b04fb8..4fa5bd26c9 100644 +--- a/gazebo/common/FuelModelDatabase.cc ++++ b/gazebo/common/FuelModelDatabase.cc +@@ -322,3 +322,16 @@ std::string FuelModelDatabase::CachedFilePath(const std::string &_uri) + + return path; + } ++ ++////////////////////////////////////////////////// ++FuelModelDatabase* FuelModelDatabase::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} +diff --git a/gazebo/common/FuelModelDatabase.hh b/gazebo/common/FuelModelDatabase.hh +index 81daafbefc..cfa8f0d1ab 100644 +--- a/gazebo/common/FuelModelDatabase.hh ++++ b/gazebo/common/FuelModelDatabase.hh +@@ -123,6 +123,9 @@ namespace gazebo + /// \return Local path to the file + public: std::string CachedFilePath(const std::string &_uri); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static FuelModelDatabase* Instance(); ++ + /// \brief Private data. + private: std::unique_ptr dataPtr; + +diff --git a/gazebo/common/MeshManager.cc b/gazebo/common/MeshManager.cc +index 6c0104a7ea..e151f8abda 100644 +--- a/gazebo/common/MeshManager.cc ++++ b/gazebo/common/MeshManager.cc +@@ -1394,5 +1394,18 @@ void MeshManager::ConvertPolylinesToVerticesAndEdges( + } + } + } ++ ++////////////////////////////////////////////////// ++MeshManager* MeshManager::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} + } + } +diff --git a/gazebo/common/MeshManager.hh b/gazebo/common/MeshManager.hh +index a6778cc07d..16f22a0327 100644 +--- a/gazebo/common/MeshManager.hh ++++ b/gazebo/common/MeshManager.hh +@@ -261,6 +261,9 @@ namespace gazebo + const ignition::math::Vector2d &_p, + double _tol); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static MeshManager* Instance(); ++ + /// \brief Singleton implementation + private: friend class SingletonT; + +diff --git a/gazebo/common/ModelDatabase.cc b/gazebo/common/ModelDatabase.cc +index 54be36799a..4e46add362 100644 +--- a/gazebo/common/ModelDatabase.cc ++++ b/gazebo/common/ModelDatabase.cc +@@ -683,3 +683,16 @@ std::string ModelDatabase::GetModelFile(const std::string &_uri) + + return result; + } ++ ++////////////////////////////////////////////////// ++ModelDatabase* ModelDatabase::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} +diff --git a/gazebo/common/ModelDatabase.hh b/gazebo/common/ModelDatabase.hh +index 0821abad8d..e78fffacdd 100644 +--- a/gazebo/common/ModelDatabase.hh ++++ b/gazebo/common/ModelDatabase.hh +@@ -150,6 +150,9 @@ namespace gazebo + /// no one else should use this function. + private: bool UpdateModelCacheImpl(); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static ModelDatabase* Instance(); ++ + /// \brief Private data. + private: ModelDatabasePrivate *dataPtr; + +diff --git a/gazebo/common/SingletonT.hh b/gazebo/common/SingletonT.hh +index e97b7c792e..9d08bfc760 100644 +--- a/gazebo/common/SingletonT.hh ++++ b/gazebo/common/SingletonT.hh +@@ -33,7 +33,7 @@ template + class SingletonT + { + /// \brief Get an instance of the singleton +- public: static T *Instance() ++ public: static T *Instance() GAZEBO_DEPRECATED(11.0) + { + return &GetInstance(); + } +diff --git a/gazebo/common/SystemPaths.cc b/gazebo/common/SystemPaths.cc +index 2e0f770433..08e84f234e 100644 +--- a/gazebo/common/SystemPaths.cc ++++ b/gazebo/common/SystemPaths.cc +@@ -577,3 +577,16 @@ void SystemPaths::AddSearchPathSuffix(const std::string &_suffix) + + this->suffixPaths.push_back(s); + } ++ ++////////////////////////////////////////////////// ++SystemPaths* SystemPaths::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} +diff --git a/gazebo/common/SystemPaths.hh b/gazebo/common/SystemPaths.hh +index 3c62d28c07..f1f05b183a 100644 +--- a/gazebo/common/SystemPaths.hh ++++ b/gazebo/common/SystemPaths.hh +@@ -181,6 +181,9 @@ namespace gazebo + private: void InsertUnique(const std::string &_path, + std::list &_list); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static SystemPaths* Instance(); ++ + /// \brief Paths to installed gazebo media files + private: std::list gazeboPaths; + +diff --git a/gazebo/gui/KeyEventHandler.cc b/gazebo/gui/KeyEventHandler.cc +index e433805ad7..77cf0fa5fd 100644 +--- a/gazebo/gui/KeyEventHandler.cc ++++ b/gazebo/gui/KeyEventHandler.cc +@@ -116,3 +116,16 @@ bool KeyEventHandler::Handle(const common::KeyEvent &_event, + } + return false; + } ++ ++////////////////////////////////////////////////// ++KeyEventHandler* KeyEventHandler::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} +diff --git a/gazebo/gui/KeyEventHandler.hh b/gazebo/gui/KeyEventHandler.hh +index 61e4d9046e..0f045d12df 100644 +--- a/gazebo/gui/KeyEventHandler.hh ++++ b/gazebo/gui/KeyEventHandler.hh +@@ -145,6 +145,9 @@ namespace gazebo + private: bool Handle(const common::KeyEvent &_event, + std::list &_list); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static KeyEventHandler* Instance(); ++ + /// \brief This is a singleton class. + private: friend class SingletonT; + +diff --git a/gazebo/gui/ModelAlign.cc b/gazebo/gui/ModelAlign.cc +index af0cba86d2..fa7af11587 100644 +--- a/gazebo/gui/ModelAlign.cc ++++ b/gazebo/gui/ModelAlign.cc +@@ -362,3 +362,16 @@ void ModelAlign::SetHighlighted(const rendering::VisualPtr &_vis, + } + } + } ++ ++////////////////////////////////////////////////// ++ModelAlign* ModelAlign::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} +diff --git a/gazebo/gui/ModelAlign.hh b/gazebo/gui/ModelAlign.hh +index 2b38a6a355..f396414048 100644 +--- a/gazebo/gui/ModelAlign.hh ++++ b/gazebo/gui/ModelAlign.hh +@@ -97,6 +97,9 @@ namespace gazebo + private: void SetHighlighted(const rendering::VisualPtr &_vis, + const bool _highlight); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static ModelAlign* Instance(); ++ + /// \brief This is a singleton class. + private: friend class SingletonT; + +diff --git a/gazebo/gui/ModelManipulator.cc b/gazebo/gui/ModelManipulator.cc +index b1682f8c89..11603e7d85 100644 +--- a/gazebo/gui/ModelManipulator.cc ++++ b/gazebo/gui/ModelManipulator.cc +@@ -987,6 +987,19 @@ void ModelManipulator::OnKeyReleaseEvent(const common::KeyEvent &_event) + this->dataPtr->keyEvent.key = 0; + } + ++////////////////////////////////////////////////// ++ModelManipulator* ModelManipulator::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} ++ + // Function migrated here from GLWidget.cc and commented out since it doesn't + // seem like it's currently used. Kept here for future references + ///////////////////////////////////////////////// +diff --git a/gazebo/gui/ModelManipulator.hh b/gazebo/gui/ModelManipulator.hh +index ecd06954b7..77d3177853 100644 +--- a/gazebo/gui/ModelManipulator.hh ++++ b/gazebo/gui/ModelManipulator.hh +@@ -179,6 +179,9 @@ namespace gazebo + const ignition::math::Vector3d &_axis, + const ignition::math::Vector3d &_scale, const std::string &_geom); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static ModelManipulator* Instance(); ++ + /// \brief This is a singleton class. + private: friend class SingletonT; + +diff --git a/gazebo/gui/ModelSnap.cc b/gazebo/gui/ModelSnap.cc +index 8c920bad8c..356c0956ce 100644 +--- a/gazebo/gui/ModelSnap.cc ++++ b/gazebo/gui/ModelSnap.cc +@@ -507,3 +507,16 @@ void ModelSnap::Update() + this->dataPtr->selectedTriangleDirty = false; + } + } ++ ++////////////////////////////////////////////////// ++ModelSnap* ModelSnap::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} +diff --git a/gazebo/gui/ModelSnap.hh b/gazebo/gui/ModelSnap.hh +index e942a256c6..b3aaef2f7b 100644 +--- a/gazebo/gui/ModelSnap.hh ++++ b/gazebo/gui/ModelSnap.hh +@@ -111,6 +111,9 @@ namespace gazebo + /// \brief Update the visual representation of the snap spot. + private: void Update(); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static ModelSnap* Instance(); ++ + /// \brief This is a singleton class. + private: friend class SingletonT; + +diff --git a/gazebo/gui/MouseEventHandler.cc b/gazebo/gui/MouseEventHandler.cc +index e6cfc46f9b..762eedf5ef 100644 +--- a/gazebo/gui/MouseEventHandler.cc ++++ b/gazebo/gui/MouseEventHandler.cc +@@ -135,3 +135,16 @@ void MouseEventHandler::Handle(const common::MouseEvent &_event, + break; + } + } ++ ++////////////////////////////////////////////////// ++MouseEventHandler* MouseEventHandler::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} +diff --git a/gazebo/gui/MouseEventHandler.hh b/gazebo/gui/MouseEventHandler.hh +index 42c09c3042..62290a5ca5 100644 +--- a/gazebo/gui/MouseEventHandler.hh ++++ b/gazebo/gui/MouseEventHandler.hh +@@ -156,6 +156,9 @@ namespace gazebo + private: void Handle(const common::MouseEvent &_event, + std::list &_list); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static MouseEventHandler* Instance(); ++ + /// \brief List of mouse press filters. + private: std::list pressFilters; + +diff --git a/gazebo/gui/plot/PlotManager.cc b/gazebo/gui/plot/PlotManager.cc +index b50f6065af..634b19e406 100644 +--- a/gazebo/gui/plot/PlotManager.cc ++++ b/gazebo/gui/plot/PlotManager.cc +@@ -190,3 +190,16 @@ std::string PlotManager::HumanReadableName(const std::string &_uri) const + + return label; + } ++ ++////////////////////////////////////////////////// ++PlotManager* PlotManager::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} +diff --git a/gazebo/gui/plot/PlotManager.hh b/gazebo/gui/plot/PlotManager.hh +index 0a31e7ac3e..29101fca76 100644 +--- a/gazebo/gui/plot/PlotManager.hh ++++ b/gazebo/gui/plot/PlotManager.hh +@@ -87,6 +87,9 @@ namespace gazebo + /// \return Human readable name + public: std::string HumanReadableName(const std::string &_uri) const; + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static PlotManager* Instance(); ++ + /// \brief This is a singleton class. + private: friend class SingletonT; + +diff --git a/gazebo/gui/plot/TopicCurveHandler.cc b/gazebo/gui/plot/TopicCurveHandler.cc +index 34bfc75660..c7103f9789 100644 +--- a/gazebo/gui/plot/TopicCurveHandler.cc ++++ b/gazebo/gui/plot/TopicCurveHandler.cc +@@ -55,6 +55,9 @@ namespace gazebo + /// \param[in] _msg WorldStats msg. + public: void OnStats(ConstWorldStatisticsPtr &_msg); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static TopicTime* Instance(); ++ + /// \brief Node for communications. + private: transport::NodePtr node; + +@@ -168,6 +171,19 @@ void TopicTime::OnStats(ConstWorldStatisticsPtr &_msg) + this->lastSimTime = msgs::Convert(t); + } + ++////////////////////////////////////////////////// ++TopicTime* TopicTime::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} ++ + ///////////////////////////////////////////////// + common::Time TopicTime::LastSimTime() + { +diff --git a/gazebo/rendering/RTShaderSystem.cc b/gazebo/rendering/RTShaderSystem.cc +index fe7197ab5f..72f86bf782 100644 +--- a/gazebo/rendering/RTShaderSystem.cc ++++ b/gazebo/rendering/RTShaderSystem.cc +@@ -810,3 +810,16 @@ void RTShaderSystem::UpdateShadows(ScenePtr _scene) + sceneMgr->setShadowTextureCasterMaterial(_scene->ShadowCasterMaterialName()); + #endif + } ++ ++////////////////////////////////////////////////// ++RTShaderSystem* RTShaderSystem::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} +diff --git a/gazebo/rendering/RTShaderSystem.hh b/gazebo/rendering/RTShaderSystem.hh +index 61da4d25ee..b9227357f9 100644 +--- a/gazebo/rendering/RTShaderSystem.hh ++++ b/gazebo/rendering/RTShaderSystem.hh +@@ -187,6 +187,9 @@ namespace gazebo + /// \brief Re-apply shadows. Call this if a shadow paramenter is changed. + private: void ReapplyShadows(); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static RTShaderSystem* Instance(); ++ + /// \brief Make the RTShader system a singleton. + private: friend class SingletonT; + +diff --git a/gazebo/rendering/RenderEngine.cc b/gazebo/rendering/RenderEngine.cc +index 87d78ea95d..cc07bef340 100644 +--- a/gazebo/rendering/RenderEngine.cc ++++ b/gazebo/rendering/RenderEngine.cc +@@ -883,3 +883,16 @@ Ogre::OverlaySystem *RenderEngine::OverlaySystem() const + return this->dataPtr->overlaySystem; + } + #endif ++ ++////////////////////////////////////////////////// ++RenderEngine* RenderEngine::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} +diff --git a/gazebo/rendering/RenderEngine.hh b/gazebo/rendering/RenderEngine.hh +index ae62ae8457..fa3f28bb84 100644 +--- a/gazebo/rendering/RenderEngine.hh ++++ b/gazebo/rendering/RenderEngine.hh +@@ -168,6 +168,9 @@ namespace gazebo + /// \brief Check the rendering capabilities of the system. + private: void CheckSystemCapabilities(); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static RenderEngine* Instance(); ++ + /// \brief ID for a dummy window. Used for gui-less operation + protected: uint64_t dummyWindowId; + +diff --git a/gazebo/sensors/SensorManager.cc b/gazebo/sensors/SensorManager.cc +index a44c8e8158..0c9d14d1c0 100644 +--- a/gazebo/sensors/SensorManager.cc ++++ b/gazebo/sensors/SensorManager.cc +@@ -1005,6 +1005,20 @@ bool SensorManager::ImageSensorContainer::WaitForPrerendered(double _timeoutsec) + return (ret == std::cv_status::no_timeout); + } + ++////////////////////////////////////////////////// ++SensorManager* SensorManager::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} ++ ++ + ///////////////////////////////////////////////// + SimTimeEventHandler::SimTimeEventHandler() + { +diff --git a/gazebo/sensors/SensorManager.hh b/gazebo/sensors/SensorManager.hh +index dea9caee49..657875014d 100644 +--- a/gazebo/sensors/SensorManager.hh ++++ b/gazebo/sensors/SensorManager.hh +@@ -193,6 +193,9 @@ namespace gazebo + /// \param[in] _sensor Pointer to a sensor to add. + private: void AddSensor(SensorPtr _sensor); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static SensorManager* Instance(); ++ + /// \cond + /// \brief A container for sensors of a specific type. This is used to + /// separate sensors which rely on the rendering engine from those +diff --git a/gazebo/transport/ConnectionManager.cc b/gazebo/transport/ConnectionManager.cc +index 17016a4362..312ceac712 100644 +--- a/gazebo/transport/ConnectionManager.cc ++++ b/gazebo/transport/ConnectionManager.cc +@@ -712,3 +712,16 @@ void ConnectionManager::TriggerUpdate() + { + this->updateCondition.notify_all(); + } ++ ++////////////////////////////////////////////////// ++ConnectionManager* ConnectionManager::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} +diff --git a/gazebo/transport/ConnectionManager.hh b/gazebo/transport/ConnectionManager.hh +index 6dc212bc13..65169d1e69 100644 +--- a/gazebo/transport/ConnectionManager.hh ++++ b/gazebo/transport/ConnectionManager.hh +@@ -167,6 +167,9 @@ namespace gazebo + /// \brief Run the manager update loop once + private: void RunUpdate(); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static ConnectionManager* Instance(); ++ + /// \brief Condition used to trigger an update. + private: boost::condition_variable updateCondition; + +diff --git a/gazebo/transport/TopicManager.cc b/gazebo/transport/TopicManager.cc +index 14fa782fa4..4acc0e6592 100644 +--- a/gazebo/transport/TopicManager.cc ++++ b/gazebo/transport/TopicManager.cc +@@ -457,3 +457,16 @@ void TopicManager::PauseIncoming(bool _pause) + { + this->pauseIncoming = _pause; + } ++ ++////////////////////////////////////////////////// ++TopicManager* TopicManager::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} +diff --git a/gazebo/transport/TopicManager.hh b/gazebo/transport/TopicManager.hh +index b2adc04c8d..6c05abae6e 100644 +--- a/gazebo/transport/TopicManager.hh ++++ b/gazebo/transport/TopicManager.hh +@@ -244,6 +244,9 @@ namespace gazebo + /// \param[in] _ptr Node to process. + public: void AddNodeToProcess(NodePtr _ptr); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static TopicManager* Instance(); ++ + /// \brief A map of string->list of Node pointers + typedef std::map > SubNodeMap; + +diff --git a/gazebo/util/Diagnostics.cc b/gazebo/util/Diagnostics.cc +index 1b3b4dc054..55626b0fc1 100644 +--- a/gazebo/util/Diagnostics.cc ++++ b/gazebo/util/Diagnostics.cc +@@ -249,6 +249,19 @@ common::Time DiagnosticManager::Time(const std::string &_label) const + return common::Time(); + } + ++////////////////////////////////////////////////// ++DiagnosticManager* DiagnosticManager::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} ++ + ////////////////////////////////////////////////// + DiagnosticTimer::DiagnosticTimer(const std::string &_name) + : Timer(), +diff --git a/gazebo/util/Diagnostics.hh b/gazebo/util/Diagnostics.hh +index 1b5782fdb1..cee46128ee 100644 +--- a/gazebo/util/Diagnostics.hh ++++ b/gazebo/util/Diagnostics.hh +@@ -143,6 +143,9 @@ namespace gazebo + const common::Time &_wallTime, + const common::Time &_elapsedtime); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static DiagnosticManager* Instance(); ++ + // Singleton implementation + private: friend class SingletonT; + +diff --git a/gazebo/util/IntrospectionManager.cc b/gazebo/util/IntrospectionManager.cc +index 048e605317..54073e647b 100644 +--- a/gazebo/util/IntrospectionManager.cc ++++ b/gazebo/util/IntrospectionManager.cc +@@ -642,3 +642,16 @@ bool IntrospectionManager::ValidateParameter(const gazebo::msgs::Param &_msg, + + return true; + } ++ ++////////////////////////////////////////////////// ++IntrospectionManager* IntrospectionManager::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} +diff --git a/gazebo/util/IntrospectionManager.hh b/gazebo/util/IntrospectionManager.hh +index b471a7a907..d150181edd 100644 +--- a/gazebo/util/IntrospectionManager.hh ++++ b/gazebo/util/IntrospectionManager.hh +@@ -193,6 +193,9 @@ namespace gazebo + private: bool ValidateParameter(const gazebo::msgs::Param &_msg, + const std::set &_allowedValues) const; + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static IntrospectionManager* Instance(); ++ + /// \brief This is a singleton. + private: friend class SingletonT; + +diff --git a/gazebo/util/LogPlay.cc b/gazebo/util/LogPlay.cc +index e0b80b381f..70cfcc3346 100644 +--- a/gazebo/util/LogPlay.cc ++++ b/gazebo/util/LogPlay.cc +@@ -838,3 +838,16 @@ bool LogPlay::PrevChunk() + + return true; + } ++ ++////////////////////////////////////////////////// ++LogPlay* LogPlay::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} +diff --git a/gazebo/util/LogPlay.hh b/gazebo/util/LogPlay.hh +index d3ba5a31e2..29013d9ee0 100644 +--- a/gazebo/util/LogPlay.hh ++++ b/gazebo/util/LogPlay.hh +@@ -184,6 +184,9 @@ namespace gazebo + /// chunks before the current one. + private: bool PrevChunk(); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static LogPlay* Instance(); ++ + /// \internal + /// \brief Private data pointer + private: std::unique_ptr dataPtr; +diff --git a/gazebo/util/LogRecord.cc b/gazebo/util/LogRecord.cc +index e1e2543ffc..19658f54a4 100644 +--- a/gazebo/util/LogRecord.cc ++++ b/gazebo/util/LogRecord.cc +@@ -1110,3 +1110,16 @@ unsigned int LogRecord::BufferSize() const + + return size; + } ++ ++////////////////////////////////////////////////// ++LogRecord* LogRecord::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} +diff --git a/gazebo/util/LogRecord.hh b/gazebo/util/LogRecord.hh +index 525d6d4e4a..c756d83728 100644 +--- a/gazebo/util/LogRecord.hh ++++ b/gazebo/util/LogRecord.hh +@@ -262,6 +262,9 @@ namespace gazebo + /// \brief Used to get the simulation pause state. + private: void OnPause(const bool _pause); + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static LogRecord* Instance(); ++ + /// \brief This is a singleton + private: friend class SingletonT; + +diff --git a/gazebo/util/OpenAL.cc b/gazebo/util/OpenAL.cc +index 77ff598dda..9cf773e37f 100644 +--- a/gazebo/util/OpenAL.cc ++++ b/gazebo/util/OpenAL.cc +@@ -187,6 +187,19 @@ std::set OpenAL::DeviceList() const + return deviceList; + } + ++////////////////////////////////////////////////// ++OpenAL* OpenAL::Instance() ++{ ++#ifndef _WIN32 ++ #pragma GCC diagnostic push ++ #pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ return SingletonT::Instance(); ++#ifndef _WIN32 ++ #pragma GCC diagnostic pop ++#endif ++} ++ + //////////////////////////////////////////////////////////////////////////////// + //////////////////////////////////////////////////////////////////////////////// + // OPENAL LISTENER +diff --git a/gazebo/util/OpenAL.hh b/gazebo/util/OpenAL.hh +index a98c926e31..f476b69dab 100644 +--- a/gazebo/util/OpenAL.hh ++++ b/gazebo/util/OpenAL.hh +@@ -81,6 +81,9 @@ namespace gazebo + /// \return A list of audio device names + public: std::set DeviceList() const; + ++ /// \brief Returns a pointer to the unique (static) instance ++ public: static OpenAL* Instance(); ++ + /// \internal + /// \brief Private data pointer. + private: std::unique_ptr dataPtr; From 010e9416604d201943d65521bac720d686c4668b Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 13 Oct 2022 11:12:54 +0200 Subject: [PATCH 52/55] 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 8dc50330..e5344195 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -13,7 +13,7 @@ source: - use-external-libs-config.patch - fix-invisible-meshes.patch - 3190.patch - - add_explicit_template_instantiation_on_clang.patch + - 3269.patch build: number: 1 From 4e531521345af463bef8ab70cfd10d0e1505c51f Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 13 Oct 2022 11:13:18 +0200 Subject: [PATCH 53/55] 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 d1e501f8..295a55c0 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -55,7 +55,7 @@ cmake --build . --config Release --target install if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then cmake ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON . ninja INTEGRATION_transport_msg_count - # ctest --output-on-failure -C Release -R INTEGRATION_transport_msg_count + ctest --output-on-failure -C Release -R INTEGRATION_transport_msg_count fi # Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d. From 77472950c7b204aa58940de7642e3a97cf5b5db4 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 13 Oct 2022 13:58:14 +0200 Subject: [PATCH 54/55] Update build.sh --- recipe/build.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 295a55c0..72475d6a 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -51,13 +51,6 @@ cmake ${CMAKE_ARGS} .. \ cmake --build . --config Release -- -j$CPU_COUNT cmake --build . --config Release --target install -# Regression test for https://github.com/conda-forge/gazebo-feedstock/issues/148 -if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then - cmake ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON . - ninja INTEGRATION_transport_msg_count - ctest --output-on-failure -C Release -R INTEGRATION_transport_msg_count -fi - # Copy the [de]activate scripts to $PREFIX/etc/conda/[de]activate.d. # This will allow them to be run on environment activation. for CHANGE in "activate" "deactivate" From 08aad5eb41dc63334527faa01e7b46c289bf97a7 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Thu, 13 Oct 2022 13:58:23 +0200 Subject: [PATCH 55/55] Delete add_explicit_template_instantiation_on_clang.patch --- ...icit_template_instantiation_on_clang.patch | 63 ------------------- 1 file changed, 63 deletions(-) delete mode 100644 recipe/add_explicit_template_instantiation_on_clang.patch diff --git a/recipe/add_explicit_template_instantiation_on_clang.patch b/recipe/add_explicit_template_instantiation_on_clang.patch deleted file mode 100644 index 065d6da2..00000000 --- a/recipe/add_explicit_template_instantiation_on_clang.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/gazebo/transport/ConnectionManager.cc b/gazebo/transport/ConnectionManager.cc -index 17016a4362..4463a258ff 100644 ---- a/gazebo/transport/ConnectionManager.cc -+++ b/gazebo/transport/ConnectionManager.cc -@@ -88,6 +88,12 @@ ConnectionManager::~ConnectionManager() - this->Fini(); - } - -+////////////////////////////////////////////////// -+ConnectionManager* ConnectionManager::Instance() -+{ -+ return SingletonT::Instance(); -+} -+ - ////////////////////////////////////////////////// - bool ConnectionManager::Init(const std::string &_masterHost, - unsigned int _masterPort, -diff --git a/gazebo/transport/ConnectionManager.hh b/gazebo/transport/ConnectionManager.hh -index 6dc212bc13..65169d1e69 100644 ---- a/gazebo/transport/ConnectionManager.hh -+++ b/gazebo/transport/ConnectionManager.hh -@@ -167,6 +167,9 @@ namespace gazebo - /// \brief Run the manager update loop once - private: void RunUpdate(); - -+ /// \brief Returns a pointer to the unique (static) instance -+ public: static ConnectionManager* Instance(); -+ - /// \brief Condition used to trigger an update. - private: boost::condition_variable updateCondition; - -diff --git a/gazebo/transport/TopicManager.cc b/gazebo/transport/TopicManager.cc -index 14fa782fa4..19587fb884 100644 ---- a/gazebo/transport/TopicManager.cc -+++ b/gazebo/transport/TopicManager.cc -@@ -65,6 +65,12 @@ TopicManager::~TopicManager() - { - } - -+////////////////////////////////////////////////// -+TopicManager* TopicManager::Instance() -+{ -+ return SingletonT::Instance(); -+} -+ - ////////////////////////////////////////////////// - void TopicManager::Init() - { -diff --git a/gazebo/transport/TopicManager.hh b/gazebo/transport/TopicManager.hh -index b2adc04c8d..6c05abae6e 100644 ---- a/gazebo/transport/TopicManager.hh -+++ b/gazebo/transport/TopicManager.hh -@@ -244,6 +244,9 @@ namespace gazebo - /// \param[in] _ptr Node to process. - public: void AddNodeToProcess(NodePtr _ptr); - -+ /// \brief Returns a pointer to the unique (static) instance -+ public: static TopicManager* Instance(); -+ - /// \brief A map of string->list of Node pointers - typedef std::map > SubNodeMap; - -