Skip to content

Commit

Permalink
Merge pull request conan-io#2358 from conan-io/master
Browse files Browse the repository at this point in the history
Merge master to develop
  • Loading branch information
czoido committed Jan 13, 2022
2 parents b34636c + f2b6145 commit 02a4641
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .ci/publish.jenkins
Expand Up @@ -3,8 +3,8 @@

// TODO: Move to a file and avoid modifying CI script
Map<String, String> versions = [
'release/1.44.0': '1.44',
'release/1.43.2': '1.43',
'release/1.44.1': '1.44',
'release/1.43.3': '1.43',
'release/1.42.2': '1.42',
'release/1.41.0': '1.41',
'release/1.40.4': '1.40',
Expand Down
13 changes: 13 additions & 0 deletions changelog.rst
Expand Up @@ -21,6 +21,13 @@ Check https://github.com/conan-io/conan for issues and more details about develo
Conan 1.44 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please submit
a report on GitHub. Read more about the :ref:`Conan stability commitment<stability>`.

1.44.1 (13-Jan-2022)
--------------------

- Bugfix: The `CMakeDeps` generator now uses the property `cmake_build_modules` declared in components of the required packages not only in the root cpp_info. `#10326 <https://github.com/conan-io/conan/pull/10326>`_
- Bugfix: Adding missing hidden-imports to pyinstaller. Close https://github.com/conan-io/conan/issues/10318 `#10320 <https://github.com/conan-io/conan/pull/10320>`_
- Bugfix: Make `pkg_config` generator listen to root `cpp_info` properties. `#10312 <https://github.com/conan-io/conan/pull/10312>`_

1.44.0 (29-Dec-2021)
--------------------

Expand All @@ -43,6 +50,12 @@ Check https://github.com/conan-io/conan for issues and more details about develo
- Bugfix: Fix passing component's linkflags in CMakeDepes generator `#10205 <https://github.com/conan-io/conan/pull/10205>`_
- Bugfix: `AutotoolsToolchain` was not passing the `compiler` to `get_gnu_triplet` function. `#10141 <https://github.com/conan-io/conan/pull/10141>`_

1.43.3 (13-Jan-2022)
--------------------

- Bugfix: The CMakeDeps generator now uses the property cmake_build_modules declared in components of the required packages not only in the root cpp_info. `#10331 <https://github.com/conan-io/conan/pull/10331>`_
- Bugfix: Make pkg_config generator listen to root cpp_info properties. `#10323 <https://github.com/conan-io/conan/pull/10323>`_

1.43.2 (21-Dec-2021)
--------------------

Expand Down
13 changes: 10 additions & 3 deletions conan_v2.rst
Expand Up @@ -71,9 +71,16 @@ available for Conan 2.0.
Host and build profiles and new cross-building model
----------------------------------------------------

Use always build and host profiles. You can enable it by passing ``-pr:b=default`` in the
command line to most commands. Do not use ``os_build``, ``arch_build`` anywhere in your
recipes or code.
Use always :ref:`build and host profiles <build_profiles_and_host_profiles>`.

Conan 1.x uses one profile by default, to start using two profiles, please do the following:

- Pass ``-pr:b=default`` in the command line to most commands.
- Or set the variable ``core:default_build_profile=default`` at the :ref:`global.conf<global_conf>` file to apply it
always, automatically.

Do not use ``os_build``, ``arch_build`` anywhere in your recipes or code.


Conan uses revisions by default in Conan 2.0
--------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions conf.py
Expand Up @@ -44,7 +44,7 @@
# The short X.Y version.
version = "1.44"
# The full version, including alpha/beta/rc tags.
release = u'1.44.0'
release = u'1.44.1'

dir_path = os.path.dirname(os.path.realpath(__file__))
if not os.path.exists(os.path.join(dir_path, "versions.json")):
Expand Down Expand Up @@ -86,7 +86,7 @@

# General information about the project.
project = u'conan'
copyright = u'2016-2021, JFrog'
copyright = u'2016-2022, JFrog'
author = u'The Conan team'

# The language for content autogenerated by Sphinx. Refer to documentation
Expand Down

0 comments on commit 02a4641

Please sign in to comment.