diff --git a/changelog.rst b/changelog.rst index 2b1e02cdb10f..98238e9d4f2b 100644 --- a/changelog.rst +++ b/changelog.rst @@ -3,6 +3,35 @@ Changelog For a more detailed description of the major changes that Conan 2.0 brings, compared with Conan 1.X, please read :ref:`whatsnew` +2.0.1 (03-Mar-2023) +------------------- + +- Feature: Add `--insecure` alias to `--verify-ssl` in config install. `#13270 `_ . Docs `here `__ +- Feature: Add `.conanignore` support to `conan config install`. `#13269 `_ . Docs `here `__ +- Feature: Make verbose tracebacks on exception be shown for ``-vv`` and ``-vvv``, instead of custom env-var used in 1.X. `#13226 `_ +- Fix: Minor improvements to :command:`conan install` and 2.0-readiness error messages. `#13299 `_ +- Fix: Remove ``vcvars.bat`` VS telemetry env-var, to avoid Conan hanging. `#13293 `_ +- Fix: Remove legacy ``CMakeToolchain`` support for ``CMakePresets`` schema2 for ``CMakeUserPresets.json``. `#13288 `_ . Docs `here `__ +- Fix: Remove ``--logger`` json logging and legacy traces. `#13287 `_ . Docs `here `__ +- Fix: Fix typo in `conan remote auth` help. `#13285 `_ . Docs `here `__ +- Fix: Raise arg error if ``conan config list unexpected-arg``. `#13282 `_ +- Fix: Do not auto-detect ``compiler.runtime_type`` for ``msvc``, rely on profile plugin. `#13277 `_ +- Fix: Fix conanfile.txt options parsing error message. `#13266 `_ +- Fix: Improve error message for unified patterns in options. `#13264 `_ +- Fix: Allow ``conan remote add --force`` to force re-definition of an existing remote name. `#13249 `_ +- Fix: Restore printing of profiles for build command. `#13214 `_ +- Fix: Change :command:`conan build` argument description for "path" to indicate it is only for conanfile.py and explicitly state that it does not work with conanfile.txt. `#13211 `_ . Docs `here `__ +- Fix: Better error message when dependencies ``options`` are defined in ``requirements()`` method. `#13207 `_ +- Fix: Fix broken links to docs from error messages and readme. `#13186 `_ +- Bugfix: Ensure that `topics` are always serialized as lists. `#13298 `_ +- Bugfix: Ensure that `provides` are always serialized as lists. `#13298 `_ +- Bugfix: Fixed the detection of certain visual c++ installations. `#13284 `_ +- Bugfix: Fix supported ``cppstd`` values for ``msvc`` compiler. `#13278 `_ +- Bugfix: CMakeDeps generate files for ``tool_requires`` with the same ``build_type`` as the "host" context. `#13267 `_ +- Bugfix: Fix definition of patterns for dependencies options in configure(). `#13263 `_ +- Bugfix: Fix CMakeToolchain error when output folder in different Win drive. `#13248 `_ +- Bugfix: Do not raise errors if a ``test_requires`` is not used by components ``.requires``. `#13191 `_ + 2.0.0 (22-Feb-2023) ------------------- diff --git a/conf.py b/conf.py index 2d60198b45bb..302da9921c88 100644 --- a/conf.py +++ b/conf.py @@ -62,7 +62,7 @@ # The short X.Y version. version = "2.0" # The full version, including alpha/beta/rc tags. -release = u'2.0.0' +release = u'2.0.1' dir_path = os.path.dirname(os.path.realpath(__file__)) if not os.path.exists(os.path.join(dir_path, "versions.json")): diff --git a/reference/commands/build.rst b/reference/commands/build.rst index 657eb0f21ed8..04747804679b 100644 --- a/reference/commands/build.rst +++ b/reference/commands/build.rst @@ -6,7 +6,7 @@ conan build .. code-block:: text $ conan build -h - usage: conan build [-h] [-v [V]] [--logger] [--name NAME] [--version VERSION] + usage: conan build [-h] [-v [V]] [--name NAME] [--version VERSION] [--user USER] [--channel CHANNEL] [-of OUTPUT_FOLDER] [-b BUILD] [-r REMOTE | -nr] [-u] [-o OPTIONS_HOST] [-o:b OPTIONS_BUILD] [-o:h OPTIONS_HOST] [-pr PROFILE_HOST] @@ -21,9 +21,9 @@ conan build Install dependencies and call the build() method. positional arguments: - path Path to a folder containing a recipe (conanfile.py or - conanfile.txt) or to a recipe file. e.g., - ./my_project/conanfile.txt. + path Path to a python-based recipe file or a folder + containing a conanfile.py recipe. conanfile.txt cannot + be used with conan build. optional arguments: -h, --help show this help message and exit @@ -31,8 +31,6 @@ conan build verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. --name NAME Provide a package name if not specified in conanfile --version VERSION Provide a package version if not specified in conanfile diff --git a/reference/commands/cache.rst b/reference/commands/cache.rst index 768dcf03be37..1edb57e2f2ad 100644 --- a/reference/commands/cache.rst +++ b/reference/commands/cache.rst @@ -12,7 +12,7 @@ conan cache path .. code-block:: text $ conan cache path --help - usage: conan cache path [-h] [-v [V]] [--logger] [--folder {export_source,source,build}] reference + usage: conan cache path [-h] [-v [V]] [--folder {export_source,source,build}] reference Show the path to the Conan cache for a given reference. @@ -25,8 +25,6 @@ conan cache path verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. --folder {export_source,source,build} Path to show. The 'build' requires a package reference. If not specified it shows 'exports' path @@ -160,7 +158,7 @@ conan cache clean .. code-block:: text $ conan cache clean -h - usage: conan cache clean [-h] [-v [V]] [--logger] [-s] [-b] [-d] + usage: conan cache clean [-h] [-v [V]] [-s] [-b] [-d] [-p PACKAGE_QUERY] pattern @@ -176,8 +174,7 @@ conan cache clean verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. + -s, --source Clean source folders -b, --build Clean build folders -d, --download Clean download folders diff --git a/reference/commands/config.rst b/reference/commands/config.rst index da21064864ca..b99b70e570d2 100644 --- a/reference/commands/config.rst +++ b/reference/commands/config.rst @@ -10,8 +10,7 @@ conan config home .. code-block:: text $ conan config home --help - usage: conan config home [-h] [-v [V]] [--logger] - + usage: conan config home [-h] [-v [V]] Show the Conan home folder. optional arguments: @@ -19,7 +18,6 @@ conan config home -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 - --logger Show the output with log format, with time, type and message. The ``conan config home`` command returns the path of the Conan home folder. @@ -37,8 +35,8 @@ conan config install .. code-block:: text $ conan config install -h - usage: conan config install [-h] [-v [V]] [--logger] - [--verify-ssl [VERIFY_SSL]] + usage: conan config install [-h] [-v [V]] + [--verify-ssl [VERIFY_SSL] | --insecure] [-t {git,dir,file,url}] [-a ARGS] [-sf SOURCE_FOLDER] [-tf TARGET_FOLDER] item @@ -56,10 +54,10 @@ conan config install verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. --verify-ssl [VERIFY_SSL] Verify SSL connection when downloading file + --insecure Allow insecure server connections when using SSL. + Equivalent to --verify-ssl=False -t {git,dir,file,url}, --type {git,dir,file,url} Type of remote config -a ARGS, --args ARGS String with extra arguments for "git clone" @@ -91,6 +89,12 @@ All the configuration files can be shared and installed this way: - All the extensions, including plugins, hooks. - Custom user commands. +This command reads a ``.conanignore`` file which, if present, filters which files and folders +are copied over to the user's Conan home folder. +This file uses `fnmatch `_ patterns +to match over the folder contents, excluding those entries that match from the config installation. +See `conan-io/command-extensions's .conanignore `_ for an example of such a file. + **Examples**: @@ -155,7 +159,7 @@ conan config list .. code-block:: text $ conan config list -h - usage: conan config list [-h] [-f FORMAT] [-v [V]] [--logger] + usage: conan config list [-h] [-f FORMAT] [-v [V]] Show all the Conan available configurations: core and tools. @@ -167,8 +171,7 @@ conan config list verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. + Displays all the Conan built-in configurations. There are 2 groups: @@ -224,7 +227,6 @@ Displays all the Conan built-in configurations. There are 2 groups: tools.build:skip_test: Do not execute CMake.test() and Meson.test() when enabled tools.build:sysroot: Pass the --sysroot= flag if available. (None by default) tools.cmake.cmake_layout:build_folder_vars: Settings and Options that will produce a different build folder and different CMake presets names - tools.cmake.cmaketoolchain.presets:max_schema_version: Generate CMakeUserPreset.json compatible with the supplied schema version tools.cmake.cmaketoolchain:find_package_prefer_config: Argument for the CMAKE_FIND_PACKAGE_PREFER_CONFIG tools.cmake.cmaketoolchain:generator: User defined CMake generator to use instead of default tools.cmake.cmaketoolchain:system_name: Define CMAKE_SYSTEM_NAME in CMakeToolchain diff --git a/reference/commands/create.rst b/reference/commands/create.rst index 6c81c4b89f2b..be3d60e70b6f 100644 --- a/reference/commands/create.rst +++ b/reference/commands/create.rst @@ -4,7 +4,7 @@ conan create .. code-block:: text $ conan create -h - usage: conan create [-h] [-f FORMAT] [-v [V]] [--logger] [--name NAME] + usage: conan create [-h] [-f FORMAT] [-v [V]] [--name NAME] [--version VERSION] [--user USER] [--channel CHANNEL] [-l LOCKFILE] [--lockfile-partial] [--lockfile-out LOCKFILE_OUT] [--lockfile-packages] @@ -30,8 +30,6 @@ conan create verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. --name NAME Provide a package name if not specified in conanfile --version VERSION Provide a package version if not specified in conanfile diff --git a/reference/commands/download.rst b/reference/commands/download.rst index e777feaad9d3..29fb1a05c0a9 100644 --- a/reference/commands/download.rst +++ b/reference/commands/download.rst @@ -6,7 +6,7 @@ conan download .. code-block:: text $ conan download -h - usage: conan download [-h] [-v [V]] [--logger] [--only-recipe] + usage: conan download [-h] [-v [V]] [--only-recipe] [-p PACKAGE_QUERY] -r REMOTE reference @@ -28,8 +28,6 @@ conan download verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. --only-recipe Download only the recipe/s, not the binary packages. -p PACKAGE_QUERY, --package-query PACKAGE_QUERY Only upload packages matching a specific query. e.g: diff --git a/reference/commands/editable.rst b/reference/commands/editable.rst index 56afb4e1cb09..125a0d93e2cd 100644 --- a/reference/commands/editable.rst +++ b/reference/commands/editable.rst @@ -11,7 +11,7 @@ conan editable add .. code-block:: text $ conan editable add -h - usage: conan editable add [-h] [-v [V]] [--logger] [--name NAME] + usage: conan editable add [-h] [-v [V]] [--name NAME] [--version VERSION] [--user USER] [--channel CHANNEL] [-of OUTPUT_FOLDER] path @@ -29,8 +29,6 @@ conan editable add verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. --name NAME Provide a package name if not specified in conanfile --version VERSION Provide a package version if not specified in conanfile @@ -45,7 +43,7 @@ conan editable remove .. code-block:: text $ conan editable remove -h - usage: conan editable remove [-h] [-v [V]] [--logger] [-r REFS] [path] + usage: conan editable remove [-h] [-v [V]] [-r REFS] [path] Remove the "editable" mode for this reference. @@ -60,6 +58,4 @@ conan editable remove verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. -r REFS, --refs REFS Directly provide reference patterns diff --git a/reference/commands/export-pkg.rst b/reference/commands/export-pkg.rst index 116932d13238..b83015e046ff 100644 --- a/reference/commands/export-pkg.rst +++ b/reference/commands/export-pkg.rst @@ -6,7 +6,7 @@ conan export-pkg .. code-block:: text $ conan export-pkg -h - usage: conan export-pkg [-h] [-f FORMAT] [-v [V]] [--logger] + usage: conan export-pkg [-h] [-f FORMAT] [-v [V]] [-of OUTPUT_FOLDER] [--build-require] [-tf TEST_FOLDER] [--name NAME] [--version VERSION] [--user USER] [--channel CHANNEL] [-l LOCKFILE] @@ -33,8 +33,6 @@ conan export-pkg verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. -of OUTPUT_FOLDER, --output-folder OUTPUT_FOLDER The root output folder for generated and build files --build-require Whether the provided reference is a build-require diff --git a/reference/commands/export.rst b/reference/commands/export.rst index 6e573a54128b..506adf0efddd 100644 --- a/reference/commands/export.rst +++ b/reference/commands/export.rst @@ -4,7 +4,7 @@ conan export .. code-block:: text $ conan export -h - usage: conan export [-h] [-f FORMAT] [-v [V]] [--logger] [--name NAME] + usage: conan export [-h] [-f FORMAT] [-v [V]] [--name NAME] [--version VERSION] [--user USER] [--channel CHANNEL] [-r REMOTE | -nr] [-l LOCKFILE] [--lockfile-out LOCKFILE_OUT] [--lockfile-partial] @@ -24,8 +24,6 @@ conan export verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. --name NAME Provide a package name if not specified in conanfile --version VERSION Provide a package version if not specified in conanfile diff --git a/reference/commands/graph/build_order.rst b/reference/commands/graph/build_order.rst index 72b296709a1b..a6ed33b4c9e9 100644 --- a/reference/commands/graph/build_order.rst +++ b/reference/commands/graph/build_order.rst @@ -4,7 +4,7 @@ conan graph build-order .. code-block:: text $ conan graph build-order -h - usage: conan graph build-order [-h] [-f FORMAT] [-v [V]] [--logger] + usage: conan graph build-order [-h] [-f FORMAT] [-v [V]] [--name NAME] [--version VERSION] [--user USER] [--channel CHANNEL] [--requires REQUIRES] [--tool-requires TOOL_REQUIRES] [-b BUILD] @@ -35,8 +35,6 @@ conan graph build-order verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. --name NAME Provide a package name if not specified in conanfile --version VERSION Provide a package version if not specified in conanfile diff --git a/reference/commands/graph/build_order_merge.rst b/reference/commands/graph/build_order_merge.rst index 599d69798ad6..4542a1971626 100644 --- a/reference/commands/graph/build_order_merge.rst +++ b/reference/commands/graph/build_order_merge.rst @@ -5,7 +5,7 @@ conan graph build-order-merge .. code-block:: text $ conan graph build-order-merge -h - usage: conan graph build-order-merge [-h] [-f FORMAT] [-v [V]] [--logger] + usage: conan graph build-order-merge [-h] [-f FORMAT] [-v [V]] [--file [FILE]] Merge more than 1 build-order file. @@ -18,6 +18,4 @@ conan graph build-order-merge verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. --file [FILE] Files to be merged diff --git a/reference/commands/graph/info.rst b/reference/commands/graph/info.rst index ac680bc37d8d..4c60f5eec250 100644 --- a/reference/commands/graph/info.rst +++ b/reference/commands/graph/info.rst @@ -4,7 +4,7 @@ conan graph info .. code-block:: text $ conan graph info -h - usage: conan graph info [-h] [-f FORMAT] [-v [V]] [--logger] [--name NAME] + usage: conan graph info [-h] [-f FORMAT] [-v [V]] [--name NAME] [--version VERSION] [--user USER] [--channel CHANNEL] [--requires REQUIRES] [--tool-requires TOOL_REQUIRES] [-b BUILD] [-r REMOTE | -nr] [-u] [-o OPTIONS_HOST] @@ -34,8 +34,6 @@ conan graph info verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. --name NAME Provide a package name if not specified in conanfile --version VERSION Provide a package version if not specified in conanfile diff --git a/reference/commands/inspect.rst b/reference/commands/inspect.rst index b2293e5f13b1..c2e759813b31 100644 --- a/reference/commands/inspect.rst +++ b/reference/commands/inspect.rst @@ -8,7 +8,7 @@ conan inspect .. code-block:: text $ conan inspect -h - usage: conan inspect [-h] [-f FORMAT] [-v [V]] [--logger] path + usage: conan inspect [-h] [-f FORMAT] [-v [V]] path Inspect a conanfile.py to return its public fields. @@ -23,8 +23,6 @@ conan inspect verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. .. note:: diff --git a/reference/commands/install.rst b/reference/commands/install.rst index dcfdf3259089..52a960b043d5 100644 --- a/reference/commands/install.rst +++ b/reference/commands/install.rst @@ -6,7 +6,7 @@ conan install .. code-block:: text $ conan install -h - usage: conan install [-h] [-f FORMAT] [-v [V]] [--logger] [--name NAME] + usage: conan install [-h] [-f FORMAT] [-v [V]] [--name NAME] [--version VERSION] [--user USER] [--channel CHANNEL] [--requires REQUIRES] [--tool-requires TOOL_REQUIRES] [-b BUILD] [-r REMOTE | -nr] [-u] [-o OPTIONS_HOST] @@ -45,8 +45,6 @@ conan install verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. --name NAME Provide a package name if not specified in conanfile --version VERSION Provide a package version if not specified in conanfile diff --git a/reference/commands/list.rst b/reference/commands/list.rst index 52a7e81cd5d9..d35a1a796eee 100644 --- a/reference/commands/list.rst +++ b/reference/commands/list.rst @@ -6,7 +6,7 @@ conan list .. code-block:: text $ conan list -h - usage: conan list [-h] [-f FORMAT] [-v [V]] [--logger] [-p PACKAGE_QUERY] + usage: conan list [-h] [-f FORMAT] [-v [V]] [-p PACKAGE_QUERY] [-r REMOTE] [-c] reference @@ -25,8 +25,6 @@ conan list verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. -p PACKAGE_QUERY, --package-query PACKAGE_QUERY List only the packages matching a specific query, e.g, os=Windows AND (arch=x86 OR compiler=gcc) diff --git a/reference/commands/lock/add.rst b/reference/commands/lock/add.rst index cdba4e39ab8d..d63c05903238 100644 --- a/reference/commands/lock/add.rst +++ b/reference/commands/lock/add.rst @@ -4,7 +4,7 @@ conan lock add .. code-block:: text $ conan lock add -h - usage: conan lock add [-h] [-v [V]] [--logger] [--requires REQUIRES] + usage: conan lock add [-h] [-v [V]] [--requires REQUIRES] [--build-requires BUILD_REQUIRES] [--python-requires PYTHON_REQUIRES] [--lockfile-out LOCKFILE_OUT] [--lockfile LOCKFILE] @@ -21,8 +21,6 @@ conan lock add verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. --requires REQUIRES Add references to lockfile. --build-requires BUILD_REQUIRES Add build-requires to lockfile diff --git a/reference/commands/lock/create.rst b/reference/commands/lock/create.rst index 9fc5ceb59cd2..133bae9ee169 100644 --- a/reference/commands/lock/create.rst +++ b/reference/commands/lock/create.rst @@ -4,7 +4,7 @@ conan lock create .. code-block:: text $ conan lock create -h - usage: conan lock create [-h] [-v [V]] [--logger] [--name NAME] + usage: conan lock create [-h] [-v [V]] [--name NAME] [--version VERSION] [--user USER] [--channel CHANNEL] [--requires REQUIRES] [--tool-requires TOOL_REQUIRES] [-b BUILD] [-r REMOTE | -nr] [-u] [-o OPTIONS_HOST] @@ -31,8 +31,6 @@ conan lock create verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. --name NAME Provide a package name if not specified in conanfile --version VERSION Provide a package version if not specified in conanfile diff --git a/reference/commands/lock/merge.rst b/reference/commands/lock/merge.rst index d8c119e2e3e4..a3e5557f04f1 100644 --- a/reference/commands/lock/merge.rst +++ b/reference/commands/lock/merge.rst @@ -4,7 +4,7 @@ conan lock merge .. code-block:: text $ conan lock merge -h - usage: conan lock merge [-h] [-v [V]] [--logger] [--lockfile LOCKFILE] + usage: conan lock merge [-h] [-v [V]] [--lockfile LOCKFILE] [--lockfile-out LOCKFILE_OUT] Merge 2 or more lockfiles. @@ -15,8 +15,6 @@ conan lock merge verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. --lockfile LOCKFILE Path to lockfile to be merged --lockfile-out LOCKFILE_OUT Filename of the created lockfile \ No newline at end of file diff --git a/reference/commands/new.rst b/reference/commands/new.rst index 02f23fa896e8..ac4b98c8bab0 100644 --- a/reference/commands/new.rst +++ b/reference/commands/new.rst @@ -11,7 +11,7 @@ conan new .. code-block:: text $ conan new -h - usage: conan new [-h] [-v [V]] [--logger] [-d DEFINE] [-f] template + usage: conan new [-h] [-v [V]] [-d DEFINE] [-f] template Create a new example recipe and source files from a template. @@ -32,8 +32,6 @@ conan new verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. -d DEFINE, --define DEFINE Define a template argument as key=value, e.g., -d name=mypkg diff --git a/reference/commands/profile.rst b/reference/commands/profile.rst index 1a5107f16c05..0e9b8b178d38 100644 --- a/reference/commands/profile.rst +++ b/reference/commands/profile.rst @@ -12,7 +12,7 @@ conan profile detect .. code-block:: text $ conan profile detect -h - usage: conan profile detect [-h] [-v [V]] [--logger] [--name NAME] [-f] + usage: conan profile detect [-h] [-v [V]] [--name NAME] [-f] Generate a profile using auto-detected values. @@ -21,7 +21,6 @@ conan profile detect -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 - --logger Show the output with log format, with time, type and message. --name NAME Profile name, 'default' if not specified -f, --force Overwrite if exists @@ -47,7 +46,7 @@ conan profile list .. code-block:: text $ conan profile list -h - usage: conan profile list [-h] [-f FORMAT] [-v [V]] [--logger] + usage: conan profile list [-h] [-f FORMAT] [-v [V]] List all profiles in the cache. @@ -59,8 +58,6 @@ conan profile list verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. conan profile path @@ -69,7 +66,7 @@ conan profile path .. code-block:: text $ conan profile path -h - usage: conan profile path [-h] [-v [V]] [--logger] [-o OPTIONS_HOST] + usage: conan profile path [-h] [-v [V]] [-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] @@ -88,8 +85,6 @@ conan profile path verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. -o OPTIONS_HOST, --options OPTIONS_HOST Define options values (host machine), e.g.: -o Pkg:with_qt=true @@ -134,7 +129,7 @@ conan profile show .. code-block:: text $ conan profile show -h - usage: conan profile show [-h] [-v [V]] [--logger] [-o OPTIONS_HOST] + usage: conan profile show [-h] [-v [V]] [-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] @@ -149,8 +144,6 @@ conan profile show verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. -o OPTIONS_HOST, --options OPTIONS_HOST Define options values (host machine), e.g.: -o Pkg:with_qt=true diff --git a/reference/commands/remote.rst b/reference/commands/remote.rst index f3fe8aa3f842..1bca15964c98 100644 --- a/reference/commands/remote.rst +++ b/reference/commands/remote.rst @@ -10,12 +10,12 @@ work with Conan repositories, please check the :ref:`dedicated section -r=*``, and is provid .. code-block:: text $ conan search -h - usage: conan search [-h] [-f FORMAT] [-v [V]] [--logger] [-r REMOTE] reference + usage: conan search [-h] [-f FORMAT] [-v [V]] [-r REMOTE] reference Search for package recipes in all the remotes (by default), or a remote. @@ -25,8 +25,6 @@ This command is equivalent to ``conan list recipes -r=*``, and is provid verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. -r REMOTE, --remote REMOTE Remote names. Accepts wildcards. If not specified it searches in all the remotes diff --git a/reference/commands/source.rst b/reference/commands/source.rst index f20266de1894..b0fc63446cb8 100644 --- a/reference/commands/source.rst +++ b/reference/commands/source.rst @@ -6,7 +6,7 @@ conan source .. code-block:: text $ conan source -h - usage: conan source [-h] [-v [V]] [--logger] [--name NAME] [--version VERSION] + usage: conan source [-h] [-v [V]] [--name NAME] [--version VERSION] [--user USER] [--channel CHANNEL] [path] @@ -23,8 +23,6 @@ conan source verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. --name NAME Provide a package name if not specified in conanfile --version VERSION Provide a package version if not specified in conanfile --user USER Provide a user if not specified in conanfile diff --git a/reference/commands/test.rst b/reference/commands/test.rst index dbcfbf341965..c25d68bfa0e5 100644 --- a/reference/commands/test.rst +++ b/reference/commands/test.rst @@ -6,7 +6,7 @@ conan test .. code-block:: text $ conan test -h - usage: conan test [-h] [-v [V]] [--logger] [-b BUILD] [-r REMOTE | -nr] [-u] + usage: conan test [-h] [-v [V]] [-b BUILD] [-r REMOTE | -nr] [-u] [-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] @@ -29,8 +29,6 @@ conan test verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. -b BUILD, --build BUILD Optional, specify which packages to build from source. Combining multiple '--build' options on one command diff --git a/reference/commands/upload.rst b/reference/commands/upload.rst index e15c74ad85a8..b9dcc90395e8 100644 --- a/reference/commands/upload.rst +++ b/reference/commands/upload.rst @@ -10,7 +10,7 @@ section `. .. code-block:: text $ conan upload -h - usage: conan upload [-h] [-v [V]] [--logger] [-p PACKAGE_QUERY] -r REMOTE + usage: conan upload [-h] [-v [V]] [-p PACKAGE_QUERY] -r REMOTE [--only-recipe] [--force] [--check] [-c] reference @@ -32,8 +32,6 @@ section `. verbose to more verbose: -vquiet, -verror, -vwarning, -vnotice, -vstatus, -v or -vverbose, -vv or -vdebug, -vvv or -vtrace - --logger Show the output with log format, with time, type and - message. -p PACKAGE_QUERY, --package-query PACKAGE_QUERY Only upload packages matching a specific query. e.g: os=Windows AND (arch=x86 OR compiler=gcc) diff --git a/reference/config_files/global_conf.rst b/reference/config_files/global_conf.rst index 5c621a60e8a8..84d6993406f1 100644 --- a/reference/config_files/global_conf.rst +++ b/reference/config_files/global_conf.rst @@ -75,7 +75,6 @@ To list all the possible configurations available, run :command:`conan config li tools.build:skip_test: Do not execute CMake.test() and Meson.test() when enabled tools.build:sysroot: Pass the --sysroot= flag if available. (None by default) tools.cmake.cmake_layout:build_folder_vars: Settings and Options that will produce a different build folder and different CMake presets names - tools.cmake.cmaketoolchain.presets:max_schema_version: Generate CMakeUserPreset.json compatible with the supplied schema version tools.cmake.cmaketoolchain:find_package_prefer_config: Argument for the CMAKE_FIND_PACKAGE_PREFER_CONFIG tools.cmake.cmaketoolchain:generator: User defined CMake generator to use instead of default tools.cmake.cmaketoolchain:system_name: Define CMAKE_SYSTEM_NAME in CMakeToolchain diff --git a/reference/tools.rst b/reference/tools.rst index bf01f05ab6e1..34615be1a923 100644 --- a/reference/tools.rst +++ b/reference/tools.rst @@ -10,7 +10,7 @@ The import path is always like: .. code-block:: python from conan.tools.cmake import CMakeToolchain, CMakeDeps, CMake - form conan.tools.microsoft import MSBuildToolchain, MSBuildDeps, MSBuild + from conan.tools.microsoft import MSBuildToolchain, MSBuildDeps, MSBuild The main guidelines are: diff --git a/reference/tools/cmake/cmaketoolchain.rst b/reference/tools/cmake/cmaketoolchain.rst index 72d83e9a65ed..38366703cb22 100644 --- a/reference/tools/cmake/cmaketoolchain.rst +++ b/reference/tools/cmake/cmaketoolchain.rst @@ -102,19 +102,11 @@ translated from the current ``settings``: Note: Conan will skip the generation of the ``CMakeUserPresets.json`` if it already exists and was not generated by Conan. +.. note:: -By default, the version schema of the generated ``CMakeUserPresets.json`` is 4 and the schema for the ``CMakePresets.json`` is 3, -so they require CMake >= 3.23. -You can control the version of the generated ``CMakePresets.json`` and ``CMakeUserPresets.json`` with a :ref:`configuration` -``tools.cmake.cmaketoolchain.presets:max_schema_version``. - -It can be set in the `global.conf`, with `-c` in the :command:`conan install` command, or in a profile. -The minimum accepted value for this conf is ``2``: - -.. code:: bash - - conan install . -c tools.cmake.cmaketoolchain.presets:max_schema_version=2 - + The version schema of the generated ``CMakeUserPresets.json`` is 4 (compatible + with CMake>=3.23) and the schema for the ``CMakePresets.json`` is 3 (compatible with + CMake>=3.21). Customization ------------- @@ -464,7 +456,6 @@ CMakeToolchain is affected by these ``[conf]`` variables: - **tools.cmake.cmaketoolchain:system_processor** is not necessary in most cases and is only used to force-define ``CMAKE_SYSTEM_PROCESSOR``. - **tools.cmake.cmaketoolchain:toolset_arch**: Will add the ``,host=xxx`` specifier in the ``CMAKE_GENERATOR_TOOLSET`` variable of ``conan_toolchain.cmake`` file. - **tools.cmake.cmake_layout:build_folder_vars**: Settings and Options that will produce a different build folder and different CMake presets names. -- **tools.cmake.cmaketoolchain.presets:max_schema_version**: Generate CMakeUserPreset.json compatible with the supplied schema version. - **tools.build:cxxflags** list of extra C++ flags that will be appended to ``CMAKE_CXX_FLAGS_INIT``. - **tools.build:cflags** list of extra of pure C flags that will be appended to ``CMAKE_C_FLAGS_INIT``. - **tools.build:sharedlinkflags** list of extra linker flags that will be appended to ``CMAKE_SHARED_LINKER_FLAGS_INIT``. diff --git a/reference/tools/files/basic.rst b/reference/tools/files/basic.rst index b689285f1452..6b276b613362 100644 --- a/reference/tools/files/basic.rst +++ b/reference/tools/files/basic.rst @@ -283,7 +283,7 @@ Usage: def package_info(self): self.cpp_info.libdirs = ["lib", "other_libdir"] # Default value is 'lib' - self.cpp_info.libs = tools.collect_libs(self) + self.cpp_info.libs = collect_libs(self) For UNIX libraries starting with **lib**, like *libmath.a*, this tool will collect the library name **math**. Regarding symlinks, this tool will keep only the "most generic"