Skip to content

Commit

Permalink
Automatic deploy (build number 6)
Browse files Browse the repository at this point in the history
  • Loading branch information
ConanCI bot committed Feb 20, 2024
1 parent c52316e commit 33d581d
Show file tree
Hide file tree
Showing 657 changed files with 1,398 additions and 1,398 deletions.
4 changes: 2 additions & 2 deletions 2.1/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</div><div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="Navigation menu">
<ul>
<li class="toctree-l1"><a class="reference internal" href="introduction.html">Introduction</a></li>
<li class="toctree-l1"><a class="reference internal" href="whatsnew.html">What’s new in Conan 2.0</a></li>
<li class="toctree-l1"><a class="reference internal" href="whatsnew.html">What’s new in Conan 2</a></li>
<li class="toctree-l1"><a class="reference internal" href="installation.html">Install</a></li>
<li class="toctree-l1"><a class="reference internal" href="tutorial.html">Tutorial</a></li>
<li class="toctree-l1"><a class="reference internal" href="devops.html">Devops guide</a></li>
Expand Down Expand Up @@ -119,7 +119,7 @@ <h1>Page Not Found<a class="headerlink" href="#page-not-found" title="Link to th

<div role="contentinfo">
<p>&#169; Copyright 2016-2024, JFrog.
<span class="lastupdated">Last updated on Feb 15, 2024.
<span class="lastupdated">Last updated on Feb 20, 2024.
</span></p>
</div>

Expand Down
4 changes: 2 additions & 2 deletions 2.1/Page Not Found.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</div><div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="Navigation menu">
<ul>
<li class="toctree-l1"><a class="reference internal" href="/en/latest/introduction.html">Introduction</a></li>
<li class="toctree-l1"><a class="reference internal" href="/en/latest/whatsnew.html">What’s new in Conan 2.0</a></li>
<li class="toctree-l1"><a class="reference internal" href="/en/latest/whatsnew.html">What’s new in Conan 2</a></li>
<li class="toctree-l1"><a class="reference internal" href="/en/latest/installation.html">Install</a></li>
<li class="toctree-l1"><a class="reference internal" href="/en/latest/tutorial.html">Tutorial</a></li>
<li class="toctree-l1"><a class="reference internal" href="/en/latest/devops.html">Devops guide</a></li>
Expand Down Expand Up @@ -112,7 +112,7 @@ <h1>Page not found</h1>

<div role="contentinfo">
<p>&#169; Copyright 2016-2024, JFrog.
<span class="lastupdated">Last updated on Feb 15, 2024.
<span class="lastupdated">Last updated on Feb 20, 2024.
</span></p>
</div>

Expand Down
2 changes: 1 addition & 1 deletion 2.1/_sources/changelog.rst.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Changelog
=========

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

2.1.0 (15-Feb-2024)
-------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Declaring the layout when the Conanfile is inside a subfolder
-------------------------------------------------------------

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ necessary to define the components layout correctly in the ``layout()`` method.
Let's see it in a real example.

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Declaring the layout when we have multiple subprojects
------------------------------------------------------

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Declaring the layout when creating packages for third-party libraries
---------------------------------------------------------------------

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ component.
}

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Customize your settings: create your settings_user.yml
======================================================

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Building from source
The recommended approach for debugging dependencies is building them from source in the local cache. This approach should work out of the box for most recipes, including ConanCenter recipes.

We can reuse the code from the very first example in the tutorial for this use case. Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Custom command: Clean old recipe and package revisions


Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Copy sources from all your dependencies


Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Will generate a "conflict", showing an error like ``Duplicated requirement``.
However there are some exceptional situations that we could need to depend on the same ``tool_requires`` version,
but using different binaries of that ``tool_requires``. This can be achieved by passing different ``options`` to those
``tool_requires``. Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ on GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ on GitHub:

.. code-block:: shell
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ when it is obvious that it is not possible to use 2 versions of the same compile

