Automatic deploy (build number 502)

conan-io · Jun 8, 2023 · 7c8b905 · 7c8b905
1 parent 9b01dd0
commit 7c8b905
Show file tree

Hide file tree

Showing 489 changed files with 2,231 additions and 545 deletions.
diff --git a/2.0/404.html b/2.0/404.html
@@ -214,7 +214,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 May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div> 

diff --git a/2.0/Page Not Found.html b/2.0/Page Not Found.html
@@ -209,7 +209,7 @@ <h1>Page not found</h1>
   <div role="contentinfo">
     <p>
         &copy; Copyright 2016-2023, JFrog.
-      Last updated on May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div> 

diff --git a/2.0/_sources/examples/cross_build/android/android_studio.rst.txt b/2.0/_sources/examples/cross_build/android/android_studio.rst.txt
@@ -90,13 +90,14 @@ Paste the ``task conanInstall`` contents after the ``plugins`` and before the ``
 
 
    task conanInstall {
+       def conanExecutable = "conan" // define the path to your conan installation
        def buildDir = new File("app/build")
        buildDir.mkdirs()
        ["Debug", "Release"].each { String build_type ->
            ["armv7", "armv8", "x86", "x86_64"].each { String arch ->
-               def cmd = "conan install " +
-                       "../src/main/cpp --profile android -s build_type="+ build_type +" -s arch=" + arch +
-                       " --build missing -c tools.cmake.cmake_layout:build_folder_vars=['settings.arch']"
+               def cmd = conanExecutable + " install " +
+                         "../src/main/cpp --profile android -s build_type="+ build_type +" -s arch=" + arch +
+                         " --build missing -c tools.cmake.cmake_layout:build_folder_vars=['settings.arch']"
                print(">> ${cmd} \n")
 
                def sout = new StringBuilder(), serr = new StringBuilder()
@@ -197,17 +198,23 @@ the IDE is currently running:
    :caption: conan_android_toolchain.cmake
 
 
-   if(${ANDROID_ABI} STREQUAL "x86_64")
-       include("${CMAKE_CURRENT_LIST_DIR}/build/x86_64/generators/conan_toolchain.cmake")
-   elseif(${ANDROID_ABI} STREQUAL "x86")
-       include("${CMAKE_CURRENT_LIST_DIR}/build/x86/generators/conan_toolchain.cmake")
-   elseif(${ANDROID_ABI} STREQUAL "arm64-v8a")
-       include("${CMAKE_CURRENT_LIST_DIR}/build/armv8/generators/conan_toolchain.cmake")
-   elseif(${ANDROID_ABI} STREQUAL "armeabi-v7a")
-       include("${CMAKE_CURRENT_LIST_DIR}/build/armv7/generators/conan_toolchain.cmake")
-   else()
-       message(FATAL "Not supported configuration")
-   endif()
+    # During multiple stages of CMake configuration, the toolchain file is processed and command-line 
+    # variables may not be always available. The script exits prematurely if essential variables are absent.
+
+    if ( NOT ANDROID_ABI OR NOT CMAKE_BUILD_TYPE )
+        return()
+    endif()
+    if(${ANDROID_ABI} STREQUAL "x86_64")
+        include("${CMAKE_CURRENT_LIST_DIR}/build/x86_64/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake")
+    elseif(${ANDROID_ABI} STREQUAL "x86")
+        include("${CMAKE_CURRENT_LIST_DIR}/build/x86/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake")
+    elseif(${ANDROID_ABI} STREQUAL "arm64-v8a")
+        include("${CMAKE_CURRENT_LIST_DIR}/build/armv8/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake")
+    elseif(${ANDROID_ABI} STREQUAL "armeabi-v7a")
+        include("${CMAKE_CURRENT_LIST_DIR}/build/armv7/${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake")
+    else()
+        message(FATAL "Not supported configuration")
+    endif()
 
 
 CMakeLists.txt

diff --git a/2.0/_sources/reference/commands.rst.txt b/2.0/_sources/reference/commands.rst.txt
@@ -5,7 +5,7 @@ Commands
 
 This section describe the Conan built-in commands, like ``conan install`` or ``conan search``.
 
-It is also possible to create user custom commands, visit :ref:`custom commands reference <reference_commands_custom_commands>` 
+It is also possible to create user custom commands, visit :ref:`custom commands reference <reference_commands_custom_commands>`
 and these :ref:`custom command examples <examples_extensions_custom_commands>`
 
 
@@ -27,6 +27,7 @@ and these :ref:`custom command examples <examples_extensions_custom_commands>`
    commands/remove
    commands/remote
    commands/search
+   commands/version
 
 - :doc:`conan cache <commands/cache>`: Return the path of recipes and packages in the cache
 - :doc:`conan config <commands/config>`: Manage Conan configuration (remotes, settings, plugins, etc)
@@ -39,6 +40,7 @@ and these :ref:`custom command examples <examples_extensions_custom_commands>`
 - :doc:`conan remove <commands/remove>`: Remove packages from the local cache or from remotes
 - :doc:`conan remote <commands/remote>`: Add, remove, login/logout and manage remote server
 - :doc:`conan search <commands/search>`: Search packages matching a name
+- :doc:`conan version <commands/version>`: Give information about the Conan client version
 
 
 **Creator commands:**

diff --git a/2.0/_sources/reference/commands/version.rst.txt b/2.0/_sources/reference/commands/version.rst.txt
@@ -0,0 +1,44 @@
+.. _reference_commands_version:
+
+conan version
+=============
+
+.. include:: ../../common/experimental_warning.inc
+
+.. code-block:: text
+
+    $ conan version -h
+    usage: conan version [-h] [-f FORMAT] [-v [V]]
+
+    Give information about the Conan client version.
+
+    options:
+      -h, --help            show this help message and exit
+      -f FORMAT, --format FORMAT
+                            Select the output format: json
+      -v [V]                Level of detail of the output. Valid options from less verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace
+
+
+The :command:`conan version` command shows the conan version as well the python version from the system:
+
+.. code-block:: text
+
+    $ conan version
+    version: 2.0.6
+    python
+      version: 3.10.4
+      sys_version: 3.10.4 (main, May 17 2022, 10:53:07) [Clang 13.1.6 (clang-1316.0.21.2.3)]
+
+
+The :command:`conan version --format=json` returns a JSON output format in ``stdout`` (which can be redirected to a file) with the following structure:
+
+.. code-block:: text
+
+    $ conan version --format=json
+    {
+        "version": "2.0.6",
+        "python": {
+            "version": "3.10.4",
+            "sys_version": "3.10.4 (main, May 17 2022, 10:53:07) [Clang 13.1.6 (clang-1316.0.21.2.3)]"
+        }
+    }
diff --git a/2.0/changelog.html b/2.0/changelog.html
@@ -556,7 +556,7 @@ <h2>2.0.0-beta1 (20-Jun-2022)<a class="headerlink" href="#beta1-20-jun-2022" tit
   <div role="contentinfo">
     <p>
         &copy; Copyright 2016-2023, JFrog.
-      Last updated on May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div> 

diff --git a/2.0/conan.pdf b/2.0/conan.pdf
diff --git a/2.0/examples.html b/2.0/examples.html
@@ -272,7 +272,7 @@
   <div role="contentinfo">
     <p>
         &copy; Copyright 2016-2023, JFrog.
-      Last updated on May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div> 

diff --git a/2.0/examples/conanfile.html b/2.0/examples/conanfile.html
@@ -253,7 +253,7 @@
   <div role="contentinfo">
     <p>
         &copy; Copyright 2016-2023, JFrog.
-      Last updated on May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div> 

diff --git a/2.0/examples/conanfile/layout.html b/2.0/examples/conanfile/layout.html
@@ -253,7 +253,7 @@
   <div role="contentinfo">
     <p>
         &copy; Copyright 2016-2023, JFrog.
-      Last updated on May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div> 

diff --git a/2.0/examples/conanfile/layout/conanfile_in_subfolder.html b/2.0/examples/conanfile/layout/conanfile_in_subfolder.html
@@ -322,7 +322,7 @@
   <div role="contentinfo">
     <p>
         &copy; Copyright 2016-2023, JFrog.
-      Last updated on May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div> 

diff --git a/2.0/examples/conanfile/layout/editable_components.html b/2.0/examples/conanfile/layout/editable_components.html
@@ -350,7 +350,7 @@
   <div role="contentinfo">
     <p>
         &copy; Copyright 2016-2023, JFrog.
-      Last updated on May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div> 

diff --git a/2.0/examples/conanfile/layout/multiple_subprojects.html b/2.0/examples/conanfile/layout/multiple_subprojects.html
@@ -349,7 +349,7 @@
   <div role="contentinfo">
     <p>
         &copy; Copyright 2016-2023, JFrog.
-      Last updated on May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div> 

diff --git a/2.0/examples/conanfile/layout/third_party_libraries.html b/2.0/examples/conanfile/layout/third_party_libraries.html
@@ -329,7 +329,7 @@
   <div role="contentinfo">
     <p>
         &copy; Copyright 2016-2023, JFrog.
-      Last updated on May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div> 

diff --git a/2.0/examples/conanfile/package_info.html b/2.0/examples/conanfile/package_info.html
@@ -249,7 +249,7 @@
   <div role="contentinfo">
     <p>
         &copy; Copyright 2016-2023, JFrog.
-      Last updated on May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div> 

diff --git a/2.0/examples/conanfile/package_info/components.html b/2.0/examples/conanfile/package_info/components.html
@@ -450,7 +450,7 @@
   <div role="contentinfo">
     <p>
         &copy; Copyright 2016-2023, JFrog.
-      Last updated on May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div> 

diff --git a/2.0/examples/conanfile/package_info/package_info_conf_and_env.html b/2.0/examples/conanfile/package_info/package_info_conf_and_env.html
@@ -246,7 +246,7 @@
   <div role="contentinfo">
     <p>
         &copy; Copyright 2016-2023, JFrog.
-      Last updated on May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div> 

diff --git a/2.0/examples/config_files.html b/2.0/examples/config_files.html
@@ -245,7 +245,7 @@
   <div role="contentinfo">
     <p>
         &copy; Copyright 2016-2023, JFrog.
-      Last updated on May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div> 

diff --git a/2.0/examples/config_files/settings/settings_user.html b/2.0/examples/config_files/settings/settings_user.html
@@ -472,7 +472,7 @@ <h2>Use your new settings<a class="headerlink" href="#use-your-new-settings" tit
   <div role="contentinfo">
     <p>
         &copy; Copyright 2016-2023, JFrog.
-      Last updated on May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div> 

diff --git a/2.0/examples/cross_build.html b/2.0/examples/cross_build.html
@@ -243,7 +243,7 @@
   <div role="contentinfo">
     <p>
         &copy; Copyright 2016-2023, JFrog.
-      Last updated on May 30, 2023.
+      Last updated on Jun 08, 2023.
       <span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
     </p>
   </div>