Merge pull request #2089 from conan-io/release/1.36.0

Release/1.36.0

Author: czoido

.ci/publish.jenkins

@@ -2,6 +2,7 @@
 
 // TODO: Move to a file and avoid modifying CI script
 Map<String, String> versions = [
+        'release/1.36.0': '1.36',
         'release/1.35.2': '1.35',
         'release/1.34.1': '1.34',
         'release/1.33.1': '1.33',

changelog.rst

@@ -18,9 +18,40 @@ Check https://github.com/conan-io/conan for issues and more details about develo
 
 .. important::
 
-    Conan 1.35 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please
+    Conan 1.36 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.36.0 (28-Apr-2021)
+--------------------
+
+- Feature: Add support to ``tools.cmake.CMake`` for Ninja toolchain defined with ``CMakeToolchain``. `#8887 <https://github.com/conan-io/conan/pull/8887>`_
+- Feature: The `CMakeDeps` generator will print CMake traces with the declared targets. e.g: `Target declared: 'OpenSSL::Crypto'`. `#8843 <https://github.com/conan-io/conan/pull/8843>`_
+- Feature: Add clang 12 support. `#8828 <https://github.com/conan-io/conan/pull/8828>`_
+- Feature: List tools and core from profile and _global.conf_. `#8821 <https://github.com/conan-io/conan/pull/8821>`_ . Docs `here <https://github.com/conan-io/docs/pull/2077>`__
+- Feature: Add cross-building tests for new AutoTools build helper. `#8819 <https://github.com/conan-io/conan/pull/8819>`_
+- Feature: ``CMakeToolchain`` generates a ``conanbuild.json`` file with the generator to be used in the ``CMake`` command line later, so it is not necessary to duplicate logic, and is explicit what generator should be used. `#8815 <https://github.com/conan-io/conan/pull/8815>`_ . Docs `here <https://github.com/conan-io/docs/pull/2079>`__
+- Feature: ``CMakeToolchain`` learned to build with different toolsets, down to the minor compiler version, for the ``msvc`` compiler. `#8815 <https://github.com/conan-io/conan/pull/8815>`_ . Docs `here <https://github.com/conan-io/docs/pull/2079>`__
+- Feature: Validate checksum and retry download for corrupted downloaded cache files. `#8806 <https://github.com/conan-io/conan/pull/8806>`_
+- Feature: ``CMakeToolchain`` defining `CMAKE_GENERATOR_TOOLSET` for msvc version different than the default. `#8800 <https://github.com/conan-io/conan/pull/8800>`_
+- Feature: Implement ``test_build_require`` in ``test_package/conanfile.py`` recipes, so build_requires can be tested as such. `#8787 <https://github.com/conan-io/conan/pull/8787>`_ . Docs `here <https://github.com/conan-io/docs/pull/2081>`__
+- Feature: Make available the full recipe and package reference to consumers via ``.dependencies``. `#8765 <https://github.com/conan-io/conan/pull/8765>`_
+- Feature: New ``CMakeToolchain`` customization and extensibility mechanism with blocks of components instead of inheritance. `#8749 <https://github.com/conan-io/conan/pull/8749>`_ . Docs `here <https://github.com/conan-io/docs/pull/2085>`__
+- Feature: Add `set_property` and `get_property` to set properties and access them in generators. Can be set only for a specific generator or as a default value for all of them. `#8727 <https://github.com/conan-io/conan/pull/8727>`_ . Docs `here <https://github.com/conan-io/docs/pull/2082>`__
+- Feature: Use `set_property` and `get_property` to support custom defined content in `pkg_config` generator. `#8727 <https://github.com/conan-io/conan/pull/8727>`_ . Docs `here <https://github.com/conan-io/docs/pull/2082>`__
+- Feature: Add new property names: `cmake_target_name`, `cmake_file_name`, `pkg_config_name` and `cmake_build_modules` that can be used for multiple generators of the same type allowing also an easier migration of `names`, `filenames` and `build_modules` properties to this model. `#8727 <https://github.com/conan-io/conan/pull/8727>`_ . Docs `here <https://github.com/conan-io/docs/pull/2082>`__
+- Feature: Skip package when building all package from sources at once using `--build=!<package>` syntax. `#8483 <https://github.com/conan-io/conan/pull/8483>`_ . Docs `here <https://github.com/conan-io/docs/pull/2023>`__
+- Feature: ``CMakeToolchain`` will generate ``conanvcvars.bat`` for Ninja builds for ``msvc``. `#8005 <https://github.com/conan-io/conan/pull/8005>`_
+- Fix: Remove ``tools.gnu.MakeToolchain``, superseded by ``tools.gnu.AutotoolsToolchain``. `#8880 <https://github.com/conan-io/conan/pull/8880>`_ . Docs `here <https://github.com/conan-io/docs/pull/2084>`__
+- Fix: Allow spaces in the path for new environment files and ``conancvvars.bat`` Visual toolchain file. `#8847 <https://github.com/conan-io/conan/pull/8847>`_
+- Fix: Return `deprecated` attribute in :command:`conan inspect` command. `#8832 <https://github.com/conan-io/conan/pull/8832>`_
+- Fix: Check if Artifactory url for publishing the build_info has `artifactory` string as the service context and remove from the API url if it doesn't. `#8826 <https://github.com/conan-io/conan/pull/8826>`_
+- Fix: Recognize ``Ninja Multi-Config`` as a  CMake multi-configuration generator. `#8814 <https://github.com/conan-io/conan/pull/8814>`_
+- Fix: using `CMAKE_CURRENT_LIST_DIR` in `CMakeToolchain` to locate `CMakeDeps` config files. `#8810 <https://github.com/conan-io/conan/pull/8810>`_
+- Fix: `config_install_interval` no longer enter in loop when invalid. `#8769 <https://github.com/conan-io/conan/pull/8769>`_ . Docs `here <https://github.com/conan-io/docs/pull/2067>`__
+- Fix: Remove multi-config support for ``CMakeDeps`` generator. `#8767 <https://github.com/conan-io/conan/pull/8767>`_ . Docs `here <https://github.com/conan-io/docs/pull/2083>`__
+- Fix: Accept relative profile path when folder is on same tree level. `#8685 <https://github.com/conan-io/conan/pull/8685>`_ . Docs `here <https://github.com/conan-io/docs/pull/2049>`__
+- Bugfix: Fixed test_package/conanfile.py using ``build_requires`` for a package belonging to a lockfile. `#8793 <https://github.com/conan-io/conan/pull/8793>`_
+
 1.35.2 (19-Apr-2021)
 --------------------
 

conf.py

@@ -41,9 +41,9 @@
 ]
 
 # The short X.Y version.
