diff --git a/README.md b/README.md index 967d1a1..e753743 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -About libignition-common3 +About libignition-common4 ========================= Home: https://github.com/ignitionrobotics/ign-common @@ -88,27 +88,27 @@ Current release info | Name | Downloads | Version | Platforms | | --- | --- | --- | --- | -| [![Conda Recipe](https://img.shields.io/badge/recipe-libignition--common3-green.svg)](https://anaconda.org/conda-forge/libignition-common3) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libignition-common3.svg)](https://anaconda.org/conda-forge/libignition-common3) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libignition-common3.svg)](https://anaconda.org/conda-forge/libignition-common3) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libignition-common3.svg)](https://anaconda.org/conda-forge/libignition-common3) | +| [![Conda Recipe](https://img.shields.io/badge/recipe-libignition--common4-green.svg)](https://anaconda.org/conda-forge/libignition-common4) | [![Conda Downloads](https://img.shields.io/conda/dn/conda-forge/libignition-common4.svg)](https://anaconda.org/conda-forge/libignition-common4) | [![Conda Version](https://img.shields.io/conda/vn/conda-forge/libignition-common4.svg)](https://anaconda.org/conda-forge/libignition-common4) | [![Conda Platforms](https://img.shields.io/conda/pn/conda-forge/libignition-common4.svg)](https://anaconda.org/conda-forge/libignition-common4) | -Installing libignition-common3 +Installing libignition-common4 ============================== -Installing `libignition-common3` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: +Installing `libignition-common4` from the `conda-forge` channel can be achieved by adding `conda-forge` to your channels with: ``` conda config --add channels conda-forge ``` -Once the `conda-forge` channel has been enabled, `libignition-common3` can be installed with: +Once the `conda-forge` channel has been enabled, `libignition-common4` can be installed with: ``` -conda install libignition-common3 +conda install libignition-common4 ``` -It is possible to list all of the versions of `libignition-common3` available on your platform with: +It is possible to list all of the versions of `libignition-common4` available on your platform with: ``` -conda search libignition-common3 --channel conda-forge +conda search libignition-common4 --channel conda-forge ``` @@ -150,17 +150,17 @@ Terminology produce the finished article (built conda distributions) -Updating libignition-common3-feedstock +Updating libignition-common4-feedstock ====================================== -If you would like to improve the libignition-common3 recipe or build a new +If you would like to improve the libignition-common4 recipe or build a new package version, please fork this repository and submit a PR. Upon submission, your changes will be run on the appropriate platforms to give the reviewer an opportunity to confirm that the changes result in a successful build. Once merged, the recipe will be re-built and uploaded automatically to the `conda-forge` channel, whereupon the built conda packages will be available for everybody to install and use from the `conda-forge` channel. -Note that all branches in the conda-forge/libignition-common3-feedstock are +Note that all branches in the conda-forge/libignition-common4-feedstock are immediately built and any created packages are uploaded, so PRs should be based on branches in forks and branches in the main repository should only be used to build distinct package versions. diff --git a/conda-forge.yml b/conda-forge.yml index 2989916..efc90b8 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,2 +1,5 @@ conda_forge_output_validation: true provider: {linux_aarch64: default, linux_ppc64le: default} +bot: + abi_migration_branches: + - "v3" diff --git a/recipe/fix_test_break.patch b/recipe/fix_test_break.patch deleted file mode 100644 index 290cece..0000000 --- a/recipe/fix_test_break.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- test/plugins/CMakeLists.txt -+++ test/plugins/CMakeLists.txt -@@ -8,24 +8,27 @@ - # This variable gets put in the cache so that it is available at generation time. - set(IGN_DUMMY_PLUGIN_PATH_HEADER "DummyPluginsPath.h" CACHE INTERNAL "Name of header which contains DummyPlugin library path") - --set(header_text "#define IGN_DUMMY_PLUGIN_PATH \"$\"") -+get_target_property(IGNDummyPluginsLocation IGNDummyPlugins RUNTIME_OUTPUT_DIRECTORY) -+set(header_text "#define IGN_DUMMY_PLUGIN_PATH \"${IGNDummyPluginsLocation}\"") - - # Pipe the header text into a header that will be placed in the project binary directory. - # We need to use this approach instead of the usual configure_file, because we required a - # generator expression in order to locate the IGNDummyPlugins library on Windows. Generator - # expressions can only be evaluated during generation (as opposed to during configuration), - # so we must use add_custom_command in order to produce this header. -+add_custom_target(IGNDummyPluginsPathHeader) - if(WIN32) - # Including VERBATIM causes the wrong behavior on Windows, so we leave it out of the - # custom command when compiling on Windows. -- add_custom_command(TARGET IGNDummyPlugins -+ add_custom_command(TARGET IGNDummyPluginsPathHeader - PRE_BUILD - COMMAND echo - ARGS "${header_text}" > ${PROJECT_BINARY_DIR}/${IGN_DUMMY_PLUGIN_PATH_HEADER}) - else() -- add_custom_command(TARGET IGNDummyPlugins -+ add_custom_command(TARGET IGNDummyPluginsPathHeader - PRE_BUILD - COMMAND echo - ARGS "${header_text}" > ${PROJECT_BINARY_DIR}/${IGN_DUMMY_PLUGIN_PATH_HEADER} - VERBATIM) --endif() -\ No newline at end of file -+endif() -+add_dependencies(IGNDummyPlugins IGNDummyPluginsPathHeader) -\ No newline at end of file - ---- test/performance/CMakeLists.txt -+++ test/performance/CMakeLists.txt -@@ -12,3 +12,9 @@ - ign_build_tests( - TYPE PERFORMANCE - SOURCES ${tests}) -+ -+if(TARGET PERFORMANCE_plugin_specialization) -+ # We add this dependency to make sure that DummyPlugins gets generated -+ # before PERFORMANCE_plugin_specialization so that its auto-generated header is available. -+ add_dependencies(PERFORMANCE_plugin_specialization IGNDummyPlugins) -+endif() diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b4e30f3..ccbbe2c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set base_name = "libignition-common" %} -{% set version = "3.11.1" %} +{% set version = "4.0.0" %} {% set major_version = version.split('.')[0] %} {% set name = base_name + major_version %} @@ -9,9 +9,8 @@ package: source: - url: https://github.com/ignitionrobotics/ign-common/archive/ignition-common{{ major_version }}_{{ version }}.tar.gz - sha256: 46803bf6fb220936ed0e6660ae4e016f65e8fd402ddc468cb3db3ac554f074f2 + sha256: 06169fd8bccf41cceb08f5590e6c3059797cb85b52686e76c4e93fd7de937ac2 patches: - - fix_test_break.patch - librt_linkage.patch # [linux] - framework.patch # [osx] @@ -30,6 +29,7 @@ requirements: host: - libignition-math6 - libignition-cmake2 + - libignition-utils1 - dlfcn-win32 # [win] - libuuid # [linux] - freeimage @@ -59,3 +59,4 @@ extra: recipe-maintainers: - seanyen - Tobias-Fischer + - traversaro