However there are some exceptional situations when something like that is desired. Let's recreate the potential
scenario. Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ on GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ on GitHub:

.. code-block:: shell
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This is the way to proceed with any other library used in both contexts. Nonethe
how the example looks like.

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ on GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ on GitHub:

.. code-block:: shell
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ We'll use `Autotools <https://www.gnu.org/software/automake/manual/html_node/Aut
on Linux and Mac before going forward with this example.

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ on GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ on GitHub:

.. code-block:: shell
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ generated ones.
.. include:: ../../../../tutorial/cmake_presets_note.inc

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
CMakeToolchain: Inject arbitrary CMake variables into dependencies
==================================================================

You can find the sources to recreate this project in the `examples2.0 repository
You can find the sources to recreate this project in the `examples2 repository
<https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ creating a package for a third party library. A patch might be required in the b
source code of the library if you want, for example, to apply a security patch.

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ on GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ on GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ We'll use Bazel as the build system and helper tool in this case, so you should
before going forward with this example. See `how to install Bazel <https://bazel.build/install>`_.

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ We'll use Meson as build system and pkg-config as helper tool in this case, so y
before going forward with this example.

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ There are 2 main strategies to handle source code in recipes:
In the **scm capture** method, instead of capturing a copy of the code itself, the "coordinates" for that code are captured instead, in the ``Git`` case, the ``url`` of the repository and the ``commit``. If the recipe needs to build from source, it will use that information to get a clone, and if the user who tries that is not authorized, the process will fail. They will still be able to use the pre-compiled binaries that we distribute, but not build from source or have access to the code.

Let's see how it works with an example. Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ on GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ on GitHub:

.. code-block:: bash
Expand Down
4 changes: 2 additions & 2 deletions 2.1/_sources/index.rst.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Conan 2.0 - C and C++ Package Manager Documentation
===================================================
Conan 2 - C and C++ Package Manager Documentation
=================================================

Welcome! This is the user documentation for Conan, an open source, decentralized C/C++ package manager that works in all platforms and with all build systems and compilers. Other relevant resources:

Expand Down
2 changes: 1 addition & 1 deletion 2.1/_sources/installation.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ There are different ways to install Conan:
Install with pip (recommended)
------------------------------

To install latest Conan 2.0 pre-release version using ``pip``, you need a Python >= 3.6
To install latest Conan 2 version using ``pip``, you need a Python >= 3.6
distribution installed on your machine. Modern Python distros come with pip pre-installed.
However, if necessary you can install pip by following the instructions in `pip docs`_.

Expand Down
2 changes: 1 addition & 1 deletion 2.1/_sources/integrations/clion.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Several options are marked as default. Let's review them:

- There's also a checkbox allowing Conan to modify the default CLion settings and run
CMake sequentially instead of in parallel. This is necessary because the Conan cache
isn't concurrent yet in Conan 2.0.
isn't concurrent yet in Conan 2.

If you're using the Conan plugin, you typically wouldn't uncheck these options. After
setting your preferences, click the OK button to finalize the configuration.
Expand Down
4 changes: 2 additions & 2 deletions 2.1/_sources/reference/conanfile/attributes.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,12 @@ alias

.. warning::

While aliases can technically still be used in Conan 2.0, their usage is not recommended
While aliases can technically still be used in Conan 2, their usage is not recommended
and they may be fully removed in future releases. Users are encouraged to adapt to the
:ref:`newer versioning features<devops_versioning>` for a more standardized and efficient
package management experience.

In Conan 2.0, the `alias` attribute remains a part of the recipe, allowing users to define
In Conan 2, the `alias` attribute remains a part of the recipe, allowing users to define
an alias for a package version. Normally, you would create one using the ``conan new``
command with the ``alias`` template and the exporting the recipe with conan export:

Expand Down
2 changes: 1 addition & 1 deletion 2.1/_sources/reference/tools/cmake/cmakedeps.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Generated files
- **Other necessary *.cmake**: files like version, flags and directory data or configuration.


