Automatic deploy (build number 71)

conan-io · May 9, 2024 · 23de15f · 23de15f
1 parent 6adf5a4
commit 23de15f
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 10 deletions.
diff --git a/2.3/_sources/examples/cross_build/toolchain_packages.rst.txt b/2.3/_sources/examples/cross_build/toolchain_packages.rst.txt
@@ -31,6 +31,8 @@ Please, first clone the sources to recreate this project. You can find them in t
 Here, you will find a Conan recipe (and the *test_package*) to package an ARM toolchain
 for cross-compiling to Linux ARM for both 32 and 64 bits. To simplify a bit, we are
 assuming that we can just cross-build from Linux x86_64 to Linux ARM, both 32 and 64 bits.
+If you're looking for another example, you can explore an additional MacOs to Linux cross-build example right
+`here <https://github.com/conan-io/examples2/tree/main/examples/cross_build/toolchain_packages/toolchain_macos_linux_cross>`_ .
 
 .. code-block:: bash
 
@@ -485,3 +487,4 @@ architecture of the resulting executable, confirming its alignment with the targ
 
     - :ref:`More info on settings_target<binary_model_extending_cross_build_target_settings>`
     - :ref:`Cross-compile your applications using Conan<consuming_packages_cross_building_with_conan>`
+    - `Another example of cross-compilation from Macos to Linux <https://github.com/conan-io/examples2/tree/main/examples/cross_build/toolchain_packages/toolchain_macos_linux_cross>`_
diff --git a/2.3/_sources/reference/runners/docker.rst.txt b/2.3/_sources/reference/runners/docker.rst.txt
@@ -60,7 +60,11 @@ If you need more control over the build and execution of the container, you can
 How to run a `conan create` in a runner
 ---------------------------------------
 
+..  note::
+
+    The docker runner feature is only supported by ``conan create`` command. The ``conan install --build`` command is not supported.
+
 In the following links you can find some examples about how to use a conan docker runner:
 
 - :ref:`Creating a Conan package using a Docker runner<examples_runners_docker_basic>`
-- :ref:`Using a docker runner configfile to parameterize the Dockerfile base image<examples_runners_docker_configfile_build_args>`
+- :ref:`Using a docker runner configfile to parameterize the Dockerfile base image<examples_runners_docker_configfile_build_args>`
diff --git a/2.3/conan.pdf b/2.3/conan.pdf
diff --git a/2.3/examples/cross_build/toolchain_packages.html b/2.3/examples/cross_build/toolchain_packages.html
@@ -153,7 +153,9 @@
 </div>
 <p>Here, you will find a Conan recipe (and the <em>test_package</em>) to package an ARM toolchain
 for cross-compiling to Linux ARM for both 32 and 64 bits. To simplify a bit, we are
-assuming that we can just cross-build from Linux x86_64 to Linux ARM, both 32 and 64 bits.</p>
+assuming that we can just cross-build from Linux x86_64 to Linux ARM, both 32 and 64 bits.
+If you’re looking for another example, you can explore an additional MacOs to Linux cross-build example right
+<a class="reference external" href="https://github.com/conan-io/examples2/tree/main/examples/cross_build/toolchain_packages/toolchain_macos_linux_cross">here</a> .</p>
 <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>.
 ├──<span class="w"> </span>conanfile.py
 └──<span class="w"> </span>test_package
@@ -562,6 +564,7 @@ <h2>Testing the Conan toolchain package<a class="headerlink" href="#testing-the-
 <ul class="simple">
 <li><p><a class="reference internal" href="../../reference/binary_model/extending.html#binary-model-extending-cross-build-target-settings"><span class="std std-ref">More info on settings_target</span></a></p></li>
 <li><p><a class="reference internal" href="../../tutorial/consuming_packages/cross_building_with_conan.html#consuming-packages-cross-building-with-conan"><span class="std std-ref">Cross-compile your applications using Conan</span></a></p></li>
+<li><p><a class="reference external" href="https://github.com/conan-io/examples2/tree/main/examples/cross_build/toolchain_packages/toolchain_macos_linux_cross">Another example of cross-compilation from Macos to Linux</a></p></li>
 </ul>
 </div>
 </section>

