Skip to content

Commit

Permalink
Automatic deploy (build number 564)
Browse files Browse the repository at this point in the history
  • Loading branch information
ConanCI bot committed Oct 30, 2023
1 parent 1de79fd commit b572724
Show file tree
Hide file tree
Showing 537 changed files with 577 additions and 549 deletions.
2 changes: 1 addition & 1 deletion 2.0/404.html
Original file line number Diff line number Diff line change
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 Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/Page Not Found.html
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ <h1>Page not found</h1>
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,10 @@ platform without adding more changes.
multi = True if self.settings.get_safe("compiler") == "msvc" else False
if multi:
self.folders.generators = os.path.join("build", "generators")
self.folders.build = "build"
else:
self.folders.generators = os.path.join("build", str(self.settings.build_type), "generators")
self.folders.build = os.path.join("build", str(self.settings.build_type))
As you can see, we defined the **self.folders.generators** attribute in the `layout()`
Expand Down Expand Up @@ -243,11 +245,11 @@ Check that running the same commands as in the previous examples without the
:caption: Linux, macOS
$ conan install . --build=missing
$ cd build
$ source ./Release/generators/conanbuild.sh
$ cd build/Release
$ source ./generators/conanbuild.sh
Capturing current environment in deactivate_conanbuildenv-release-x86_64.sh
Configuring environment variables
$ cmake .. -DCMAKE_TOOLCHAIN_FILE=Release/generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
$ cmake ../.. -DCMAKE_TOOLCHAIN_FILE=generators/conan_toolchain.cmake -DCMAKE_BUILD_TYPE=Release
$ cmake --build .
...
Building with CMake version: 3.22.6
Expand All @@ -258,7 +260,7 @@ Check that running the same commands as in the previous examples without the
Uncompressed size is: 233
Compressed size is: 147
ZLIB VERSION: 1.2.11
$ source ./Release/generators/deactivate_conanbuild.sh
$ source ./generators/deactivate_conanbuild.sh
There's no need to always write this logic in the `conanfile.py`. There are some
pre-defined layouts you can import and directly use in your recipe. For example, for the
Expand Down
2 changes: 1 addition & 1 deletion 2.0/changelog.html
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,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 Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
Binary file modified 2.0/conan.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion 2.0/devops.html
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/devops/backup_sources/sources_backup.html
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ <h3>Upload the packages<a class="headerlink" href="#upload-the-packages" title="
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/devops/conancenter/hosting_binaries.html
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ <h2>Updating from upstream<a class="headerlink" href="#updating-from-upstream" t
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/devops/metadata.html
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ <h2>test_package as metadata<a class="headerlink" href="#test-package-as-metadat
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/devops/using_conancenter.html
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ <h2>Control and customization<a class="headerlink" href="#control-and-customizat
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/devops/versioning.html
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/devops/versioning/resolve_prereleases.html
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples.html
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/commands.html
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/commands/pkglists.html
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ <h2>Removing packages lists<a class="headerlink" href="#removing-packages-lists"
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/conanfile.html
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/conanfile/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/conanfile/layout/conanfile_in_subfolder.html
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/conanfile/layout/editable_components.html
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/conanfile/layout/multiple_subprojects.html
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/conanfile/layout/third_party_libraries.html
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/conanfile/package_info.html
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/conanfile/package_info/components.html
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/config_files.html
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/config_files/settings/settings_user.html
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,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 Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/cross_build.html
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/cross_build/android/android_studio.html
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ <h2>Building the application<a class="headerlink" href="#building-the-applicatio
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/cross_build/android/ndk.html
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ <h2>Read more<a class="headerlink" href="#read-more" title="Permalink to this he
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/dev_flow.html
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/dev_flow/debug/step_into_dependencies.html
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ <h2>Step into a dependency with Visual Studio<a class="headerlink" href="#step-i
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/extensions.html
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ <h3>Conan public API<a class="headerlink" href="#conan-public-api" title="Permal
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/extensions/commands/custom_commands.html
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/extensions/deployers/builtin_deployers.html
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/extensions/deployers/custom_deployers.html
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ <h3>deploy()<a class="headerlink" href="#deploy" title="Permalink to this headli
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/graph.html
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/graph/requires/consume_cmake_macro.html
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down
2 changes: 1 addition & 1 deletion 2.0/examples/graph/tool_requires/different_options.html
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ <h1>Depending on same version of a tool-require with different options<a class="
<div role="contentinfo">
<p>
&copy; Copyright 2016-2023, JFrog.
Last updated on Oct 24, 2023.
Last updated on Oct 30, 2023.
<span><a href="#" class="ot-sdk-show-settings">Cookies Settings</a></span>
</p>
</div>
Expand Down

0 comments on commit b572724

Please sign in to comment.