-version = "1.35"
+version = "1.36"
 # The full version, including alpha/beta/rc tags.
-release = u'1.35.2'
+release = u'1.36.0'
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 if not os.path.exists(os.path.join(dir_path, "versions.json")):

creating_packages/package_approaches.rst

@@ -79,6 +79,13 @@ Read more about this in :ref:`method_package_info`.
 N configs -> 1 package
 ----------------------
 
+.. warning::
+
+    This approach is discouraged. The support for defining multi-configuration packages (``self.cpp_info.release``, ``self.cpp_info.debug``),
+    will be removed in Conan 2.0, as discussed and approved by the Tribe in https://github.com/conan-io/tribe/pull/21. New generators and
+    helpers in ``conan.tools.xxxx``, like ``CMakeDeps`` or ``MSBuildDeps`` already ignore ``cpp_info`` multi-configuration definitions.
+
+
 You may want to package both debug and release artifacts in the same package, so it can be consumed from IDEs like Visual Studio. This will
 change the debug/release configuration from the IDE, without having to specify it in the command line. This type of package can contain
 different artifacts for different configurations and can be used to include both the release and debug version of a library in the same

creating_packages/toolchains.rst

@@ -40,7 +40,7 @@ For example, for using the CMake toolchain this should be declared in the recipe
 
 .. note::
 
-    At the moment (Conan 1.32), the available built-in toolchains are ``CMakeToolchain``, ``MakeToolchain``,
+    At the moment (Conan 1.32), the available built-in toolchains are ``CMakeToolchain``,
     ``MSBuildToolchain`` and ``MesonToolchain``.
 
 But in the more general case, and if it needs any specific configuration beyond the default

devtools/build_requires.rst

