diff --git a/reference/commands/build.rst b/reference/commands/build.rst index 092990ef2432..71d069ffda94 100644 --- a/reference/commands/build.rst +++ b/reference/commands/build.rst @@ -18,7 +18,7 @@ conan build [-s:a SETTINGS_ALL] [-c CONF] [-c:b CONF_BUILD] [-c:h CONF_HOST] [-c:a CONF_ALL] [-l LOCKFILE] [--lockfile-partial] [--lockfile-out LOCKFILE_OUT] - [--lockfile-packages] [--lockfile-clean] + [--lockfile-clean] [--lockfile-overrides LOCKFILE_OVERRIDES] path @@ -123,7 +123,6 @@ conan build in lockfile --lockfile-out LOCKFILE_OUT Filename of the updated lockfile - --lockfile-packages Lock package-id and package-revision information --lockfile-clean Remove unused entries from the lockfile --lockfile-overrides LOCKFILE_OVERRIDES Overwrite lockfile overrides diff --git a/reference/commands/create.rst b/reference/commands/create.rst index 7d34befd5058..f077e08b57a4 100644 --- a/reference/commands/create.rst +++ b/reference/commands/create.rst @@ -7,7 +7,7 @@ conan create usage: conan create [-h] [-v [V]] [-f FORMAT] [--name NAME] [--version VERSION] [--user USER] [--channel CHANNEL] [-l LOCKFILE] [--lockfile-partial] - [--lockfile-out LOCKFILE_OUT] [--lockfile-packages] + [--lockfile-out LOCKFILE_OUT] [--lockfile-clean] [--lockfile-overrides LOCKFILE_OVERRIDES] [-b BUILD] [-r REMOTE | -nr] [-u] [-pr PROFILE] [-pr:b PROFILE_BUILD] @@ -44,7 +44,6 @@ conan create in lockfile --lockfile-out LOCKFILE_OUT Filename of the updated lockfile - --lockfile-packages Lock package-id and package-revision information --lockfile-clean Remove unused entries from the lockfile --lockfile-overrides LOCKFILE_OVERRIDES Overwrite lockfile overrides diff --git a/reference/commands/export-pkg.rst b/reference/commands/export-pkg.rst index df78bdb64c6a..57587972336a 100644 --- a/reference/commands/export-pkg.rst +++ b/reference/commands/export-pkg.rst @@ -8,7 +8,7 @@ conan export-pkg $ conan export-pkg -h usage: conan export-pkg [-h] [-f FORMAT] [-v [V]] [-of OUTPUT_FOLDER] [--build-require] [-tf TEST_FOLDER] [-sb] [-r REMOTE | -nr] [--name NAME] [--version VERSION] [--user USER] [--channel CHANNEL] [-l LOCKFILE] [--lockfile-partial] [--lockfile-out LOCKFILE_OUT] - [--lockfile-packages] [--lockfile-clean] [-o OPTIONS_HOST] [-o:b OPTIONS_BUILD] [-o:h OPTIONS_HOST] [-pr PROFILE_HOST] + [--lockfile-clean] [-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] [-s:b SETTINGS_BUILD] [-s:h SETTINGS_HOST] [-c CONF_HOST] [-c:b CONF_BUILD] [-c:h CONF_HOST] path @@ -40,9 +40,7 @@ conan export-pkg -l LOCKFILE, --lockfile LOCKFILE Path to a lockfile. Use --lockfile="" to avoid automatic use of existing 'conan.lock' file --lockfile-partial Do not raise an error if some dependency is not found in lockfile - --lockfile-out LOCKFILE_OUT - Filename of the updated lockfile - --lockfile-packages Lock package-id and package-revision information + --lockfile-out LOCKFILE_OUT Filename of the updated lockfile --lockfile-clean Remove unused entries from the lockfile -o OPTIONS_HOST, --options OPTIONS_HOST Define options values (host machine), e.g.: -o Pkg:with_qt=true diff --git a/reference/commands/graph/build_order.rst b/reference/commands/graph/build_order.rst index 281f9e7e996e..7c2914ee95c2 100644 --- a/reference/commands/graph/build_order.rst +++ b/reference/commands/graph/build_order.rst @@ -18,7 +18,7 @@ conan graph build-order [-c:h CONF_HOST] [-c:a CONF_ALL] [-l LOCKFILE] [--lockfile-partial] [--lockfile-out LOCKFILE_OUT] - [--lockfile-packages] [--lockfile-clean] + [--lockfile-clean] [--lockfile-overrides LOCKFILE_OVERRIDES] [path] @@ -117,26 +117,9 @@ conan graph build-order in lockfile --lockfile-out LOCKFILE_OUT Filename of the updated lockfile - --lockfile-packages Lock package-id and package-revision information --lockfile-clean Remove unused entries from the lockfile --lockfile-overrides LOCKFILE_OVERRIDES - Overwrite lockfile overridesusage: 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] - [-r REMOTE | -nr] [-u] [-pr PROFILE] - [-pr:b PROFILE_BUILD] [-pr:h PROFILE_HOST] - [-pr:a PROFILE_ALL] [-o OPTIONS] - [-o:b OPTIONS_BUILD] [-o:h OPTIONS_HOST] - [-o:a OPTIONS_ALL] [-s SETTINGS] - [-s:b SETTINGS_BUILD] [-s:h SETTINGS_HOST] - [-s:a SETTINGS_ALL] [-c CONF] [-c:b CONF_BUILD] - [-c:h CONF_HOST] [-c:a CONF_ALL] [-l LOCKFILE] - [--lockfile-partial] - [--lockfile-out LOCKFILE_OUT] - [--lockfile-packages] [--lockfile-clean] - [--lockfile-overrides LOCKFILE_OVERRIDES] - [path] + Overwrite lockfile overrides Compute the build order of a dependency graph. @@ -233,7 +216,6 @@ conan graph build-order in lockfile --lockfile-out LOCKFILE_OUT Filename of the updated lockfile - --lockfile-packages Lock package-id and package-revision information --lockfile-clean Remove unused entries from the lockfile --lockfile-overrides LOCKFILE_OVERRIDES Overwrite lockfile overrides diff --git a/reference/commands/graph/explain.rst b/reference/commands/graph/explain.rst index 6bdfc81dd5da..0dd955a42900 100644 --- a/reference/commands/graph/explain.rst +++ b/reference/commands/graph/explain.rst @@ -9,7 +9,7 @@ conan graph explain usage: conan graph explain [-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] [-pr PROFILE] [-pr:b PROFILE_BUILD] [-pr:h PROFILE_HOST] [-pr:a PROFILE_ALL] [-o OPTIONS] [-o:b OPTIONS_BUILD] [-o:h OPTIONS_HOST] [-o:a OPTIONS_ALL] [-s SETTINGS] [-s:b SETTINGS_BUILD] [-s:h SETTINGS_HOST] [-s:a SETTINGS_ALL] [-c CONF] [-c:b CONF_BUILD] - [-c:h CONF_HOST] [-c:a CONF_ALL] [-l LOCKFILE] [--lockfile-partial] [--lockfile-out LOCKFILE_OUT] [--lockfile-packages] [--lockfile-clean] + [-c:h CONF_HOST] [-c:a CONF_ALL] [-l LOCKFILE] [--lockfile-partial] [--lockfile-out LOCKFILE_OUT] [--lockfile-clean] [--lockfile-overrides LOCKFILE_OVERRIDES] [--check-updates] [--build-require] [--missing [MISSING]] [path] @@ -72,7 +72,6 @@ conan graph explain --lockfile-partial Do not raise an error if some dependency is not found in lockfile --lockfile-out LOCKFILE_OUT Filename of the updated lockfile - --lockfile-packages Lock package-id and package-revision information --lockfile-clean Remove unused entries from the lockfile --lockfile-overrides LOCKFILE_OVERRIDES Overwrite lockfile overrides diff --git a/reference/commands/graph/info.rst b/reference/commands/graph/info.rst index e600c631d773..1840b8d2123b 100644 --- a/reference/commands/graph/info.rst +++ b/reference/commands/graph/info.rst @@ -17,7 +17,7 @@ conan graph info [-s:a SETTINGS_ALL] [-c CONF] [-c:b CONF_BUILD] [-c:h CONF_HOST] [-c:a CONF_ALL] [-l LOCKFILE] [--lockfile-partial] [--lockfile-out LOCKFILE_OUT] - [--lockfile-packages] [--lockfile-clean] + [--lockfile-clean] [--lockfile-overrides LOCKFILE_OVERRIDES] [--check-updates] [--filter FILTER] [--package-filter PACKAGE_FILTER] [-d DEPLOYER] @@ -119,7 +119,6 @@ conan graph info in lockfile --lockfile-out LOCKFILE_OUT Filename of the updated lockfile - --lockfile-packages Lock package-id and package-revision information --lockfile-clean Remove unused entries from the lockfile --lockfile-overrides LOCKFILE_OVERRIDES Overwrite lockfile overrides diff --git a/reference/commands/install.rst b/reference/commands/install.rst index 3af23cc407bb..3c643506c3f3 100644 --- a/reference/commands/install.rst +++ b/reference/commands/install.rst @@ -17,7 +17,7 @@ conan install [-s:a SETTINGS_ALL] [-c CONF] [-c:b CONF_BUILD] [-c:h CONF_HOST] [-c:a CONF_ALL] [-l LOCKFILE] [--lockfile-partial] [--lockfile-out LOCKFILE_OUT] - [--lockfile-packages] [--lockfile-clean] + [--lockfile-clean] [--lockfile-overrides LOCKFILE_OVERRIDES] [-g GENERATOR] [-of OUTPUT_FOLDER] [-d DEPLOYER] [--deployer-folder DEPLOYER_FOLDER] @@ -130,7 +130,6 @@ conan install in lockfile --lockfile-out LOCKFILE_OUT Filename of the updated lockfile - --lockfile-packages Lock package-id and package-revision information --lockfile-clean Remove unused entries from the lockfile --lockfile-overrides LOCKFILE_OVERRIDES Overwrite lockfile overrides @@ -343,8 +342,6 @@ to resolve the new one, which was not previously present in the lockfile, and st # --lockfile=conan.lock is the default, not necessary $ conan install . --lockfile=conan.lock --lockfile-partial --lockfile-out=conan.lock -The ``--lockfile-packages`` argument allows to create lockfiles that also lock down to the package revision, but -it should not be necessary in the vast majority of cases, so it is discouraged in the general case. Also, it is likely that the majority of lockfile operations are better managed by the ``conan lock`` command. diff --git a/reference/commands/lock/create.rst b/reference/commands/lock/create.rst index 57201bfb6935..900f5e51d94b 100644 --- a/reference/commands/lock/create.rst +++ b/reference/commands/lock/create.rst @@ -15,7 +15,7 @@ conan lock create [-s:a SETTINGS_ALL] [-c CONF] [-c:b CONF_BUILD] [-c:h CONF_HOST] [-c:a CONF_ALL] [-l LOCKFILE] [--lockfile-partial] [--lockfile-out LOCKFILE_OUT] - [--lockfile-packages] [--lockfile-clean] + [--lockfile-clean] [--lockfile-overrides LOCKFILE_OVERRIDES] [--build-require] [path] @@ -113,7 +113,6 @@ conan lock create in lockfile --lockfile-out LOCKFILE_OUT Filename of the updated lockfile - --lockfile-packages Lock package-id and package-revision information --lockfile-clean Remove unused entries from the lockfile --lockfile-overrides LOCKFILE_OVERRIDES Overwrite lockfile overrides diff --git a/reference/commands/test.rst b/reference/commands/test.rst index b0b8e3859045..9f144d38c593 100644 --- a/reference/commands/test.rst +++ b/reference/commands/test.rst @@ -14,7 +14,7 @@ conan test [-s:a SETTINGS_ALL] [-c CONF] [-c:b CONF_BUILD] [-c:h CONF_HOST] [-c:a CONF_ALL] [-l LOCKFILE] [--lockfile-partial] [--lockfile-out LOCKFILE_OUT] - [--lockfile-packages] [--lockfile-clean] + [--lockfile-clean] [--lockfile-overrides LOCKFILE_OVERRIDES] path reference @@ -105,7 +105,6 @@ conan test in lockfile --lockfile-out LOCKFILE_OUT Filename of the updated lockfile - --lockfile-packages Lock package-id and package-revision information --lockfile-clean Remove unused entries from the lockfile --lockfile-overrides LOCKFILE_OVERRIDES Overwrite lockfile overrides