Release/1.35.0 (#2063)

* buildroot.rst: Fix a typo (#1996) Artifatory --> Artifactory * - meson : add target argument (#2011) Signed-off-by: SSE4 <[email protected]> * Update develop with master (#2020) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <[email protected]> Co-authored-by: James <[email protected]> Co-authored-by: chausner <[email protected]> * Fix multiple minor spelling mistakes (#2019) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix multiple minor spelling mistakes * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <[email protected]> Co-authored-by: James <[email protected]> Co-authored-by: Carlos Zoido <[email protected]> * Rename QbsToolchain to QbsProfile (#2027) * Rename QbsToolchain to QbsProfile * Rename use_profile to profile * conan_v2_error update (#2031) * lock bundle (#2030) * lock bundle * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <[email protected]> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <[email protected]> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <[email protected]> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <[email protected]> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <[email protected]> Co-authored-by: Carlos Zoido <[email protected]> * Merge master to develop (#2033) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <[email protected]> * Remove misleading message about ConanCenter in shared_library_package_id() (#2000) * Update yocto docs (#2022) * Troubleshooting: How to fix incompatible requirements (#2016) * How to solve incompatible requirements Signed-off-by: Uilian Ries <[email protected]> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <[email protected]> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <[email protected]> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <[email protected]> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <[email protected]> * Update faq/troubleshooting.rst * Fix bad indentation Signed-off-by: Uilian Ries <[email protected]> Co-authored-by: Carlos Zoido <[email protected]> Co-authored-by: James <[email protected]> Co-authored-by: chausner <[email protected]> Co-authored-by: Daniel <[email protected]> Co-authored-by: Uilian Ries <[email protected]> * Merge master to develop (#2036) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <[email protected]> * Remove misleading message about ConanCenter in shared_library_package_id() (#2000) * Update yocto docs (#2022) * Troubleshooting: How to fix incompatible requirements (#2016) * How to solve incompatible requirements Signed-off-by: Uilian Ries <[email protected]> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <[email protected]> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <[email protected]> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <[email protected]> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <[email protected]> * Update faq/troubleshooting.rst * Fix bad indentation Signed-off-by: Uilian Ries <[email protected]> Co-authored-by: Carlos Zoido <[email protected]> * Release 1.34.0 (#2035) * buildroot.rst: Fix a typo (#1996) Artifatory --> Artifactory * - meson : add target argument (#2011) Signed-off-by: SSE4 <[email protected]> * Update develop with master (#2020) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <[email protected]> Co-authored-by: James <[email protected]> Co-authored-by: chausner <[email protected]> * Fix multiple minor spelling mistakes (#2019) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix multiple minor spelling mistakes * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <[email protected]> Co-authored-by: James <[email protected]> Co-authored-by: Carlos Zoido <[email protected]> * Rename QbsToolchain to QbsProfile (#2027) * Rename QbsToolchain to QbsProfile * Rename use_profile to profile * conan_v2_error update (#2031) * lock bundle (#2030) * lock bundle * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <[email protected]> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <[email protected]> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <[email protected]> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <[email protected]> * Update versioning/lockfiles/bundle.rst Co-authored-by: Carlos Zoido <[email protected]> Co-authored-by: Carlos Zoido <[email protected]> * release 1.34.0 * fix changelog * Merge master to release branch (#2034) * fix lowercase package names (#2013) * remove training banner (#2015) * Fix incorrect indentation in define_abi_compatibility.rst (#2017) * Fix spelling (#2018) Co-authored-by: Carlos Zoido <[email protected]> * Remove misleading message about ConanCenter in shared_library_package_id() (#2000) * Update yocto docs (#2022) * Troubleshooting: How to fix incompatible requirements (#2016) * How to solve incompatible requirements Signed-off-by: Uilian Ries <[email protected]> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <[email protected]> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <[email protected]> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <[email protected]> * Update faq/troubleshooting.rst Co-authored-by: Carlos Zoido <[email protected]> * Update faq/troubleshooting.rst * Fix bad indentation Signed-off-by: Uilian Ries <[email protected]> Co-authored-by: Carlos Zoido <[email protected]> Co-authored-by: James <[email protected]> Co-authored-by: chausner <[email protected]> Co-authored-by: Daniel <[email protected]> Co-authored-by: Uilian Ries <[email protected]> Co-authored-by: rico-chet <[email protected]> Co-authored-by: SSE4 <[email protected]> Co-authored-by: James <[email protected]> Co-authored-by: chausner <[email protected]> Co-authored-by: Psy-Kai <[email protected]> Co-authored-by: Daniel <[email protected]> Co-authored-by: Uilian Ries <[email protected]> Co-authored-by: James <[email protected]> Co-authored-by: chausner <[email protected]> Co-authored-by: Daniel <[email protected]> Co-authored-by: Uilian Ries <[email protected]> Co-authored-by: rico-chet <[email protected]> Co-authored-by: SSE4 <[email protected]> Co-authored-by: Psy-Kai <[email protected]> * update constrained settings example error message (#2032) * Make the instructions in the note about gcc libcxx ABI compatibility more explicit. (#2037) * More explicit instructions on the Getting Started page * Provide a command to check gccs default configuration value on the Manage gcc >= 5 ABI page. * - document custom template definitions (#2051) Signed-off-by: SSE4 <[email protected]> * Docs for lockfiles features from 1.35 (#2053) * modify command reference * update lock reference * wip * document clean-modified for lockfiles * update bundle docs * document conan lock install * Docs for automatically handle CONAN_RUN_TESTS environment variable (#2056) * wip * wip * update bh docs * Add docs for CMAKE_SH and data in cmakedeps (#2055) * Add docs for CMAKE_SH and data in cmakedeps * remove note box * Update lockfile bundle docs for 1.34.1 (#2040) (#2058) * Update lockfile bundle docs for 1.34.1 * Remove erroneous colon Co-authored-by: Carlos Zoido <[email protected]> Co-authored-by: Jerry Wiltse <[email protected]> * update cconf (#2059) * add confs (#2061) * docs for new msbuilddeps transitivity (#2052) * docs for new msbuilddeps transitivity * fix ci Co-authored-by: czoido <[email protected]> * add docs for patches (#2062) * autotools docs (#2057) * autotools docs * add marker Co-authored-by: czoido <[email protected]> * Feature/tools virtualenv (#2060) * add virtualenv and environment docs * removing env from .gitignore * fix contents Co-authored-by: czoido <[email protected]> * [conf] to define vs version for msvc (#2054) * [conf] to define vs version for msvc * notes about ``conanvcvars.bat`` file creation * fix ci * Update reference/config_files/settings.yml.rst Co-authored-by: Carlos Zoido <[email protected]> * add to conf Co-authored-by: Carlos Zoido <[email protected]> * version 1.35.0 * update changelog Co-authored-by: rico-chet <[email protected]> Co-authored-by: SSE4 <[email protected]> Co-authored-by: James <[email protected]> Co-authored-by: chausner <[email protected]> Co-authored-by: Psy-Kai <[email protected]> Co-authored-by: Daniel <[email protected]> Co-authored-by: Uilian Ries <[email protected]> Co-authored-by: melak47 <[email protected]> Co-authored-by: jsinge <[email protected]> Co-authored-by: Jerry Wiltse <[email protected]>
conan-io · Mar 30, 2021 · 7398981 · 7398981
1 parent 71022d6
commit 7398981
Show file tree

Hide file tree

Showing 34 changed files with 921 additions and 231 deletions.
diff --git a/.ci/publish.jenkins b/.ci/publish.jenkins
@@ -2,6 +2,7 @@
 
 // TODO: Move to a file and avoid modifying CI script
 Map<String, String> versions = [
+        'release/1.35.0': '1.35',
         'release/1.34.1': '1.34',
         'release/1.33.1': '1.33',
         'release/1.32.1': '1.32',
@@ -89,7 +90,7 @@ node('Linux') {
             image.inside {
                 stage('Prepare sources') {
                     writeJSON json: versions, file: "${folderName}/versions.json"
-                    if (folderName != 'latest') { 
+                    if (folderName != 'latest') {
                         sh "rm -fr ${folderName}/_themes/conan"
                         sh "cp -a latest/_themes/. ${folderName}/_themes/"
                     }

diff --git a/.gitignore b/.gitignore
@@ -9,7 +9,6 @@ __pycache__/
 
 # Distribution / packaging
 .Python
-env/
 _build/
 develop-eggs/
 dist/

diff --git a/changelog.rst b/changelog.rst
@@ -18,9 +18,52 @@ Check https://github.com/conan-io/conan for issues and more details about develo
 
 .. important::
 
-    Conan 1.34 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please
+    Conan 1.35 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please
     submit a report on GitHub. Read more about the :ref:`Conan stability commitment<stability>`.
 
+1.35.0 (30-Mar-2021)
+--------------------
+
+- Feature: ``MSBuildDeps`` generator uses new visitor model and handles conditional requirements correctly. `#8733 <https://github.com/conan-io/conan/pull/8733>`_ . Docs `here <https://github.com/conan-io/docs/pull/2052>`__
+- Feature: CMake toolchain supports include_guard() feature `#8728 <https://github.com/conan-io/conan/pull/8728>`_
+- Feature: New ``conan lock bundle clean-modified`` command. `#8726 <https://github.com/conan-io/conan/pull/8726>`_ . Docs `here <https://github.com/conan-io/docs/pull/2053>`__
+- Feature: Use ``conancvvars.bat`` file for Meson toolchain `#8719 <https://github.com/conan-io/conan/pull/8719>`_
+- Feature: Allow arbitrary defines in :command:`conan new` templates. `#8718 <https://github.com/conan-io/conan/pull/8718>`_ . Docs `here <https://github.com/conan-io/docs/pull/2051>`__
+- Feature: Automatically handle `CONAN_RUN_TESTS` to avoid extra boilerplate. `#8687 <https://github.com/conan-io/conan/pull/8687>`_ . Docs `here <https://github.com/conan-io/docs/pull/2056>`__
+- Feature: More fine-grained control (using [conf]) for build parallelization. `#8665 <https://github.com/conan-io/conan/pull/8665>`_ . Docs `here <https://github.com/conan-io/docs/pull/2061>`__
+- Feature: Add support for testing with different tools versions. `#8656 <https://github.com/conan-io/conan/pull/8656>`_
+- Feature: Add different CMake versions for testing. `#8656 <https://github.com/conan-io/conan/pull/8656>`_
+- Feature: Move the definition of CMakeDeps variables to its own file `#8655 <https://github.com/conan-io/conan/pull/8655>`_ . Docs `here <https://github.com/conan-io/docs/pull/2055>`__
+- Feature: Added `conan.tools.files.patch` to apply a single patch (new interface for legacy `conans.tools.patch` function. `#8650 <https://github.com/conan-io/conan/pull/8650>`_ . Docs `here <https://github.com/conan-io/docs/pull/2062>`__
+- Feature: Added `conan.tools.files.apply_conandata_patches` to apply patches defined in `conandata.yml`. `#8650 <https://github.com/conan-io/conan/pull/8650>`_ . Docs `here <https://github.com/conan-io/docs/pull/2062>`__
+- Feature: Allow integers as ``preprocessor_definitions`` in ``CMakeToolchain``. `#8645 <https://github.com/conan-io/conan/pull/8645>`_
+- Feature: New ``Environment`` model for recipes and profiles `#8630 <https://github.com/conan-io/conan/pull/8630>`_ . Docs `here <https://github.com/conan-io/docs/pull/2060>`__
+- Feature: Do not remove sh from the path in the new CMake helper. `#8625 <https://github.com/conan-io/conan/pull/8625>`_ . Docs `here <https://github.com/conan-io/docs/pull/2055>`__
+- Feature: Allow definition of custom Visual Studio version for msvc compiler in MSBuild helpers. `#8603 <https://github.com/conan-io/conan/pull/8603>`_ . Docs `here <https://github.com/conan-io/docs/pull/2054>`__
+- Feature: MSBuildToolchain creates conanvcvars.bat containing vcvars command for command line building. `#8603 <https://github.com/conan-io/conan/pull/8603>`_ . Docs `here <https://github.com/conan-io/docs/pull/2054>`__
+- Feature: Set `CMAKE_FIND_PACKAGE_PREFER_CONFIG=ON`. `#8599 <https://github.com/conan-io/conan/pull/8599>`_
+- Feature: Include the recipe name when constrained settings prevent install. `#8559 <https://github.com/conan-io/conan/pull/8559>`_ . Docs `here <https://github.com/conan-io/docs/pull/2032>`__
+- Feature: Create new conan.tools.files for 2.0. `#8550 <https://github.com/conan-io/conan/pull/8550>`_
+- Feature: New AutotoolsDeps, AutotoolsToolchain helpers in conan.tools.gnu `#8457 <https://github.com/conan-io/conan/pull/8457>`_ . Docs `here <https://github.com/conan-io/docs/pull/2057>`__
+- Feature: Experimental ``conan lock install`` that can install a lockfile in the cache, all the binaries or only the recipes with ``--recipes``, intended for CI flows. `#8021 <https://github.com/conan-io/conan/pull/8021>`_ . Docs `here <https://github.com/conan-io/docs/pull/2053>`__
+- Fix: Fix incorrect output of ``default_user`` and ``default_channel`` in ``export``. `#8732 <https://github.com/conan-io/conan/pull/8732>`_
+- Fix: remotes not being loaded for the :command:`conan alias` command, which was preventing :command:`conan alias` from working if python_requires is used. `#8704 <https://github.com/conan-io/conan/pull/8704>`_
+- Fix: Improve error message for ``lock create`` providing a path instead of full path with filename. `#8695 <https://github.com/conan-io/conan/pull/8695>`_
+- Fix: Rename `tools.microsoft:msbuild_verbosity` to `tools.microsoft.msbuild:verbosity` `#8692 <https://github.com/conan-io/conan/pull/8692>`_ . Docs `here <https://github.com/conan-io/docs/pull/2059>`__
+- Fix: Simplifications to ``CMakeDeps`` generator to remove legacy code. `#8666 <https://github.com/conan-io/conan/pull/8666>`_
+- Fix: Add dirty management in download cache, so interrupted downloads doesn't need a manual cleaning of such download cache. `#8664 <https://github.com/conan-io/conan/pull/8664>`_
+- Fix: Build helper qbs install now installs directly into package_folder. `#8660 <https://github.com/conan-io/conan/pull/8660>`_
+- Fix: Allow arbitrary template structure. `#8641 <https://github.com/conan-io/conan/pull/8641>`_
+- Fix: Restoring the behavior that `exports` and `exports_sources` were case sensitive by default. `#8585 <https://github.com/conan-io/conan/pull/8585>`_
+- Fix: Remove default dummy value for iOS XCode signature. `#8576 <https://github.com/conan-io/conan/pull/8576>`_
+- Fix: Do not order Settings lists, so error messages are in declared order. `#8573 <https://github.com/conan-io/conan/pull/8573>`_
+- BugFix: Command :command:`conan new` accepts short reference with address sign. `#8721 <https://github.com/conan-io/conan/pull/8721>`_
+- Bugfix: Fix profile definitions of env-vars per-package using patterns, not only the package name. `#8688 <https://github.com/conan-io/conan/pull/8688>`_
+- Bugfix: Preserve the explicit value `None` for SCM attributes if the default is a different value. `#8622 <https://github.com/conan-io/conan/pull/8622>`_
+- Bugfix: Properly detect Amazon Linux 2 distro. `#8612 <https://github.com/conan-io/conan/pull/8612>`_
+- Bugfix: Fix config install not working when .git* folder is in the path. `#8605 <https://github.com/conan-io/conan/pull/8605>`_
+- Bugfix: Fix: Transitive python requires not working with the new syntax. `#8604 <https://github.com/conan-io/conan/pull/8604>`_
+
 1.34.1 (10-Mar-2021)
 --------------------
 
@@ -573,7 +616,7 @@ Check https://github.com/conan-io/conan for issues and more details about develo
 
 1.22.0 (05-Feb-2020)
 --------------------
-    
+
 - Feature: Set conan generated CMake targets as `GLOBAL` so that they can be used with an `ALIAS` for consumers. `#6438 <https://github.com/conan-io/conan/pull/6438>`_ . Docs `here <https://github.com/conan-io/docs/pull/1534>`__
 - Feature: Deduce `compiler.base.runtime` for Intel compiler settings when using Visual Studio as the base compiler. `#6424 <https://github.com/conan-io/conan/pull/6424>`_
 - Feature: Allow defining an extra user-defined properties .props file in ``MSBuild`` build helper. `#6374 <https://github.com/conan-io/conan/pull/6374>`_ . Docs `here <https://github.com/conan-io/docs/pull/1533>`__

diff --git a/conf.py b/conf.py
@@ -41,9 +41,9 @@
 ]
 
 # The short X.Y version.
-version = "1.34"
+version = "1.35"
 # The full version, including alpha/beta/rc tags.
-release = u'1.34.1'
+release = u'1.35.0'
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 if not os.path.exists(os.path.join(dir_path, "versions.json")):

diff --git a/extending/template_system/command_new.rst b/extending/template_system/command_new.rst
@@ -100,3 +100,38 @@ This is a very simple example for a header only library:
 
         def package_id(self):
             self.info.header_only()
+
+Custom definitions
+------------------
+
+Sometimes it's needed to provide additional variables for the custom templates. For instance, if 
+it's desired to have ``description`` and ``homepage`` to be templated as well:
+
+
+  .. code-block:: text
+
+    # Recipe autogenerated with Conan {{ conan_version }} using `conan new --template` command
+
+    from conans import ConanFile
+
+
+    class {{package_name}}Conan(ConanFile):
+        name = "{{ name }}"
+        version = "{{ version }}"
+        description = "{{ description }}"
+        homepage = "{{ homepage }}"
+        settings = "os", "arch", "compiler", "build_type"
+        exports_sources = "include/*"
+
+        def package(self):
+            self.copy("*.hpp", dst="include")
+            self.copy("LICENSE.txt", dst="licenses")
+
+        def package_id(self):
+            self.info.header_only()
+
+now it's easy to overwrite these values from the command line:
+
+    .. code-block:: bash
+
+        $ conan new mypackage/version --template=header_only -d homepage=https://www.example.com -d description="the best package"
diff --git a/faq/troubleshooting.rst b/faq/troubleshooting.rst
@@ -8,7 +8,7 @@ When you install or create a package you might have error like the following one
 
 .. code-block:: text
 
-    ERROR: The recipe is constraining settings. Invalid setting 'Linux' is not a valid 'settings.os' value.
+    ERROR: The recipe wtl/10.0.9163 is constraining settings. Invalid setting 'Linux' is not a valid 'settings.os' value.
     Possible values are ['Windows']
     Read "http://docs.conan.io/en/latest/faq/troubleshooting.html#error-the-recipe-is-contraining-settings"
 

diff --git a/getting_started.rst b/getting_started.rst
@@ -119,7 +119,9 @@ An MD5 hash calculator using the Poco Libraries
     .. important::
 
         If you are using **GCC compiler >= 5.1**, Conan will set the ``compiler.libcxx`` to the old
-        ABI for backwards compatibility. You can change this with the following commands:
+        ABI for backwards compatibility. In the context of this getting started example, this is a bad choice though:
+        Recent gcc versions will compile the example by default with the new ABI and linking will fail without further
+        customization of your cmake configuration. You can avoid this with the following commands:
 
         .. code-block:: bash
 

diff --git a/howtos/header_only.rst b/howtos/header_only.rst
@@ -81,14 +81,9 @@ If you want to run the library unit test while packaging, you would need this re
 
     If you are :ref:`cross-building <cross_building>` your **library** or **app** you'll probably need
     to skip the **unit tests** because your target binary cannot be executed in current building host.
-    To do it you can use :ref:`tools_get_env` in combination with
-    :ref:`env_vars_conan_run_tests` environment variable, defined as **False**
-    in profile for cross-building and replace ``cmake.test()`` with:
-
-    .. code-block:: python
-
-        if tools.get_env("CONAN_RUN_TESTS", True):
-            cmake.test()
+    To do it you can use :ref:`env_vars_conan_run_tests` environment variable, defined as **False**
+    in profile for cross-building in the call to ``cmake.test()`` this variable will be evaluated and
+    the tests will not run.
 
 Which will use a ``CMakeLists.txt`` file in the root folder:
 

diff --git a/howtos/manage_gcc_abi.rst b/howtos/manage_gcc_abi.rst
@@ -15,6 +15,13 @@ You can choose which ABI to use in your Conan packages by adjusting the ``compil
 
 When Conan creates the default profile the first time it runs, it adjusts the ``compiler.libcxx`` setting to ``libstdc++`` for backwards
 compatibility. However, if you are using GCC >= 5 your compiler is likely to be using the new CXX11 ABI by default (libstdc++11).
+This can be checked with the following command:
+
+.. code-block:: bash
+
+  $ gcc -v 2>&1 | sed -n 's/.*\(--with-default-libstdcxx-abi=new\).*/\1/p'
+  --with-default-libstdcxx-abi=new
+
 
 If you want Conan to use the new ABI, edit the default profile at ``~/.conan/profiles/default`` adjusting ``compiler.libcxx=libstdc++11``
 or override this setting in the profile you are using.

diff --git a/reference/build_helpers/cmake.rst b/reference/build_helpers/cmake.rst
@@ -335,7 +335,9 @@ test()
 
     def test(args=None, build_dir=None, target=None, output_on_failure=False)
 
-Build `CMake` test target (could be RUN_TESTS in multi-config projects or ``test`` in single-config projects), which usually means building and running unit tests
+Build `CMake` test target (could be RUN_TESTS in multi-config projects or ``test`` in single-config
+projects), which usually means building and running unit tests. When this function is called
+:ref:`env_vars_conan_run_tests` will be evaluated to check if tests should run.
 
 Parameters:
     - **args** (Optional, Defaulted to ``None``): A list of additional arguments to be passed to the ``cmake`` command. Each argument will be escaped according to the current shell. No extra arguments will be added if ``args=None``.

diff --git a/reference/build_helpers/meson.rst b/reference/build_helpers/meson.rst
@@ -89,7 +89,8 @@ test()
 
     def test(args=None, build_dir=None, target=None)
 
-Executes ninja test target, which usually means building and running unit tests.
+Executes ninja test target, which usually means building and running unit tests. When this function
+is called :ref:`env_vars_conan_run_tests` will be evaluated to check if tests should run.
 
 Parameters:
     - **args** (Optional, Defaulted to ``None``): A list of additional arguments to be passed to the ``ninja`` command. Each argument will be escaped

diff --git a/reference/commands/creator/new.rst b/reference/commands/creator/new.rst
@@ -58,6 +58,9 @@ Creates a new package recipe template with a 'conanfile.py' and optionally,
                             excluded
       -ciu CI_UPLOAD_URL, --ci-upload-url CI_UPLOAD_URL
                             Define URL of the repository to upload
+      -d DEFINE, --define DEFINE
+                            Define additional variables to be processed within
+                            template
 
 
 **Examples**:
@@ -93,5 +96,4 @@ Creates a new package recipe template with a 'conanfile.py' and optionally,
       $ conan new mypackage/1.0 --template=myconanfile.py  # Single template file
       $ conan new mypackage/1.0 --template=header_only  # Template directory
 
-
   Refer to the section :ref:`template_command_new` for more information about these templates.
diff --git a/reference/commands/misc/lock.rst b/reference/commands/misc/lock.rst
@@ -5,14 +5,16 @@ conan lock
 
 .. code-block:: bash
 
-    $ conan lock [-h] {update,build-order,clean-modified,create} ...
+    $ conan lock [-h]
+                 {update,build-order,clean-modified,install,create,bundle}
+                 ...
 
 Generates and manipulates lock files.
 
 .. code-block:: text
 
     positional arguments:
-      {update,build-order,clean-modified,create}
+      {update,build-order,clean-modified,install,create,bundle}
                             sub-command help
         update              Complete missing information in the first lockfile
                             with information defined in the second lockfile. Both
@@ -22,7 +24,9 @@ Generates and manipulates lock files.
                             first one
         build-order         Returns build-order
         clean-modified      Clean modified flags
+        install             Install a lockfile
         create              Create a lockfile from a conanfile or a reference
+        bundle              Manages lockfile bundles
 
     optional arguments:
       -h, --help            show this help message and exit
@@ -144,4 +148,104 @@ conan lock clean-modified
         lockfile    Path to the lockfile
 
     optional arguments:
-        -h, --help  show this help message and exit
+        -h, --help  show this help message and exit
+
+conan lock install
+------------------
+
+.. code-block:: bash
+
+    $ conan lock install [-h] [--recipes] [-g GENERATOR] lockfile
+
+.. code-block:: text
+
+    positional arguments:
+    lockfile              Path to the lockfile
+
+    optional arguments:
+    -h, --help            show this help message and exit
+    --recipes             Install only recipes, not binaries
+    -g GENERATOR, --generator GENERATOR
+                            Generators to use
+
+conan lock bundle
+=================
+
+.. code-block:: bash
+
+    $ conan lock bundle [-h] {create,build-order,update,clean-modified} ...
+
+.. code-block:: text
+
+    positional arguments:
+    {create,build-order,update,clean-modified}
+                            sub-command help
+        create              Create lockfile bundle
+        build-order         Returns build-order
+        update              Complete missing information in the first lockfile with information defined in the second lockfile.
+                            Both lockfiles must represent the same graph, and have the same topology with the same identifiers,
+                            i.e. the second lockfile must be an evolution based on the first one
+        clean-modified      Clean modified flag
+
+conan lock bundle create
+------------------------
+
+.. code-block:: bash
+
+    $ conan lock bundle create [-h] [--bundle-out BUNDLE_OUT] lockfiles [lockfiles ...]
+
+.. code-block:: text
+
+    positional arguments:
+    lockfiles             Path to lockfiles
+
+    optional arguments:
+    -h, --help            show this help message and exit
+    --bundle-out BUNDLE_OUT
+                            Filename of the created bundle
+
+conan lock bundle build-order
+-----------------------------
+
+.. code-block:: bash
+
+    $ conan lock bundle build-order [-h] [--json JSON] bundle
+
+.. code-block:: text
+
+    positional arguments:
+    bundle       Path to lockfile bundle
+
+    optional arguments:
+    -h, --help   show this help message and exit
+    --json JSON  generate output file in json format
+
+conan lock bundle update
+------------------------
+
+.. code-block:: bash
+
+    $ conan lock bundle update [-h] bundle
+
+.. code-block:: text
+
+    positional arguments:
+    bundle      Path to lockfile bundle
+
+    optional arguments:
+    -h, --help  show this help message and exit
+
+conan lock bundle clean-modified
+--------------------------------
+
+.. code-block:: bash
+
+    $ conan lock bundle clean-modified [-h] bundle
+
+.. code-block:: text
+
+    positional arguments:
+    bundle      Path to lockfile bundle
+
+    optional arguments:
+    -h, --help  show this help message and exit
diff --git a/reference/conanfile/attributes.rst b/reference/conanfile/attributes.rst
@@ -454,15 +454,15 @@ highest one (with the exceptional assignment in ``configure()`` method which can
 Values from options can be retrieved after they are assigned. For options that belong to the same recipe, the value can
 be retrieved in any method to run logic conditional to their values. **Options from required packages can be
 retrieved only after the full graph has been resolved**, this means that the value will be available in the methods
-``build()``, ``package()``, ``package_info()``. Accessing those values in other methods can lead to unexpected results.
+``validate()``, ``build()``, ``package()``, ``package_info()``. Accessing those values in other methods can lead to unexpected results.
 
 
 .. code-block:: python
 
     class OtherPkg(ConanFile):
         requires = "mypkg/0.1@user/channel"
 
-        def build(self):
+        def validate(self):
             if self.options['mypkg'].shared:
                 raise ConanInvalidConfiguration("Cannot use shared library of requirement 'mypkg'")
 

diff --git a/reference/conanfile/tools.rst b/reference/conanfile/tools.rst
@@ -40,3 +40,5 @@ Contents:
    tools/meson
    tools/microsoft
    tools/qbs
+   tools/env
+   tools/files