Skip to content

Commit

Permalink
Automatic deploy (build number 541)
Browse files Browse the repository at this point in the history
  • Loading branch information
ConanCI bot committed Sep 18, 2023
1 parent e127c36 commit 5d00d35
Show file tree
Hide file tree
Showing 625 changed files with 7,132 additions and 2,668 deletions.
2 changes: 1 addition & 1 deletion 2.0/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 05dfdedf4563197cb24ed0ee72f545ed
config: cc2f8d5f3e0ebc0ff5bd97c6f2398372
tags: 645f666f9bcd5a90fca523b33c5a78b7
8 changes: 4 additions & 4 deletions 2.0/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Page Not Found &mdash; conan 2.0.10 documentation</title>
<title>Page Not Found &mdash; conan 2.0.11 documentation</title>



Expand Down Expand Up @@ -45,7 +45,7 @@
<link rel="index" title="Index"
href="genindex.html"/>
<link rel="search" title="Search" href="search.html"/>
<link rel="top" title="conan 2.0.10 documentation" href="index.html"/>
<link rel="top" title="conan 2.0.11 documentation" href="index.html"/>

<!-- Google Tag Manager -->
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
Expand Down Expand Up @@ -215,7 +215,7 @@ <h1>Page Not Found<a class="headerlink" href="#page-not-found" title="Permalink
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Sep 15, 2023.
Last updated on Sep 18, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down Expand Up @@ -628,7 +628,7 @@ <h1>Page Not Found<a class="headerlink" href="#page-not-found" title="Permalink
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'2.0.10',
VERSION:'2.0.11',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true,
Expand Down
8 changes: 4 additions & 4 deletions 2.0/Page Not Found.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Page not found &mdash; conan 2.0.10 documentation</title>
<title>Page not found &mdash; conan 2.0.11 documentation</title>



Expand Down Expand Up @@ -45,7 +45,7 @@
<link rel="index" title="Index"
href="/en/latest/genindex.html"/>
<link rel="search" title="Search" href="/en/latest/search.html"/>
<link rel="top" title="conan 2.0.10 documentation" href="/en/latest/index.html"/>
<link rel="top" title="conan 2.0.11 documentation" href="/en/latest/index.html"/>

<!-- Google Tag Manager -->
<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
Expand Down Expand Up @@ -210,7 +210,7 @@ <h1>Page not found</h1>
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Sep 15, 2023.
Last updated on Sep 18, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down Expand Up @@ -623,7 +623,7 @@ <h1>Page not found</h1>
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'',
VERSION:'2.0.10',
VERSION:'2.0.11',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true,
Expand Down
29 changes: 29 additions & 0 deletions 2.0/_sources/changelog.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,35 @@ Changelog

For a more detailed description of the major changes that Conan 2.0 brings, compared with Conan 1.X, please read :ref:`whatsnew`

2.0.11 (18-Sept-2023)
---------------------