@@ -268,3 +268,32 @@ same ``build_requires`` package. Something like:
 By using this mechanism, ``tool`` dependency will always be used (the recipe will be fetched from servers), and the version of ``tool`` will
 be used to compute the ``package_id`` following the ``default_python_requires_id_mode`` in *conan.conf*, or the specific
 ``self.info.python_requires.xxxx_mode()`` in recipes.
+
+
+Testing build_requires
+----------------------
+
+.. warning::
+
+    This is an **experimental** feature, subject to future breaking changes
+
+Available since: `1.36.0 <https://github.com/conan-io/conan/releases>`_
+
+From Conan 1.36, it is possible to test ``build_requires`` with the ``test_package`` functionality.
+What is necessary is to specify in the ``test_package/conanfile.py``, that the tested package
+is a build tool, which can be done with:
+
+.. code-block:: python
+
+    from conans import ConanFile
+
+    class Pkg(ConanFile):
+        test_type = "build_requires"
+
+        ...
+
+The rest of the test *conanfile.py* should take into account that the reference automatically injected
+will be a ``build_require``.
+
+If for some reason, it is necessary to test the same package both as a regular require and a build_require,
+then it is possible to specify: ``test_type = "build_requires", "requires"``.

integrations/build_system/make.rst

@@ -3,21 +3,16 @@
 Make
 ====
 
-Conan provides two integrations for plain Makefiles:
+.. warning::
 
- | The :ref:`Make generator<make_generator>`
- | The :ref:`Make toolchain<make_toolchain>` (experimental)
+    This integration is to be deprecated in Conan 2.0. Check :ref:`the conan.tools.gnu Autotools<conan_tools_gnu>` integration.
 
-Refer to the links above for more detail about each of them. Here we provide a
-high-level explanation of how these integrations are meant to be used. 
-
-If you are using ``Makefile`` to build your project you can use one or both of
-these depending on your needs.
+Conan provides the :ref:`Make generator<make_generator>` to integrate with plain Makefiles
 
 The ``make`` generator outputs all the variables related to package dependencies
 into a file which is named *conanbuildinfo.mak*. The ``make`` toolchain outputs
 all the variables related to settings, options, and platform into a file which
-is named ``conan_toolchain.mak``. 
+is named ``conan_toolchain.mak``.
 
 To use the generator, indicate it in your ``conanfile`` like this:
 
@@ -34,19 +29,6 @@ To use the generator, indicate it in your ``conanfile`` like this:
         ...
         generators = "make"
 
-To use the toolchain, add the following function to your ``conanfile``:
-
-.. code-block:: python
-   :caption: *conanfile.py*
-
-    class MyConan(ConanFile):
-        ...
-        def generate(self):
-            tc = Make(self)
-            tc.generate()
-
-**NOTE**: This can only be used in a ``conanfile.py`` and not ``conanfile.txt``.
-
 
 Example
 -------
@@ -74,33 +56,6 @@ This is the main source file for it:
         return 0;
     }
 
-As this project relies on the Poco Libraries we are going to create a ``conanfile.py`` with our requirement and also declare the Make
-generator and Make toolchain. For simplicity, this ``conanfile`` declares an
-empty build and package step. They're not needed for for the local developer
-workflow. 
-
-.. code-block:: python
-   :caption: *conanfile.py*
-          
-    from conans import ConanFile
-    from conan.tools.gnu import MakeToolchain
-    
-    class MyConan(ConanFile):
-        name = "myconan"
-        version = "0.1"
-        settings = "os", "arch", "compiler", "build_type"
-        generators = "make"
-        exports_sources = "*"
-
-        def generate(self):
-            tc = MakeToolchain(self)
-            tc.generate()
-
-        def build(self):
-            pass
-
-        def package(self):
-            pass
 
 In order to use this generator within your project, use the following Makefile as a reference:
 
@@ -114,13 +69,6 @@ In order to use this generator within your project, use the following Makefile a
     include conanbuildinfo.mak
     $(call CONAN_BASIC_SETUP)
 
-    #----------------------------------------
-    #     Prepare flags from make toolchain
-    #----------------------------------------
-
-    include conan_toolchain.mak
-    $(call CONAN_TC_SETUP)
-
     #----------------------------------------
     #     Make variables for a sample App
     #----------------------------------------
@@ -161,5 +109,3 @@ Now you can run your application with ``./main``.
 .. seealso::
 
     | Complete reference for :ref:`Make generator<make_generator>`
