From f3eb73dd853cd855757271cc383b9d94dcf7b58c Mon Sep 17 00:00:00 2001 From: James Date: Mon, 6 Sep 2021 08:57:35 +0200 Subject: [PATCH] adding new confs (#9526) --- conans/client/command.py | 2 +- conans/model/conf.py | 32 ++++++++++++------- .../test/integration/command/config_test.py | 2 +- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/conans/client/command.py b/conans/client/command.py index 9ade73113af..30a5eb038de 100644 --- a/conans/client/command.py +++ b/conans/client/command.py @@ -657,7 +657,7 @@ def config(self, *args): elif args.subcommand == 'init': return self._conan.config_init(force=args.force) elif args.subcommand == "list": - self._out.info("Supported Conan *experimental* conan.conf properties:") + self._out.info("Supported Conan *experimental* global.conf and [conf] properties:") for key, value in DEFAULT_CONFIGURATION.items(): self._out.writeln("{}: {}".format(key, value)) diff --git a/conans/model/conf.py b/conans/model/conf.py index a52fb8e9188..20977d0cf21 100644 --- a/conans/model/conf.py +++ b/conans/model/conf.py @@ -4,27 +4,35 @@ DEFAULT_CONFIGURATION = { - "core:required_conan_version": "Will raise if the current Conan version does not match the defined version range.", + "core:required_conan_version": "Raise if current version does not match the defined range.", "core.package_id:msvc_visual_incompatible": "Allows opting-out the fallback from the new msvc compiler to the Visual Studio compiler existing binaries", - "tools.microsoft.msbuild:verbosity": "Verbosity level for MSBuild: 'Quiet', 'Minimal', 'Normal', 'Detailed', 'Diagnostic'", - "tools.microsoft.msbuild:max_cpu_count": "Argument for the /m (/maxCpuCount) when running MSBuild", - "tools.microsoft.msbuild:vs_version": "Defines the compiler version when using using the new msvc compiler", - "tools.microsoft.msbuilddeps:exclude_code_analysis": "Suppress MSBuild code analysis for patterns", - "tools.microsoft.msbuildtoolchain:compile_options": "Dictionary with MSBuild compiler options", + "core:default_profile": "Defines the default host profile ('default' by default)", + "core:default_build_profile": "Defines the default build profile (None by default)", + "tools.android:ndk_path": "Argument for the CMAKE_ANDROID_NDK", + "tools.build:skip_test": "Do not execute CMake.test() and Meson.test() when enabled", "tools.build:processes": "Default jobs number", - "tools.ninja:jobs": "Argument for the --jobs parameter when running Ninja generator", - "tools.gnu.make:jobs": "Argument for the -j parameter when running Make generator", - "tools.gnu:make_program": "Indicate path to make program", - "tools.env.virtualenv:auto_use": "Automatically activate virtualenvs when changing into a directory", "tools.cmake.cmaketoolchain:generator": "User defined CMake generator to use instead of default", "tools.cmake.cmaketoolchain:msvc_parallel_compile": "Argument for the /MP when running msvc", "tools.cmake.cmaketoolchain:find_package_prefer_config": "Argument for the CMAKE_FIND_PACKAGE_PREFER_CONFIG", "tools.cmake.cmaketoolchain:toolchain_file": "Use other existing file rather than conan_toolchain.cmake one", "tools.cmake.cmaketoolchain:user_toolchain": "Inject existing user toolchain at the beginning of conan_toolchain.cmake", - "tools.build:skip_test": "Do not execute CMake.test() and Meson.test() when enabled", - "tools.android:ndk_path": "Argument for the CMAKE_ANDROID_NDK", + "tools.cmake.cmaketoolchain:system_name": "Define CMAKE_SYSTEM_NAME in CMakeToolchain", + "tools.cmake.cmaketoolchain:system_version": "Define CMAKE_SYSTEM_VERSION in CMakeToolchain", + "tools.cmake.cmaketoolchain:system_processor": "Define CMAKE_SYSTEM_PROCESSOR in CMakeToolchain", + "tools.env.virtualenv:auto_use": "Automatically activate virtualenv file generation", "tools.files.download:retry": "Number of retries in case of failure when downloading", "tools.files.download:retry_wait": "Seconds to wait between download attempts", + "tools.gnu:make_program": "Indicate path to make program", + "tools.gnu.make:jobs": "Argument for the -j parameter when running Make generator", + "tools.google.bazel:config": "Define Bazel config file", + "tools.google.bazel:bazelrc_path": "Defines Bazel rc-path", + "tools.microsoft.msbuild:verbosity": "Verbosity level for MSBuild: " + "'Quiet', 'Minimal', 'Normal', 'Detailed', 'Diagnostic'", + "tools.microsoft.msbuild:max_cpu_count": "Argument for the /m (/maxCpuCount) when running MSBuild", + "tools.microsoft.msbuild:vs_version": "Defines the IDE version when using the new msvc compiler", + "tools.microsoft.msbuilddeps:exclude_code_analysis": "Suppress MSBuild code analysis for patterns", + "tools.microsoft.msbuildtoolchain:compile_options": "Dictionary with MSBuild compiler options", + "tools.ninja:jobs": "Argument for the --jobs parameter when running Ninja generator", } diff --git a/conans/test/integration/command/config_test.py b/conans/test/integration/command/config_test.py index 22953da1062..ded00b21897 100644 --- a/conans/test/integration/command/config_test.py +++ b/conans/test/integration/command/config_test.py @@ -245,6 +245,6 @@ def test_config_list(): """ client = TestClient() client.run('config list') - assert "Supported Conan *experimental* conan.conf properties:" in client.out + assert "Supported Conan *experimental* global.conf and [conf] properties:" in client.out for key, value in DEFAULT_CONFIGURATION.items(): assert "{}: {}".format(key, value) in client.out