- Feature: Add ``--format=json`` formatter to ``conan profile show`` command `#14743 <https://github.com/conan-io/conan/pull/14743>`_ . Docs `here <https://github.com/conan-io/docs/pull/3388>`__
- Feature: add new --deployer --generators args to 'conan build' cmd `#14737 <https://github.com/conan-io/conan/pull/14737>`_ . Docs `here <https://github.com/conan-io/docs/pull/3383>`__
- Feature: Better ``CMakeToolchain`` blocks interface. Added new ``.blocks.select()``, ``.blocks.keys()``. `#14731 <https://github.com/conan-io/conan/pull/14731>`_ . Docs `here <https://github.com/conan-io/docs/pull/3384>`__
- Feature: Add message when copying large files from download cache instead of downloading from server. `#14716 <https://github.com/conan-io/conan/pull/14716>`_
- Feature: MesonToolchain shows a warning message if any options are used directly. `#14692 <https://github.com/conan-io/conan/pull/14692>`_ . Docs `here <https://github.com/conan-io/docs/pull/3381>`__
- Feature: Support clang-cl in default profile plugin. `#14682 <https://github.com/conan-io/conan/pull/14682>`_ . Docs `here <https://github.com/conan-io/docs/pull/3387>`__
- Feature: Added mechanism to transform `c`, `cpp`, and/or `ld` binaries variables from Meson into lists if declared blank-separated strings. `#14676 <https://github.com/conan-io/conan/pull/14676>`_
- Feature: Add `nobara` distro to `dnf` package manager mapping. `#14668 <https://github.com/conan-io/conan/pull/14668>`_
- Feature: Ensure meson toolchain sets `b_vscrt` with clang-cl. `#14664 <https://github.com/conan-io/conan/pull/14664>`_
- Feature: Supporting regex pattern for conf `tools.info.package_id:confs` `#14621 <https://github.com/conan-io/conan/pull/14621>`_ . Docs `here <https://github.com/conan-io/docs/pull/3382>`__
- Feature: MakeDeps: Provide "require" information, and more styling tweaks. `#14605 <https://github.com/conan-io/conan/pull/14605>`_
- Feature: New ``detect_api`` to be used in profiles jinja templates. `#14578 <https://github.com/conan-io/conan/pull/14578>`_ . Docs `here <https://github.com/conan-io/docs/pull/3390>`__
- Feature: Allow access to `settings_target` in compatibility method. `#14532 <https://github.com/conan-io/conan/pull/14532>`_
- Fix: Add missing minor macos versions `#14740 <https://github.com/conan-io/conan/pull/14740>`_ . Docs `here <https://github.com/conan-io/docs/pull/3389>`__
- Fix: Improve error messages in `ConanApi` init failures, `#14735 <https://github.com/conan-io/conan/pull/14735>`_
- Fix: CMakeDeps: Remove "Target name ... already exists" warning about duplicating aliases. `#14644 <https://github.com/conan-io/conan/pull/14644>`_
- Bugfix: Fix regression in ``Git.run()`` when ``win_bash=True``. `#14756 <https://github.com/conan-io/conan/pull/14756>`_
- Bugfix: Change the default `check=False` in `conan.tools.system.package_manager.Apt` to `True` as the other package manager tools. `#14728 <https://github.com/conan-io/conan/pull/14728>`_ . Docs `here <https://github.com/conan-io/docs/pull/3380>`__
- Bugfix: Solved propagation of transitive shared dependencies of ``test_requires`` with diamonds. `#14721 <https://github.com/conan-io/conan/pull/14721>`_
- Bugfix: Solve crash with :command:`conan export-pkg` with ``test_package`` doing calls to remotes. `#14712 <https://github.com/conan-io/conan/pull/14712>`_
- Bugfix: Do not binary-skip packages that have transitive dependencies that are not skipped, otherwise the build chain of build systems to those transitive dependencies like ``CMakeDeps`` generated files are broken. `#14673 <https://github.com/conan-io/conan/pull/14673>`_
- Bugfix: Fix detected CPU architecture when running ``conan profile detect`` on native ARM64 Windows. `#14667 <https://github.com/conan-io/conan/pull/14667>`_
- Bugfix: ``conan lock create --update`` now correctly updates references from servers if newer than cache ones. `#14643 <https://github.com/conan-io/conan/pull/14643>`_
- Bugfix: Fix unnecessarily decorating command stdout with escape sequences. `#14642 <https://github.com/conan-io/conan/pull/14642>`_
- Bugfix: ``tools.info.package_id:confs`` shouldn't affect header-only libraries. `#14622 <https://github.com/conan-io/conan/pull/14622>`_

2.0.10 (29-Aug-2023)
--------------------

Expand Down
2 changes: 1 addition & 1 deletion 2.0/_sources/devops/using_conancenter.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Lockfiles ensure that Conan will resolve the same graph in a repeatable and
consistent manner - thus making sure the same versions are used across multiple
systems (CI, developers, etc).

Lockfiles are also used in other package managers like Pytho pip, Rust Cargo, npm -
Lockfiles are also used in other package managers like Python pip, Rust Cargo, npm -
these recommendations are in line with the practices of these other technologies.

Additionally, it is highly recommended to host your recipes and packages in your
Expand Down
2 changes: 1 addition & 1 deletion 2.0/_sources/examples/commands/pkglists.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -206,4 +206,4 @@ Then the pattern to remove everything will be different if we call directly ``co
$ conan remove --list=pkglist.json -c
For more information see the :ref:`Reference commands section<reference_commands>`
For more information see the :ref:`Reference commands section<reference_commands>`
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ There we find a ``greetings`` subfolder and package, that contains 2 libraries,
def layout(self):
cmake_layout(self, src_folder="src")
# This "includedirs" starts in the source folder, wich is "src"
# This "includedirs" starts in the source folder, which is "src"
# So the components include dirs is the "src" folder (includes are
# intended to be included as ``#include "hello/hello.h"``)
self.cpp.source.components["hello"].includedirs = ["."]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ The ``conan clean`` command has the following code:
Let's analize the most important parts.
Let's analyze the most important parts.

parser
++++++
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ so it is not an issue, and each one will be found inside its package.

But if the executable file was exactly the same like ``gcc.exe``, then it would be necessary to obtain the full folder
(typically in the ``generate()`` method) with something like ``self.dependencies.build.get("gcc", options={"myoption": 1}).cpp_info.bindir`` and
use the full path to dissambiguate.
use the full path to disambiguate.


Let's see it working. If we execute:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ so it is not an issue, and each one will be found inside its package.

