Skip to content

Commit

Permalink
Automatic deploy (build number 29)
Browse files Browse the repository at this point in the history
  • Loading branch information
ConanCI bot committed Apr 4, 2024
1 parent 898f28c commit 6fa5188
Show file tree
Hide file tree
Showing 18,488 changed files with 422,004 additions and 15,280 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion 1/.buildinfo
View file
@@ -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: 5294bde38cb26e99d37757b1b9d34e18
config: 919dc1ec51255de652f7e021a2312b96
tags: 645f666f9bcd5a90fca523b33c5a78b7
18 changes: 12 additions & 6 deletions 1/404.html
View file
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" /><meta name="viewport" content="width=device-width, initial-scale=1" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Page Not Found &mdash; conan 1.63.0 documentation</title>
<title>Page Not Found &mdash; conan 1.64.0 documentation</title>
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=b76e3c8a" />
<link rel="stylesheet" type="text/css" href="_static/css/theme.css?v=19f00094" />
<link rel="stylesheet" type="text/css" href="_static/css/conan.css?v=2e89a5c2" />
Expand All @@ -18,7 +18,7 @@

<script src="_static/jquery.js?v=5d32c60e"></script>
<script src="_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
<script src="_static/documentation_options.js?v=f309db74"></script>
<script src="_static/documentation_options.js?v=7d522aba"></script>
<script src="_static/doctools.js?v=888ff710"></script>
<script src="_static/sphinx_highlight.js?v=dc90522c"></script>
<script src="_static/js/theme.js"></script>
Expand Down Expand Up @@ -53,7 +53,7 @@
<img src="_static/conan-logo.png" class="logo" alt="Logo"/>
</a>
<div class="version">
1.63
1.64
</div>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
Expand Down Expand Up @@ -135,7 +135,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 Mar 22, 2024.
<span class="lastupdated">Last updated on Apr 04, 2024.
</span></p>
</div>

Expand All @@ -149,7 +149,7 @@ <h1>Page Not Found<a class="headerlink" href="#page-not-found" title="Link to th

<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="Versions">
<span class="rst-current-version" data-toggle="rst-current-version">
Version: 1.63
Version: 1.64
<span class="fa fa-caret-down"></span>
</span>
<div class="rst-other-versions">
Expand Down Expand Up @@ -290,6 +290,8 @@ <h1>Page Not Found<a class="headerlink" href="#page-not-found" title="Link to th








Expand All @@ -309,6 +311,10 @@ <h1>Page Not Found<a class="headerlink" href="#page-not-found" title="Link to th



<dd><a href="/en/1.64/index.html">1.64</a></dd>



<dd><a href="/en/1.63/index.html">1.63</a></dd>


Expand Down Expand Up @@ -558,7 +564,7 @@ <h1>Page Not Found<a class="headerlink" href="#page-not-found" title="Link to th
<dl>
<dt>Downloads</dt>

<dd><a href="/en/1.63/conan.pdf">PDF</a></dd>
<dd><a href="/en/1.64/conan.pdf">PDF</a></dd>

</dl>
</div>
Expand Down
18 changes: 12 additions & 6 deletions 1/Page Not Found.html
View file
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Page not found &mdash; conan 1.63.0 documentation</title>
<title>Page not found &mdash; conan 1.64.0 documentation</title>
<link rel="stylesheet" type="text/css" href="/en/latest/_static/pygments.css?v=b76e3c8a" />
<link rel="stylesheet" type="text/css" href="/en/latest/_static/css/theme.css?v=19f00094" />
<link rel="stylesheet" type="text/css" href="/en/latest/_static/css/conan.css?v=2e89a5c2" />
Expand All @@ -17,7 +17,7 @@

<script src="/en/latest/_static/jquery.js?v=5d32c60e"></script>
<script src="/en/latest/_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
<script src="/en/latest/_static/documentation_options.js?v=f309db74"></script>
<script src="/en/latest/_static/documentation_options.js?v=7d522aba"></script>
<script src="/en/latest/_static/doctools.js?v=888ff710"></script>
<script src="/en/latest/_static/sphinx_highlight.js?v=dc90522c"></script>
<script src="/en/latest/_static/js/theme.js"></script>
Expand Down Expand Up @@ -52,7 +52,7 @@
<img src="/en/latest/_static/conan-logo.png" class="logo" alt="Logo"/>
</a>
<div class="version">
1.63
1.64
</div>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="/en/latest/search.html" method="get">
Expand Down Expand Up @@ -128,7 +128,7 @@ <h1>Page not found</h1>