diff --git a/2.3/reference/commands/config.html b/2.3/reference/commands/config.html
@@ -416,7 +416,7 @@ <h2>conan config list<a class="headerlink" href="#conan-config-list" title="Link
 tools.build:cflags: List of extra C flags used by different toolchains like CMakeToolchain, AutotoolsToolchain and MesonToolchain
 tools.build:compiler_executables: Defines a Python dict-like with the compilers path to be used. Allowed keys {&#39;c&#39;, &#39;cpp&#39;, &#39;cuda&#39;, &#39;objc&#39;, &#39;objcxx&#39;, &#39;rc&#39;, &#39;fortran&#39;, &#39;asm&#39;, &#39;hip&#39;, &#39;ispc&#39;, &#39;ld&#39;, &#39;ar&#39;}
 tools.build:cxxflags: List of extra CXX flags used by different toolchains like CMakeToolchain, AutotoolsToolchain and MesonToolchain
-tools.build:defines: List of extra definition flags used by different toolchains like CMakeToolchain and AutotoolsToolchain
+tools.build:defines: List of extra definition flags used by different toolchains like CMakeToolchain, AutotoolsToolchain and MesonToolchain
 tools.build:download_source: Force download of sources for every package
 tools.build:exelinkflags: List of extra flags used by CMakeToolchain for CMAKE_EXE_LINKER_FLAGS_INIT variable
 tools.build:jobs: Default compile jobs number -jX Ninja, Make, /MP VS (default: max CPUs)

diff --git a/2.3/reference/config_files/global_conf.html b/2.3/reference/config_files/global_conf.html
@@ -207,7 +207,7 @@ <h2>Introduction to configuration<a class="headerlink" href="#introduction-to-co
 tools.build:cflags: List of extra C flags used by different toolchains like CMakeToolchain, AutotoolsToolchain and MesonToolchain
 tools.build:compiler_executables: Defines a Python dict-like with the compilers path to be used. Allowed keys {&#39;c&#39;, &#39;cpp&#39;, &#39;cuda&#39;, &#39;objc&#39;, &#39;objcxx&#39;, &#39;rc&#39;, &#39;fortran&#39;, &#39;asm&#39;, &#39;hip&#39;, &#39;ispc&#39;, &#39;ld&#39;, &#39;ar&#39;}
 tools.build:cxxflags: List of extra CXX flags used by different toolchains like CMakeToolchain, AutotoolsToolchain and MesonToolchain
-tools.build:defines: List of extra definition flags used by different toolchains like CMakeToolchain and AutotoolsToolchain
+tools.build:defines: List of extra definition flags used by different toolchains like CMakeToolchain, AutotoolsToolchain and MesonToolchain
 tools.build:download_source: Force download of sources for every package
 tools.build:exelinkflags: List of extra flags used by CMakeToolchain for CMAKE_EXE_LINKER_FLAGS_INIT variable
 tools.build:jobs: Default compile jobs number -jX Ninja, Make, /MP VS (default: max CPUs)

diff --git a/2.3/reference/runners/docker.html b/2.3/reference/runners/docker.html
@@ -191,6 +191,10 @@ <h2>Extra configuration<a class="headerlink" href="#extra-configuration" title="
 </section>
 <section id="how-to-run-a-conan-create-in-a-runner">
 <h2>How to run a <cite>conan create</cite> in a runner<a class="headerlink" href="#how-to-run-a-conan-create-in-a-runner" title="Link to this heading">¶</a></h2>
+<div class="admonition note">
+<p class="admonition-title">Note</p>
+<p>The docker runner feature is only supported by <code class="docutils literal notranslate"><span class="pre">conan</span> <span class="pre">create</span></code> command. The <code class="docutils literal notranslate"><span class="pre">conan</span> <span class="pre">install</span> <span class="pre">--build</span></code> command is not supported.</p>
+</div>
 <p>In the following links you can find some examples about how to use a conan docker runner:</p>
 <ul class="simple">
 <li><p><a class="reference internal" href="../../examples/runners/docker/basic.html#examples-runners-docker-basic"><span class="std std-ref">Creating a Conan package using a Docker runner</span></a></p></li>

diff --git a/2.3/searchindex.js b/2.3/searchindex.js
diff --git a/2/_sources/examples/cross_build/toolchain_packages.rst.txt b/2/_sources/examples/cross_build/toolchain_packages.rst.txt
@@ -31,6 +31,8 @@ Please, first clone the sources to recreate this project. You can find them in t
 Here, you will find a Conan recipe (and the *test_package*) to package an ARM toolchain
 for cross-compiling to Linux ARM for both 32 and 64 bits. To simplify a bit, we are
 assuming that we can just cross-build from Linux x86_64 to Linux ARM, both 32 and 64 bits.
+If you're looking for another example, you can explore an additional MacOs to Linux cross-build example right
+`here <https://github.com/conan-io/examples2/tree/main/examples/cross_build/toolchain_packages/toolchain_macos_linux_cross>`_ .
 
 .. code-block:: bash
 
@@ -485,3 +487,4 @@ architecture of the resulting executable, confirming its alignment with the targ
 
     - :ref:`More info on settings_target<binary_model_extending_cross_build_target_settings>`
     - :ref:`Cross-compile your applications using Conan<consuming_packages_cross_building_with_conan>`
+    - `Another example of cross-compilation from Macos to Linux <https://github.com/conan-io/examples2/tree/main/examples/cross_build/toolchain_packages/toolchain_macos_linux_cross>`_
diff --git a/2/_sources/reference/runners/docker.rst.txt b/2/_sources/reference/runners/docker.rst.txt
@@ -60,7 +60,11 @@ If you need more control over the build and execution of the container, you can
 How to run a `conan create` in a runner
 ---------------------------------------
 
+..  note::
+
+    The docker runner feature is only supported by ``conan create`` command. The ``conan install --build`` command is not supported.
+
 In the following links you can find some examples about how to use a conan docker runner:
 
 - :ref:`Creating a Conan package using a Docker runner<examples_runners_docker_basic>`
-- :ref:`Using a docker runner configfile to parameterize the Dockerfile base image<examples_runners_docker_configfile_build_args>`
+- :ref:`Using a docker runner configfile to parameterize the Dockerfile base image<examples_runners_docker_configfile_build_args>`
diff --git a/2/conan.pdf b/2/conan.pdf
diff --git a/2/examples/cross_build/toolchain_packages.html b/2/examples/cross_build/toolchain_packages.html
@@ -153,7 +153,9 @@
 </div>
 <p>Here, you will find a Conan recipe (and the <em>test_package</em>) to package an ARM toolchain
 for cross-compiling to Linux ARM for both 32 and 64 bits. To simplify a bit, we are
-assuming that we can just cross-build from Linux x86_64 to Linux ARM, both 32 and 64 bits.</p>
+assuming that we can just cross-build from Linux x86_64 to Linux ARM, both 32 and 64 bits.
+If you’re looking for another example, you can explore an additional MacOs to Linux cross-build example right
+<a class="reference external" href="https://github.com/conan-io/examples2/tree/main/examples/cross_build/toolchain_packages/toolchain_macos_linux_cross">here</a> .</p>
 <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>.
 ├──<span class="w"> </span>conanfile.py
 └──<span class="w"> </span>test_package
@@ -562,6 +564,7 @@ <h2>Testing the Conan toolchain package<a class="headerlink" href="#testing-the-
 <ul class="simple">
 <li><p><a class="reference internal" href="../../reference/binary_model/extending.html#binary-model-extending-cross-build-target-settings"><span class="std std-ref">More info on settings_target</span></a></p></li>
 <li><p><a class="reference internal" href="../../tutorial/consuming_packages/cross_building_with_conan.html#consuming-packages-cross-building-with-conan"><span class="std std-ref">Cross-compile your applications using Conan</span></a></p></li>
+<li><p><a class="reference external" href="https://github.com/conan-io/examples2/tree/main/examples/cross_build/toolchain_packages/toolchain_macos_linux_cross">Another example of cross-compilation from Macos to Linux</a></p></li>
 </ul>
 </div>
 </section>

diff --git a/2/reference/commands/config.html b/2/reference/commands/config.html
@@ -416,7 +416,7 @@ <h2>conan config list<a class="headerlink" href="#conan-config-list" title="Link
 tools.build:cflags: List of extra C flags used by different toolchains like CMakeToolchain, AutotoolsToolchain and MesonToolchain
 tools.build:compiler_executables: Defines a Python dict-like with the compilers path to be used. Allowed keys {&#39;c&#39;, &#39;cpp&#39;, &#39;cuda&#39;, &#39;objc&#39;, &#39;objcxx&#39;, &#39;rc&#39;, &#39;fortran&#39;, &#39;asm&#39;, &#39;hip&#39;, &#39;ispc&#39;, &#39;ld&#39;, &#39;ar&#39;}
 tools.build:cxxflags: List of extra CXX flags used by different toolchains like CMakeToolchain, AutotoolsToolchain and MesonToolchain
-tools.build:defines: List of extra definition flags used by different toolchains like CMakeToolchain and AutotoolsToolchain
+tools.build:defines: List of extra definition flags used by different toolchains like CMakeToolchain, AutotoolsToolchain and MesonToolchain
 tools.build:download_source: Force download of sources for every package
 tools.build:exelinkflags: List of extra flags used by CMakeToolchain for CMAKE_EXE_LINKER_FLAGS_INIT variable
 tools.build:jobs: Default compile jobs number -jX Ninja, Make, /MP VS (default: max CPUs)

diff --git a/2/reference/config_files/global_conf.html b/2/reference/config_files/global_conf.html
@@ -207,7 +207,7 @@ <h2>Introduction to configuration<a class="headerlink" href="#introduction-to-co
 tools.build:cflags: List of extra C flags used by different toolchains like CMakeToolchain, AutotoolsToolchain and MesonToolchain
 tools.build:compiler_executables: Defines a Python dict-like with the compilers path to be used. Allowed keys {&#39;c&#39;, &#39;cpp&#39;, &#39;cuda&#39;, &#39;objc&#39;, &#39;objcxx&#39;, &#39;rc&#39;, &#39;fortran&#39;, &#39;asm&#39;, &#39;hip&#39;, &#39;ispc&#39;, &#39;ld&#39;, &#39;ar&#39;}
 tools.build:cxxflags: List of extra CXX flags used by different toolchains like CMakeToolchain, AutotoolsToolchain and MesonToolchain
-tools.build:defines: List of extra definition flags used by different toolchains like CMakeToolchain and AutotoolsToolchain
+tools.build:defines: List of extra definition flags used by different toolchains like CMakeToolchain, AutotoolsToolchain and MesonToolchain
 tools.build:download_source: Force download of sources for every package
 tools.build:exelinkflags: List of extra flags used by CMakeToolchain for CMAKE_EXE_LINKER_FLAGS_INIT variable
 tools.build:jobs: Default compile jobs number -jX Ninja, Make, /MP VS (default: max CPUs)

diff --git a/2/reference/runners/docker.html b/2/reference/runners/docker.html
@@ -191,6 +191,10 @@ <h2>Extra configuration<a class="headerlink" href="#extra-configuration" title="
 </section>
 <section id="how-to-run-a-conan-create-in-a-runner">
 <h2>How to run a <cite>conan create</cite> in a runner<a class="headerlink" href="#how-to-run-a-conan-create-in-a-runner" title="Link to this heading">¶</a></h2>
+<div class="admonition note">
+<p class="admonition-title">Note</p>
+<p>The docker runner feature is only supported by <code class="docutils literal notranslate"><span class="pre">conan</span> <span class="pre">create</span></code> command. The <code class="docutils literal notranslate"><span class="pre">conan</span> <span class="pre">install</span> <span class="pre">--build</span></code> command is not supported.</p>
+</div>
 <p>In the following links you can find some examples about how to use a conan docker runner:</p>
 <ul class="simple">
 <li><p><a class="reference internal" href="../../examples/runners/docker/basic.html#examples-runners-docker-basic"><span class="std std-ref">Creating a Conan package using a Docker runner</span></a></p></li>

diff --git a/2/searchindex.js b/2/searchindex.js