But if the executable file was exactly the same like ``gcc.exe``, then it would be necessary to obtain the full folder
(typically in the ``generate()`` method) with something like ``self.dependencies.build["gcc/1.0"].cpp_info.bindir`` and
use the full path to dissambiguate.
use the full path to disambiguate.


Let's see it working. If we execute:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ And a ``CMakeLists.txt`` like:
myfunction()
Then, the consumer will be able to automatically call the ``myfunction()`` from the dependecy module:
Then, the consumer will be able to automatically call the ``myfunction()`` from the dependency module:

.. code-block:: bash
Expand All @@ -90,4 +90,3 @@ Then, the consumer will be able to automatically call the ``myfunction()`` from
Hello myfunction!!!!
If for some reason the consumer wants to force the usage from the ``tool_requires()`` as a CMake module, the consumer could do ``deps.set_property("myfunctions", "cmake_find_mode", "module", build_context=True)``, and then ``find_package(myfunctions MODULE REQUIRED)`` will work.

Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ external ``myvars.cmake`` file:
$ conan create . -pr=myprofile
...
-- MYVAR1 MYVALUE1!!
-- MY_USER_VAR1 MYVALUE1
Note that using ``user_toolchain`` while defining values for confs like ``tools.cmake.cmaketoolchain:system_name`` is supported.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Let's explain step by step what is happening:
- This obtains the URL of the repo pointing to the local ``<local-path>/capture_scm`` and the commit ``8e8764c40bebabbe3ec57f9a0816a2c8e691f559``
- It warns that this information will **not** be enough to re-build from source this recipe once the package is uploaded to the server and is tried to be built from source in other computer, which will not contain the path pointed by ``<local-path>/capture_scm``. This is expected, as the repository that we created doesn't have any remote defined. If our local clone had a remote defined and that remote contained the ``commit`` that we are building, the ``scm_url`` would point to the remote repository instead, making the build from source fully reproducible.
- The ``export()`` method stores the ``url`` and ``commit`` information in the ``conandata.yml`` for future reproducibility.
- When the package needs to be built from sources and it calls the ``source()`` method, it recovers the information from the ``conandata.yml`` file, and calls ``git.clone()`` with it to retrive the sources. In this case, it will be cloning from the local checkout in ``<local-path>/capture_scm``, but if it had a remote defined, it will clone from it.
- When the package needs to be built from sources and it calls the ``source()`` method, it recovers the information from the ``conandata.yml`` file, and calls ``git.clone()`` with it to retrieve the sources. In this case, it will be cloning from the local checkout in ``<local-path>/capture_scm``, but if it had a remote defined, it will clone from it.