<div role="contentinfo">
<p>&#169; Copyright 2016-2024, JFrog.
<span class="lastupdated">Last updated on Mar 22, 2024.
<span class="lastupdated">Last updated on Apr 04, 2024.
</span></p>
</div>

Expand All @@ -142,7 +142,7 @@ <h1>Page not found</h1>

<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="Versions">
<span class="rst-current-version" data-toggle="rst-current-version">
Version: 1.63
Version: 1.64
<span class="fa fa-caret-down"></span>
</span>
<div class="rst-other-versions">
Expand Down Expand Up @@ -283,6 +283,8 @@ <h1>Page not found</h1>








Expand All @@ -302,6 +304,10 @@ <h1>Page not found</h1>



<dd><a href="/en/1.64/index.html">1.64</a></dd>



<dd><a href="/en/1.63/index.html">1.63</a></dd>


Expand Down Expand Up @@ -551,7 +557,7 @@ <h1>Page not found</h1>
<dl>
<dt>Downloads</dt>

<dd><a href="/en/1.63/conan.pdf">PDF</a></dd>
<dd><a href="/en/1.64/conan.pdf">PDF</a></dd>

</dl>
</div>
Expand Down
11 changes: 10 additions & 1 deletion 1/_sources/changelog.rst.txt
View file
Expand Up @@ -18,9 +18,18 @@ Check https://github.com/conan-io/conan for issues and more details about develo

.. important::

Conan 1.63 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please submit
Conan 1.64 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.64.0 (04-Apr-2024)
--------------------

- Feature: Add ``--output-folder`` to ``export-pkg`` command to be used when ``layout()`` is declared. `#15741 <https://github.com/conan-io/conan/pull/15741>`_ . Docs `here <https://github.com/conan-io/docs/pull/3661>`__
- Feature: Promote cppstd_flag in the new conan.tools.build module. `#15731 <https://github.com/conan-io/conan/pull/15731>`_ . Docs `here <https://github.com/conan-io/docs/pull/3602>`__
- Feature: `conan.tools.meson` helper requires meson >= 0.57.0. `#15706 <https://github.com/conan-io/conan/pull/15706>`_ . Docs `here <https://github.com/conan-io/docs/pull/3663>`__
- Fix: Fix flags passed by AutotoolsToolchain when cross compiling from macOS to a non-Apple OS. Backported from Conan 2. `#15948 <https://github.com/conan-io/conan/pull/15948>`_
- Fix: Avoiding reconfigure process. Using `--destdir` param instead. Deprecated `reconfigure` param in `Meson.configure() function`. `#15706 <https://github.com/conan-io/conan/pull/15706>`_ . Docs `here <https://github.com/conan-io/docs/pull/3663>`__

1.63.0 (12-Feb-2024)
--------------------

Expand Down
20 changes: 14 additions & 6 deletions 1/_sources/reference/commands/creator/export-pkg.rst.txt
View file
Expand Up @@ -7,14 +7,16 @@ conan export-pkg
.. code-block:: bash
$ conan export-pkg [-h] [-bf BUILD_FOLDER] [-f] [-if INSTALL_FOLDER]
[-pf PACKAGE_FOLDER] [-sf SOURCE_FOLDER] [-j JSON]
[-l LOCKFILE] [--lockfile-out LOCKFILE_OUT]
[--ignore-dirty] [-e ENV_HOST] [-e:b ENV_BUILD]
[-e:h ENV_HOST] [-o OPTIONS_HOST] [-o:b OPTIONS_BUILD]
[-pf PACKAGE_FOLDER] [-of OUTPUT_FOLDER]
[-sf SOURCE_FOLDER] [-j JSON] [-l LOCKFILE]
[--lockfile-out LOCKFILE_OUT] [--ignore-dirty]
[-e ENV_HOST] [-e:b ENV_BUILD] [-e:h ENV_HOST]
[-o OPTIONS_HOST] [-o:b OPTIONS_BUILD]
[-o:h OPTIONS_HOST] [-pr PROFILE_HOST]
[-pr:b PROFILE_BUILD] [-pr:h PROFILE_HOST]
[-s SETTINGS_HOST] [-s:b SETTINGS_BUILD] [-s:h SETTINGS_HOST]
[-c CONF_HOST] [-c:b CONF_BUILD] [-c:h CONF_HOST]
[-s SETTINGS_HOST] [-s:b SETTINGS_BUILD]
[-s:h SETTINGS_HOST] [-c CONF_HOST] [-c:b CONF_BUILD]
[-c:h CONF_HOST]
path [reference]
Exports a recipe, then creates a package from local source and build folders.
Expand Down Expand Up @@ -49,6 +51,8 @@ the binary package.
folder containing a locally created package. If a
value is given, it won't call the recipe 'package()'
method, and will run a copy of the provided folder.
-of OUTPUT_FOLDER, --output-folder OUTPUT_FOLDER
To be used with 'layout()' recipes, useless otherwise
-sf SOURCE_FOLDER, --source-folder SOURCE_FOLDER
Directory containing the sources. Defaulted to the
conanfile's directory. A relative path to the current
Expand Down Expand Up @@ -132,6 +136,10 @@ different sources for the files:
declared, but the path is incorrect, :command:`export-pkg` will raise an exception.