-    | Complete reference for :ref:`Make toolchain<make_toolchain>` (experimental)
-

mastering/policies.rst

@@ -13,6 +13,7 @@ As previously demonstrated, we can use the :command:`--build` option to change t
 - :command:`--build cascade` will build from code all the nodes with some dependency being built (for any reason). Can be used together with any
   other build policy. Useful to make sure that any new change introduced in a dependency is incorporated by building again the package.
 - :command:`--build pattern*` will build only the packages with the reference starting with "pattern".
+- :command:`--build --build=!some_package` will build all requirements from sources, except for some_package.
 
 
 With the ``build_policy`` attribute in the `conanfile.py` the package creator can change the default Conan's build behavior. The allowed build_policy values are:

reference/commands/consumer/config.rst

@@ -10,7 +10,7 @@ conan config
 
 .. code-block:: bash
 
-    $ conan config [-h] {get,home,install,rm,set,init} ...
+    $ conan config [-h] {get,home,install,rm,set,init,list} ...
 
 Manages Conan configuration.
 
@@ -19,7 +19,7 @@ Used to edit conan.conf, or install config files.
 .. code-block:: text
 
     positional arguments:
-      {get,home,install,rm,set,init}
+      {get,home,install,rm,set,init,list}
                             sub-command help
         get                 Get the value of configuration item
         home                Retrieve the Conan home directory
@@ -28,6 +28,7 @@ Used to edit conan.conf, or install config files.
         rm                  Remove an existing config element
         set                 Set a value for a configuration item
         init                Initializes Conan configuration files
+        list                List Conan configuration properties
 
     optional arguments:
       -h, --help            show this help message and exit
@@ -67,6 +68,18 @@ Used to edit conan.conf, or install config files.
 
       $ conan config init --force
 
+- List all possible properties allowed for :ref:`global.conf<global_conf>`
+
+  .. code-block:: bash
+
+      $ conan config list
+
+- Set config install scheduler for every 1 week:
+
+  .. code-block:: bash
+
+      $ conan config set general.config_install_interval=1w
+
 .. _conan_config_install:
 
 conan config install
@@ -204,7 +217,7 @@ Conan runs it based on *config_install.json*, including the timestamp of the las
   .. code-block:: bash
 
       $ conan config install my_settings\settings.yml
-      
+
 - Install the configuration from a local path:
 
   .. code-block:: bash

reference/commands/consumer/install.rst

@@ -81,10 +81,13 @@ generators.
                             built from source. --build=[pattern] Build packages
                             from source whose package reference matches the
                             pattern. The pattern uses 'fnmatch' style wildcards.
-                            Default behavior: If you omit the '--build' option,
-                            the 'build_policy' attribute in conanfile.py will be
-                            used if it exists, otherwise the behavior is like '--
-                            build=never'.
+                            --build=![pattern] Excluded packages, which will not
+                            be built from the source, whose package reference
+                            matches the pattern. The pattern uses 'fnmatch' style
+                            wildcards. Default behavior: If you omit the '--build'
+                            option, the 'build_policy' attribute in conanfile.py
+                            will be used if it exists, otherwise the behavior is
+                            like '--build=never'.
       -r REMOTE, --remote REMOTE
                             Look in the specified remote server
       -u, --update          Will check the remote and in case a newer version
@@ -244,6 +247,13 @@ Possible values are:
    - e.g., :command:`--build=zlib` will match any package named ``zlib`` (same as ``zlib/*``).
    - e.g., :command:`--build=z*@conan/stable` will match any package starting with ``z`` with ``conan/stable`` as user/channel.
 
+* :command:`--build=![pattern]`: A fnmatch case-sensitive pattern of a package reference or only the package name.
+  Conan will exclude the build of the packages whose reference matches the given
+  **pattern**. Several patterns can be specified, chaining multiple options:
+
+   - e.g., :command:`--build=!zlib --build` Build all packages from source, except for zlib.
+   - e.g., :command:`--build=!z* --build` Build all packages from source, except for those starting with ``z``
+
 If you omit the :command:`--build` option, the ``build_policy`` attribute in `conanfile.py` will be
 looked up. If it is set to ``missing`` or ``always``, this build option will be used, otherwise the
 command will behave like :command:`--build=never` was set.