.. warning::
Expand Down
2 changes: 1 addition & 1 deletion 2.0/_sources/knowledge/guidelines.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Forbidden practices
executed as a result of a Conan invocation. For the same reason **Conan Python API cannot be used from recipes**: The Conan Python API can only be called from Conan custom commands or from user Python scripts,
but never from ``conanfile.py`` recipes, hooks, extensions, plugins, or any other code
executed by Conan.
- **Settings and configration (conf) are read-only in recipes**: The settings and configuration cannot be defined or assigned values in recipes. Something like ``self.settings.compiler = "gcc"`` in recipes shouldn't be done. That is undefined behavior and can crash at any time, or just be ignored. Settings and configuration can only be defined in profiles, in command line arguments or in the ``profile.py`` plugin.
- **Settings and configuration (conf) are read-only in recipes**: The settings and configuration cannot be defined or assigned values in recipes. Something like ``self.settings.compiler = "gcc"`` in recipes shouldn't be done. That is undefined behavior and can crash at any time, or just be ignored. Settings and configuration can only be defined in profiles, in command line arguments or in the ``profile.py`` plugin.
- **Recipes reserved names**: Conan ``conanfile.py`` recipes user attributes and methods should always start with ``_``.
Conan reserves the "public" namespace for all attributes and methods, and ``_conan`` for
private ones. Using any non-documented Python function, method, class, attribute, even if
Expand Down
24 changes: 19 additions & 5 deletions 2.0/_sources/reference/commands/build.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ conan build
$ conan build -h
usage: conan build [-h] [-v [V]] [--name NAME] [--version VERSION]
[--user USER] [--channel CHANNEL] [-of OUTPUT_FOLDER]
[--user USER] [--channel CHANNEL] [-g GENERATOR]
[-of OUTPUT_FOLDER] [-d DEPLOYER]
[--deployer-folder DEPLOYER_FOLDER] [--build-require]
[-b BUILD] [-r REMOTE | -nr] [-u] [-o OPTIONS_HOST]
[-o:b OPTIONS_BUILD] [-o:h OPTIONS_HOST] [-pr PROFILE_HOST]
[-pr:b PROFILE_BUILD] [-pr:h PROFILE_HOST]
Expand All @@ -16,6 +18,7 @@ conan build
[-c:h CONF_HOST] [-l LOCKFILE] [--lockfile-partial]
[--lockfile-out LOCKFILE_OUT] [--lockfile-packages]
[--lockfile-clean]
[--lockfile-overrides LOCKFILE_OVERRIDES]
[path]
Install dependencies and call the build() method.
Expand All @@ -36,22 +39,31 @@ conan build
conanfile
--user USER Provide a user if not specified in conanfile
--channel CHANNEL Provide a channel if not specified in conanfile
-g GENERATOR, --generator GENERATOR
Generators to use
-of OUTPUT_FOLDER, --output-folder OUTPUT_FOLDER
The root output folder for generated and build files
-d DEPLOYER, --deployer DEPLOYER
Deploy using the provided deployer to the output
folder
--deployer-folder DEPLOYER_FOLDER
Deployer output folder, base build folder by default
if not set
--build-require Whether the provided path is a build-require
-b BUILD, --build BUILD
Optional, specify which packages to build from source.
Combining multiple '--build' options on one command
line is allowed. Possible values: --build="*" Force
build from source for all packages. --build=never
Disallow build for all packages, use binary packages
or fail if a binary package is not found. Cannot be
or fail if a binary package is not found, it cannot be
combined with other '--build' options. --build=missing
Build packages from source whose binary package is not
found. --build=cascade Build packages from source that
have at least one dependency being built from source.
--build=[pattern] Build packages from source whose
package reference matches the pattern. The pattern
uses 'fnmatch' style wildcards. --build=![pattern]
uses 'fnmatch' style wildcards. --build=~[pattern]
Excluded packages, which will not be built from the
source, whose package reference matches the pattern.
The pattern uses 'fnmatch' style wildcards.
Expand Down Expand Up @@ -113,10 +125,12 @@ conan build
Filename of the updated lockfile
--lockfile-packages Lock package-id and package-revision information
--lockfile-clean Remove unused entries from the lockfile
--lockfile-overrides LOCKFILE_OVERRIDES
Overwrite lockfile overrides
The ``conan build`` command installs the recipe specified in ``path`` and calls its ``build`` method.
The ``conan build`` command installs the recipe specified in ``path`` and calls its ``build()`` method.

.. seealso::

- Read the tutorial about the :ref:`local package developement flow <local_package_development_flow>`.
- Read the tutorial about the :ref:`local package development flow <local_package_development_flow>`.
6 changes: 3 additions & 3 deletions 2.0/_sources/reference/commands/config.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ conan config list
Displays all the Conan built-in configurations. There are 2 groups:

- ``core.xxxx``: These can only be defined in ``global.conf`` and are used by Conan internally
- ``tools.xxxx``: Thesa can be defined both in ``global.conf`` and profiles, and will be used by
- ``tools.xxxx``: These can be defined both in ``global.conf`` and profiles, and will be used by
recipes and tools used within recipes, like ``CMakeToolchain``


Expand All @@ -190,7 +190,7 @@ Displays all the Conan built-in configurations. There are 2 groups:
core.download:parallel: Number of concurrent threads to download packages
core.download:retry: Number of retries in case of failure when downloading from Conan server
core.download:retry_wait: Seconds to wait between download attempts from Conan server
core.gzip:compresslevel: The Gzip compresion level for Conan artifacts (default=9)
core.gzip:compresslevel: The Gzip compression level for Conan artifacts (default=9)
core.net.http:cacert_path: Path containing a custom Cacert file
core.net.http:clean_system_proxy: If defined, the proxies system env-vars will be discarded
core.net.http:client_cert: Path or tuple of files containing a client cert (and key)
Expand Down Expand Up @@ -245,7 +245,7 @@ Displays all the Conan built-in configurations. There are 2 groups:
tools.cmake.cmaketoolchain:toolset_arch: Toolset architecture to be used as part of CMAKE_GENERATOR_TOOLSET in CMakeToolchain
tools.cmake.cmaketoolchain:user_toolchain: Inject existing user toolchains at the beginning of conan_toolchain.cmake
tools.cmake:cmake_program: Path to CMake executable
tools.cmake:install_strip: Add --strip to cmake.instal()
tools.cmake:install_strip: Add --strip to cmake.install()
tools.compilation:verbosity: Verbosity of compilation tools if set. Possible values are 'quiet' and 'verbose'
tools.deployer:symlinks: Set to False to disable deployers copying symlinks
tools.env.virtualenv:powershell: If it is set to True it will generate powershell launchers if os=Windows
Expand Down
Loading

0 comments on commit 5d00d35

Please sign in to comment.