Also, the ``--output-folder`` argument can be defined to be aligned with the ``conan install --output-folder``
when the ``layout()`` method is used.


There are different scenarios where this command could look like useful:

- You are :ref:`working locally on a package<package_dev_flow>` and you want to
Expand Down
24 changes: 24 additions & 0 deletions 1/_sources/reference/conanfile/tools/build.rst.txt
View file
Expand Up @@ -154,3 +154,27 @@ the behavior is as described in cgroup v1.
Parameters:

- **conanfile**: The current recipe object. Always use ``self``.


conan.tools.build.cppstd_flag
-----------------------------

Available since: `1.64.0 <https://github.com/conan-io/conan/releases/tag/1.64.0>`_

.. code-block:: python
def cppstd_flag(conanfile):
Returns flags specific to the C++ standard based on the ``conanfile.settings.compiler``,
``conanfile.settings.compiler.version`` and ``conanfile.settings.compiler.cppstd``.

It also considers when using GNU extension in ``settings.compiler.cppstd``, reflecting it in the
compiler flag. Currently, it supports GCC, Clang, AppleClang, MSVC, Intel, MCST-LCC.

In case there is no ``settings.compiler`` or ``settings.cppstd`` in the profile, the result will
be an **empty string**.

Parameters:

- **conanfile**: The current recipe object. Always use ``self``.
6 changes: 4 additions & 2 deletions 1/_sources/reference/conanfile/tools/meson/meson.rst.txt
View file
Expand Up @@ -50,7 +50,7 @@ configuration to add your machine files at the end of the command using the corr
See `this Meson reference <https://mesonbuild.com/Machine-files.html#loading-multiple-machine-files>`_ for more information.

Parameters:
- **reconfigure** (Optional, Defaulted to ``False``): Adds the ``--reconfigure`` parameter to the ``meson setup`` command if ``True``.
- **reconfigure** (**DEPRECATED**)(Optional, Defaulted to ``False``): Adds the ``--reconfigure`` parameter to the ``meson setup`` command if ``True``.


build()
Expand All @@ -72,7 +72,9 @@ install()
def install(self):
Installs development files (headers, libraries, etc.). Equivalent to run :command:`meson install -C .` in the build folder.
Installs development files (headers, libraries, etc.). Equivalent to run :command:`meson install -C . --destdir [CONAN_PACKAGE_FOLDER]` in the build folder.

Using *--destdir* Meson param since Conan `1.64.0 <https://github.com/conan-io/conan/releases/tag/1.64.0>`__

test()
++++++
Expand Down
2 changes: 1 addition & 1 deletion 1/_sources/reference/conanfile/tools/meson/mesontoolchain.rst.txt
View file
Expand Up @@ -11,7 +11,7 @@ MesonToolchain

.. important::

This class will generate files that are only compatible with Meson versions >= 0.55.0
This class will generate files that are only compatible with Meson versions >= 0.57.0


Available since: `1.33.0 <https://github.com/conan-io/conan/releases/tag/1.33.0>`_
Expand Down
2 changes: 1 addition & 1 deletion 1/_static/documentation_options.js
View file
@@ -1,5 +1,5 @@
const DOCUMENTATION_OPTIONS = {
VERSION: '1.63.0',
VERSION: '1.64.0',
LANGUAGE: 'en',
COLLAPSE_INDEX: false,
BUILDER: 'html',
Expand Down

0 comments on commit 6fa5188

Please sign in to comment.