Release/1.48.0 (#2520)

* Remove reference to master banch (#2497)

It no longer exists in conan-io/consan repository

* Added conf information about new apple flags (#2506)

* Fix typo error for os_version in cmake.rst (#2515)

Fix: #2513

* Renamed all the base_source_folder -> export_sources_folder (#2514)

* Renamed all the base_source_folder -> export_sources_folder

* Update package_layout.rst

* Docs for 11112 and 11117 and 11103 (#2512)

* Docs for 11112 and 11117

* Update reference/conanfile/tools/cmake/cmaketoolchain.rst

Co-authored-by: Francisco Ramírez <franchuti688@gmail.com>

* Simplified Build Preset name

Co-authored-by: Francisco Ramírez <franchuti688@gmail.com>

* [CMakeDeps] Added cmake_set_interface_link_directories property info (#2510)

* Added cmake_set_interface_link_directories property info

* Update cmakedeps.rst

* Update reference/conanfile/tools/cmake/cmakedeps.rst

Co-authored-by: Luis Martinez <lasote@gmail.com>

* Update cmakedeps.rst

* Update cmakedeps.rst

Co-authored-by: Luis Martinez <lasote@gmail.com>

* Docs for new autotools templates (#2511)

* add templates

* change argument

* [MSBuildToolchain][conf] Adding extra flags configurations to `MSBuildToolchain` (#2507)

* Added conf information

* Update microsoft.rst

* Update reference/conanfile/tools/microsoft.rst

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>

* Added env info to self.run() command (#2516)

* powershell env docs (#2517)

* powershell env docs

* added warning about env and PATH limits

* fixed CI

* some notes about relocatable libs (#2518)

* Docs: Add PKG_CONFIG_PATH to AutotoolsToolchain (#2509)

* add docs for PKG_CONFIG_PATH in toolchain

* Update reference/conanfile/tools/gnu/autotoolstoolchain.rst

Co-authored-by: Francisco Ramírez <franchuti688@gmail.com>

Co-authored-by: Luis Martinez <lasote@gmail.com>
Co-authored-by: Francisco Ramírez <franchuti688@gmail.com>

* conan 1.48.0

* Example for conanrun (#2519)

* Added example for conanrun launcher

* typo

* Added comments

* Added complete example

* Minimized example

* typo

* Rephrased

* removed path as value

Co-authored-by: Jeremy Lundy <16428663+jlundy2@users.noreply.github.com>
Co-authored-by: Francisco Ramírez <franchuti688@gmail.com>
Co-authored-by: Luca Bonifacio <4151271+lucabonifacio@users.noreply.github.com>
Co-authored-by: Luis Martinez <lasote@gmail.com>
Co-authored-by: James <james@conan.io>

Author: 6 people

.ci/publish.jenkins

@@ -3,6 +3,7 @@
 
 // TODO: Move to a file and avoid modifying CI script
 Map<String, String> versions = [
+        'release/1.48.0': '1.48',
         'release/1.47.0': '1.47',
         'release/1.46.2': '1.46',
         'release/1.45.0': '1.45',

changelog.rst

@@ -18,9 +18,47 @@ Check https://github.com/conan-io/conan for issues and more details about develo
 
 .. important::
 
-    Conan 1.47 shouldn't break any existing 1.0 recipe or command line invocation. If it does, please submit 
+    Conan 1.48 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.48.0 (03-May-2022)
+--------------------
+
+- Feature: Do not recommend to set `PKG_CONFIG_PATH` in markdown generator any more as it is already set by the AutotoolsToolchain. `#11120 <https://github.com/conan-io/conan/pull/11120>`_
+- Feature: The `cmake_layout` declares `folders.generators = "build/generators"` that is common for different configurations, enabling `CMakePresets.json` to support different `configurePresets` and `buildPresets` for single-config and multi-config generators. `#11117 <https://github.com/conan-io/conan/pull/11117>`_ . Docs `here <https://github.com/conan-io/docs/pull/2512>`__
+- Feature: The `CMakeToolchain` generator will create (if missing) a `CMakeUserPresets.json` if the `CMakeLists.txt` file is found in the root folder of the project. That file will include automatically the `CMakePresets.json` file contained at `build/generators` folder to allow CMake and IDEs to locate automatically the presets generated by Conan. `#11117 <https://github.com/conan-io/conan/pull/11117>`_ . Docs `here <https://github.com/conan-io/docs/pull/2512>`__
+- Feature: The `CMAKE_BUILD_TYPE` is not adjusted in the `conan_toolchain.cmake` anymore, the configuration is moved to the `CMakePresets.json` preparing Conan to support multiple "single-config" configurations in one `CMakePresets.json` file `#11112 <https://github.com/conan-io/conan/pull/11112>`_ . Docs `here <https://github.com/conan-io/docs/pull/2512>`__
+- Feature: The `CMakePresets.json` (file generated when specified the `CMakeToolchain` generator) is appended with a new `buildPresets` after a :command:`conan install` with a different `build_type` when using a multiconfiguration generator like `Visual Studio`. `#11103 <https://github.com/conan-io/conan/pull/11103>`_ . Docs `here <https://github.com/conan-io/docs/pull/2512>`__
+- Feature: Removed `PlatformToolset` and added `conantoolchain.props`  from `*.vcxproj` file. `#11101 <https://github.com/conan-io/conan/pull/11101>`_
+- Feature: Append the folder where the Conan generators were installed to `PKG_CONFIG_PATH` in AutotoolsToolchain. `#11063 <https://github.com/conan-io/conan/pull/11063>`_ . Docs `here <https://github.com/conan-io/docs/pull/2509>`__
+- Feature: Adding new ``tools.env.virtualenv:powershell`` conf to opt-in to generate and use powershell scripts instead of .bat ones. `#11061 <https://github.com/conan-io/conan/pull/11061>`_ . Docs `here <https://github.com/conan-io/docs/pull/2517>`__
+- Feature: Added new configuration fields: `tools.apple:enable_bitcode`, `tools.apple:enable_arc` and `tools.apple:enable_visibility`. `#10985 <https://github.com/conan-io/conan/pull/10985>`_ . Docs `here <https://github.com/conan-io/docs/pull/2506>`__
+- Feature: Added new mechanism to inject common Xcode flags in `CMakeToolchain` generator if enabled Bitcode, ARC, or Visibility configurations. `#10985 <https://github.com/conan-io/conan/pull/10985>`_ . Docs `here <https://github.com/conan-io/docs/pull/2506>`__
+- Feature: New templates for autotools exe and lib. `#10978 <https://github.com/conan-io/conan/pull/10978>`_ . Docs `here <https://github.com/conan-io/docs/pull/2511>`__
+- Feature: Change `build_script_folder` argument from the configure to the `Autotools` build helper constructor. `#10978 <https://github.com/conan-io/conan/pull/10978>`_ . Docs `here <https://github.com/conan-io/docs/pull/2511>`__
+- Feature: Replaced `add_definitions` by `add_compile_definitions` in `conan.tools.cmake.*` package. `#10974 <https://github.com/conan-io/conan/pull/10974>`_
+- Feature: Added `cxxflags`, `cflags`, and `ldflags` attributes to `MSBuildToolchain`. `#10972 <https://github.com/conan-io/conan/pull/10972>`_ . Docs `here <https://github.com/conan-io/docs/pull/2507>`__
+- Feature: Added mechanism to inject extra flags to `MSBuildToolchain` via `[conf]`. `#10972 <https://github.com/conan-io/conan/pull/10972>`_ . Docs `here <https://github.com/conan-io/docs/pull/2507>`__
+- Fix: Allow ``Version(self.settings.compiler.version)`` to work for ``new`` tools.scm.Version``. `#11119 <https://github.com/conan-io/conan/pull/11119>`_
+- Fix: Make shared libraries build with Autotools relocatable in Macos by patching the install name (LC_ID_DYLIB) and setting to `@rpath/libname.dylib`. `#11114 <https://github.com/conan-io/conan/pull/11114>`_ . Docs `here <https://github.com/conan-io/docs/pull/2518>`__
+- Fix: using CMAKE_PROJECT_INCLUDE instead of presets to define variables that don't work in toolchains `#11098 <https://github.com/conan-io/conan/pull/11098>`_
+- Fix: Fix quote escaping for defines in pkg_config generator. `#11073 <https://github.com/conan-io/conan/pull/11073>`_
+- Fix: Fix quote escaping for defines in PkgConfigDeps generator. `#11073 <https://github.com/conan-io/conan/pull/11073>`_
+- Fix: Quote `add_compile_definitions` correctly in CMakeToolchain. `#11057 <https://github.com/conan-io/conan/pull/11057>`_
+- Fix: Escape quotes in definitions in CMakeToochain. `#11057 <https://github.com/conan-io/conan/pull/11057>`_
+- Fix: Renamed `self.base_source_folder` to `self.export_source_folder`. That variable was introduced to reference the folder where the `export_sources` are. Currently, they are copied to the `source` folder but might be changed in the future to avoid copying them, so `self.export_source_folder` will always point to the folder containing the `exports_sources`. `#11055 <https://github.com/conan-io/conan/pull/11055>`_ . Docs `here <https://github.com/conan-io/docs/pull/2514>`__
+- Fix: Ensure correct order for libraries in AutotoolsDeps. `#11054 <https://github.com/conan-io/conan/pull/11054>`_
+- Fix: Escape quotes in XCodeDeps generator. `#11039 <https://github.com/conan-io/conan/pull/11039>`_
+- Fix: The `CMakeDeps` generator now set `INTERFACE_LINK_DIRECTORIES` necessary when using auto link `'#pragma comment(lib, "foo")' ` when the required library sets the property `cmake_set_interface_link_directories`. `#10984 <https://github.com/conan-io/conan/pull/10984>`_ . Docs `here <https://github.com/conan-io/docs/pull/2510>`__
+- Fix: Renamed variables from the `CMakeToolchain` context in blocks to be all lowercase. e.g: `CMAKE_OSX_ARCHITECTURES` to `cmake_osx_architectures`. `#10981 <https://github.com/conan-io/conan/pull/10981>`_
+- Bugfix: Avoid ``BazelDeps`` to find a library when a directory with the same name exists. `#11090 <https://github.com/conan-io/conan/pull/11090>`_
+- Bugfix: The `binaryDir` field at `CMakePresets.json` is not set if the `conanfile.build_folder` is not available, avoiding a `null` value breaking the specification. `#11088 <https://github.com/conan-io/conan/pull/11088>`_
+- Bugfix: Fixed unziping while using `tools.get` or `tools.unzip` with the `strip_root=True` in a `tgz` file with hardlinks inside. `#11074 <https://github.com/conan-io/conan/pull/11074>`_
+- Bugfix: The method `get_commit` from the new `conan.tools.scm.Git` was capturing a wrong commit, for example, ignoring commits in subfolders when checking the parent folder. `#11015 <https://github.com/conan-io/conan/pull/11015>`_
+- Bugfix: The `json` generator was showing "None" in the `version` field of the dependencies when the `layout()` method was used. `#10960 <https://github.com/conan-io/conan/pull/10960>`_
+- Bugfix: The config `default_python_requires_id_mode=unrelated_mode` raised an error, it has been fixed. `#10959 <https://github.com/conan-io/conan/pull/10959>`_
+- Bugfix: The CMakeToolchain now declares `CACHE BOOL` variables when a bool is stored in a variable: `toolchain.variables["FOO"] = True`. `#10941 <https://github.com/conan-io/conan/pull/10941>`_
+
 1.47.0 (31-Mar-2022)
 --------------------
 

conf.py

@@ -42,9 +42,9 @@
 ]
 
 # The short X.Y version.
-version = "1.47"
+version = "1.48"
 # The full version, including alpha/beta/rc tags.
-release = u'1.47.0'
+release = u'1.48.0'
 
 dir_path = os.path.dirname(os.path.realpath(__file__))
 if not os.path.exists(os.path.join(dir_path, "versions.json")):

developing_packages/package_layout.rst

@@ -443,8 +443,8 @@ also able to locate the ``my_tool`` correctly, because it is using the same ``fo
 
 
 
-Example: base_source_folder
----------------------------
+Example: export_sources_folder
+-------------------------------
 
 If we have this project, intended to create a package for a third party library which code is located externally:
 
@@ -475,19 +475,18 @@ The ``conanfile.py`` would look like this:
           def source(self):
               # we are inside a "src" subfolder, as defined by layout
               # download something, that will be inside the "src" subfolder
-              base_source = self.base_source_folder
               # access to paches and CMakeLists, to apply them, replace files is done with:
-              mypatch_path = os.path.join(base_source, "patches/mypatch")
-              cmake_path = os.path.join(base_source, "CMakeLists.txt")
+              mypatch_path = os.path.join(self.export_sources_folder, "patches/mypatch")
+              cmake_path = os.path.join(self.export_sources_folder, "CMakeLists.txt")
               # patching, replacing, happens here
 
           def build(self):
-              # If necessary, the build() method also has access to the base_source_folder
+              # If necessary, the build() method also has access to the export_sources_folder
               # for example if patching happens in build() instead of source()
-              cmake_path = os.path.join(self.base_source_folder, "CMakeLists.txt")
+              cmake_path = os.path.join(self.export_sources_folder, "CMakeLists.txt")
 
 
-We can see that the ``Conanfile.base_source_folder`` can provide access to the root folder of the sources:
+We can see that the ``Conanfile.export_sources_folder`` can provide access to the root folder of the sources:
 
 - Locally it will be the folder where the conanfile.py lives
 - In the cache it will be the "source" folder, that will contain a copy of ``CMakeLists.txt`` and ``patches``,

extending/template_system/command_new.rst

@@ -147,5 +147,7 @@ These two templates are related to :ref:`Layouts<conan_tools_layout_predefined_l
 * `meson_exe`: Generates a hello world executable based on modern Conan recipe (layout + generate) using Meson as the build system (since Conan 1.45).
 * `bazel_lib`: Generates a hello world c++ library based on modern Conan recipe (layout + generate) using Bazel as the build system (since Conan 1.47).
 * `bazel_exe`: Generates a hello world executable based on modern Conan recipe (layout + generate) using Bazel as the build system (since Conan 1.47).
+* `autotools_lib`: Generates a hello world c++ library based on modern Conan recipe (layout + generate) using Autotools as the build system (since Conan 1.48).
+* `autotools_exe`: Generates a hello world executable based on modern Conan recipe (layout + generate) using Autotools as the build system (since Conan 1.48).
 
 A full example can be found in :ref:`Creating Packages<packaging_getting_started>` section.

reference/build_helpers/cmake.rst

@@ -199,7 +199,7 @@ The CMake helper will automatically append some definitions based on your settin
 +-------------------------------------------+------------------------------------------------------------------------------------------------------------------------------+
 | CMAKE_SYSROOT                             | Defined if CONAN_CMAKE_SYSROOT is defined as environment variable                                                            |
 +-------------------------------------------+------------------------------------------------------------------------------------------------------------------------------+
-| CMAKE_SYSTEM_VERSION                      | Set to ``self.settings.os_version`` value if cross-building is detected                                                      |
+| CMAKE_SYSTEM_VERSION                      | Set to ``self.settings.os.version`` value if cross-building is detected                                                      |
 +-------------------------------------------+------------------------------------------------------------------------------------------------------------------------------+
 | CONAN_CMAKE_CXX_EXTENSIONS                | Set to ``ON`` or ``OFF`` value when GNU extensions for the given C++ standard are enabled                                    |
 +-------------------------------------------+------------------------------------------------------------------------------------------------------------------------------+

reference/conanfile/attributes.rst

@@ -722,7 +722,7 @@ Exclude patterns are also possible, with the ``!`` prefix:
 Note, if the recipe defines the ``layout()`` method and specifies a ``self.folders.source = "src"`` it won't affect
 where the files (from the ``exports_sources``) are copied. They will be copied to the base source folder. So, if you
 want to replace some file that got into the ``source()`` method, you need to explicitly copy it from the parent folder
-or even better, from ``self.base_source_folder``.
+or even better, from ``self.export_sources_folder``.
 
 
 .. code-block:: python
@@ -744,7 +744,7 @@ or even better, from ``self.base_source_folder``.
           save(self, "CMakeLists.txt", "MISTAKE: Very old CMakeLists to be replaced")
           # Now I fix it with one of the exported files
           shutil.copy("../CMakeLists.txt", ".")
-          shutil.copy(os.path.join(self.base_source_folder, "CMakeLists.txt", "."))
+          shutil.copy(os.path.join(self.export_sources_folder, "CMakeLists.txt", "."))
 
 
 

reference/conanfile/methods.rst

@@ -1381,7 +1381,7 @@ The current folder (``os.getcwd()``) and the ``self.export_sources_folder`` can
             save(os.path.join(self.export_sources_folder, "myfile.txt"), content)
 
 Note, if the recipe defines the ``layout()`` method and specifies a ``self.folders.source = "src"`` it won't change the
-current folder in the ``export_sources`` method. The current dir will be the base source folder (``self.base_source_folder``).
+current folder in the ``export_sources`` method. The current dir will be the base source folder (``self.export_sources_folder``).
 
 The ``self.copy`` support ``src`` and ``dst`` subfolder arguments. The ``src`` is relative to the
 current folder (the one containing the *conanfile.py*). The ``dst`` is relative to the cache

reference/conanfile/other.rst

@@ -48,7 +48,8 @@ Running commands
 .. code-block:: python
 
     run(self, command, output=True, cwd=None, win_bash=False, subsystem=None, msys_mingw=True,
-        ignore_errors=False, run_environment=False, with_login=True):
+        ignore_errors=False, run_environment=False, with_login=True, env="conanbuild"):
+
 
 ``self.run()`` is a helper to run system commands and throw exceptions when errors occur,
 so that command errors do not pass unnoticed. It is just a wrapper for
@@ -89,6 +90,9 @@ Optional parameters:
   Allows executables to be easily run using shared libraries from its dependencies.
 - **with_login** (Optional, Defaulted to ``True``): Pass the ``--login`` flag to :command:`bash` command when using ``win_bash`` parameter.
   This might come handy when you don't want to create a fresh user session for running the command.
+- **env** (Optional, Defaulted to ``conanbuild``): the environment or list of environment activations scripts to pre-pend to the given ``command``.
+  If ``None``, no environment will be pre-pended.
+
 
 .. _conanfile_required_version:
 

reference/conanfile/tools/cmake/cmake.rst

@@ -49,17 +49,18 @@ constructor
 
 .. code:: python
 
-    def __init__(self, conanfile):
+    def __init__(self, conanfile, build_script_folder=None):):
 
 - ``conanfile``: the current recipe object. Always use ``self``.
+- ``build_script_folder``: Relative path to the folder containing the root *CMakeLists.txt*
 
 
 configure()
 +++++++++++
 
 .. code:: python
 
-    def configure(self, variables=None, build_script_folder=None):
+    def configure(self, variables=None):
 
 Reads the ``CMakePresets.json`` file generated by the :ref:`CMakeToolchain<conan-cmake-toolchain>` to get:
 
@@ -78,7 +79,6 @@ and call ``cmake``.
 - ``variables``: should be a dictionary of CMake variables and values, that will be mapped to command line ``-DVAR=VALUE`` arguments.
   Recall that in the general case information to CMake should be passed in ``CMakeToolchain`` to be provided in the ``conan_toolchain.cmake`` file.
   This ``variables`` argument is intended for exceptional cases that wouldn't work in the toolchain approach.
-- ``build_script_folder``: Relative path to the folder containing the root *CMakeLists.txt*
 
 
 build()