Note that it will also generate a **conandeps_legacy.cmake** file. This is a file that provides a behavior similar to the Conan 1 ``cmake`` generator, allowing to include this file with ``include(${CMAKE_BINARY_DIR}/generators/conandeps_legacy.cmake)``, and providing a single CMake ``CONANDEPS_LEGACY`` variable that allows to link with all the direct and transitive dependencies without explicitly enumerating them like: ``target_link_libraries(app ${CONANDEPS_LEGACY})``. This is a convenience provided for Conan 1.X users to upgrade to Conan 2.0 without changing their overall developer flow, but it is not recommended otherwise, and using the CMake canonical flow of explicitly using ``find_package()`` and ``target_link_libraries(... pkg1::pkg1 pkg2::pkg2)`` with targets is the correct approach.
Note that it will also generate a **conandeps_legacy.cmake** file. This is a file that provides a behavior similar to the Conan 1 ``cmake`` generator, allowing to include this file with ``include(${CMAKE_BINARY_DIR}/generators/conandeps_legacy.cmake)``, and providing a single CMake ``CONANDEPS_LEGACY`` variable that allows to link with all the direct and transitive dependencies without explicitly enumerating them like: ``target_link_libraries(app ${CONANDEPS_LEGACY})``. This is a convenience provided for Conan 1.X users to upgrade to Conan 2 without changing their overall developer flow, but it is not recommended otherwise, and using the CMake canonical flow of explicitly using ``find_package()`` and ``target_link_libraries(... pkg1::pkg1 pkg2::pkg2)`` with targets is the correct approach.


Customization
Expand Down
2 changes: 1 addition & 1 deletion 2.1/_sources/reference/tools/files/packaging.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ conan.tools.files AutoPackager

.. warning::

This feature is **deprecated**, and will be removed in future Conan 2.0.X version.
This feature is **deprecated**, and will be removed in future Conan 2.X version.
It was used to automatically deduce what to ``copy()`` in the ``package()`` method.

The recommended approach is to use explicit ``copy()`` calls in the ``package()`` method, as explained
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ section<consuming_packages_read_more>`.


Please, first clone the sources to recreate this project, you can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ How to cross-compile your applications using Conan: host and build contexts
===========================================================================

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ on GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ on GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Building for multiple configurations: Release, Debug, Static and Shared
=======================================================================

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Version ranges

A ``requires`` can express a dependency to a certain range of versions for a given package, with the syntax ``pkgname/[version-range-expression]``.
Let's see an example, please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ depending on other options or setting options for your requirements. Let's see a
on how to migrate to a *conanfile.py* and use some of those features.

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ requirement named ``tool_requires``. Let's see an example of how to add a
``tool_requires`` to our project and use a different CMake version to build it.

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ in GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ in GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ will add some fancy colour output to our "Hello World" library using the `fmt
<https://conan.io/center/fmt>`__ library.

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ on GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ on GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ method and explain how you can use it to do things like:
* Select the build system you want to use conditionally

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ on GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ on GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Conan package. We will introduce briefly how Conan models binary compatibility a
that relates to options and settings.

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ on GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ on GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ Besides what we explained above about the information you can set in the
- Define components for Conan packages that provide multiple libraries

Let's see some of those in action. First, clone the project sources if you haven't done so yet. You can
find them in the `examples2.0 repository <https://github.com/conan-io/examples2>`_ on
find them in the `examples2 repository <https://github.com/conan-io/examples2>`_ on
GitHub:

.. code-block:: bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Conanfile. In this section, we will modify the recipe we created previously by a
* Retrieve the sources from a branch of a *git* repository.

Please, first clone the sources to recreate this project. You can find them in the
`examples2.0 repository <https://github.com/conan-io/examples2>`_ on GitHub:
`examples2 repository <https://github.com/conan-io/examples2>`_ on GitHub:

.. code-block:: bash
Expand Down
Loading

0 comments on commit 33d581d

Please sign in to comment.