Skip to content

New Environment approach for creating environment files with build/host profile and win_bash - #9755

Merged
memsharded merged 28 commits into
conan-io:developfrom
memsharded:fix/dual_profile_env_error
Oct 25, 2021
Merged

memsharded merged 28 commits into
conan-io:developfrom
memsharded:fix/dual_profile_env_error

Conversation

@memsharded

@memsharded memsharded commented Oct 6, 2021

Copy link
Copy Markdown
Member

Changelog: Feature: Decoupled Environment as an abstract environment representation (do not depend on conanfile), and EnvVars, as the specialization for a given conanfile, settings/settings_build, and win_bash.
Changelog: Fix: Renamed group argument in Environment classes to scope, that can get "build" and "run" values.
Changelog: Fix: New win_bash behavior failed for dual profile, the new computation of subsystem paths completely depend now on defined settings, but not on platform.system() or auto-detection.
Docs: conan-io/docs#2279

#tags: slow

@memsharded memsharded added this to the 1.41.1 milestone Oct 6, 2021
@memsharded
memsharded changed the base branch from release/1.41 to develop October 14, 2021 07:49
@memsharded memsharded changed the title tests that prove bad behavior New Environment approach for creating environment files with build/host profile and win_bash Oct 14, 2021
@memsharded
memsharded requested review from czoido and lasote October 14, 2021 07:50
@memsharded memsharded modified the milestones: 1.41.1, 1.42 Oct 14, 2021
@memsharded
memsharded marked this pull request as ready for review October 14, 2021 15:45
@tapia tapia removed their assignment Oct 20, 2021
Comment thread conan/tools/env/environment.py Outdated
Comment thread conan/tools/microsoft/subsystems.py
Comment thread conans/client/command.py Outdated
memsharded and others added 4 commits October 21, 2021 17:01
Co-authored-by: Luis Martinez de Bartolome Izquierdo <lasote@gmail.com>
Co-authored-by: Luis Martinez de Bartolome Izquierdo <lasote@gmail.com>
…an-io#9801)

The compiler variable here must not be a NoneType object to use `in`.
This will result in an error when attempting to package a header-only library.
This commit fixes this check.
It first verifies the compiler is not None before checking it.
…onan-io#9752)

* Fix typo where fPIC option is not templated, so it is always enabled

* Fix typo where fPIC option is not templated, so it is always enabled

* Add name to contributors

* Don't add fPIC functionality when it is not set

* Add unit tests

* Remove extra newlines

* Use "ON" and "OFF" for fPIC value in CMake

* Fix typos

* Correctly setup options for ConanFile Mocks

* Add missing fixture annotations

* Initialize options and default options dictionaries and fix Windows test

* Properly check if the OS is Windows

* Fix more typos

* Make sure to set OS as Windows for unit test ConanFiles

* Revert "Properly check if the OS is Windows"

This reverts commit 7eebbde.
memsharded and others added 10 commits October 22, 2021 13:24
* rename ConanFileInterface.new_cpp_info

* wip

* wip
* - CMakeDeps: add cmake_target_aliases property

Signed-off-by: SSE4 <tomskside@gmail.com>

* - automatically deduce an alias target

Signed-off-by: SSE4 <tomskside@gmail.com>

* Update conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aliases.py

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

* Update conans/test/functional/toolchains/cmake/cmakedeps/test_cmakedeps_aliases.py

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

* - add comment

Signed-off-by: SSE4 <tomskside@gmail.com>

* - use cpp_info instead of new_cpp_info

Signed-off-by: SSE4 <tomskside@gmail.com>

* - remove useless checks

Signed-off-by: SSE4 <tomskside@gmail.com>

* - show a warning if target already exists

Signed-off-by: SSE4 <tomskside@gmail.com>

* - test case for cmake_target_name/cmake_target_namespace

Signed-off-by: SSE4 <tomskside@gmail.com>

Co-authored-by: Luis Martinez de Bartolome Izquierdo <lasote@gmail.com>
* Fixed all the tests in Windows

* Added mingw32-g++ tool for Windows

* Get rid of mingw32-g++ specific tool

* Changed appending symbol to overwriting one
Comment thread conans/test/integration/toolchains/env/test_virtualenv_winbash.py Outdated
Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
@memsharded
memsharded merged commit 5bfa017 into conan-io:develop Oct 25, 2021
@memsharded
memsharded deleted the fix/dual_profile_env_error branch October 25, 2021 16:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants