Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

new win_bash mechanism #9194

Merged
merged 36 commits into from Jul 6, 2021
Merged

new win_bash mechanism #9194

merged 36 commits into from Jul 6, 2021

Conversation

lasote
Copy link
Contributor

@lasote lasote commented Jul 2, 2021 •
edited

Changelog: Feature: New self.win_bash mechanism to enable running commands in a bash shell in Windows. It works only with the new environment definition from the dependencies (env_buildinfo and run_buildinfo) as long as the new AutotoolsToolchain, AutotoolsDeps and Autotools build helper. It supports automatic conversion of the environment variables values declared as "path" according to the declared subsystem in the conf tools.win.bash:subsystem, that is not being auto-detected anymore.
Docs: conan-io/docs#2152

Closes #8883
Closes #9068

lasote added 27 commits June 24, 2021 09:11
@lasote
some changes
73506dc
@lasote
Environment Automanage
e69f71b
@lasote
Fixing tests
f34addc
@lasote
Merge remote-tracking branch 'origin/develop' into feature/env_automa…
399a745 
…nage
@lasote
Divided into VirtualRunEnv and VirtualBuildEnv
3031e6b
@lasote
Register environment and VCVARS
8c82077
@lasote
VirtualRunEnv is by default generated but not activated. Scripts are …
cd5b7ca 
…stored as full paths in the list
@lasote
Renamed var
b70f2ef
@lasote
Merged develop
852e6fa
@lasote
Fix v2 cmake template
fb1f043
@lasote
Very prelimilar stuff
964d74f
@lasote
Fixed win test
b093a93
@lasote
Merge remote-tracking branch 'lasote/feature/env_automanage' into fea…
dd3e5a7 
…ture/env_automanage
@lasote
unused arg
0054e88
@lasote
Added test
3398383
@lasote
Merged environment branch
382c273
@lasote
WIP but working. Missing tests
a3774ae
@lasote
Merge remote-tracking branch 'origin/develop' into feature/win_bash_new
14e01ff
@lasote
Broken, extract save scripts
a8ae751
@lasote
refactor
d1e0ede
@lasote
bug
d967f63
@lasote
Refactor in progress
d3f8f96
@lasote
Refactor, not tested in windows
0fd8032
@lasote
Mac fixes, go to win again
4bdd5af
@lasote
Working on windows
26fd301
@lasote
Self win_bash
bc5bb55
@lasote
Merged develop
c627cb6
@lasote lasote requested a review from memsharded July 2, 2021 09:51
memsharded
memsharded reviewed Jul 2, 2021
View reviewed changes
Copy link
Member

@memsharded memsharded left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't look that bad on the surface, indeed a couple of ugly definitions, like propagating the conanfile to _EnvItem, but maybe worth the value of the proposal.

conan/tools/env/__init__.py Outdated Show resolved Hide resolved
conan/tools/microsoft/__init__.py Outdated Show resolved Hide resolved
conan/tools/microsoft/win.py Outdated Show resolved Hide resolved
conan/tools/microsoft/win.py Outdated Show resolved Hide resolved
conan/tools/microsoft/win.py Outdated Show resolved Hide resolved
conans/model/conan_file.py Outdated Show resolved Hide resolved
@lasote lasote marked this pull request as ready for review July 2, 2021 14:08
@lasote
Copy link
Contributor Author

lasote commented Jul 2, 2021

Now it is not passing conanfile to _EnvValue only to needed methods.

@lasote lasote added this to the 1.39 milestone Jul 2, 2021
memsharded
memsharded approved these changes Jul 5, 2021
View reviewed changes
Copy link
Member

@memsharded memsharded left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some minor comments, but this is looking great, lets discuss those minor things and lets merge it.

conan/tools/env/environment.py Show resolved Hide resolved
conan/tools/microsoft/__init__.py Show resolved Hide resolved
conan/tools/microsoft/subsystems.py Show resolved Hide resolved
conan/tools/microsoft/subsystems.py Outdated Show resolved Hide resolved
conans/test/functional/toolchains/gnu/autotools/test_win_bash.py Show resolved Hide resolved
conans/test/integration/environment/test_env.py Outdated Show resolved Hide resolved
@lasote lasote mentioned this pull request Jul 6, 2021
Closed
memsharded
memsharded approved these changes Jul 6, 2021
View reviewed changes
Copy link
Member

@memsharded memsharded left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, lets merge it!

@memsharded memsharded merged commit 5012375 into conan-io:develop Jul 6, 2021
@lasote lasote mentioned this pull request Jul 8, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@memsharded memsharded memsharded approved these changes

Assignees

@memsharded memsharded

Labels
None yet
Projects
None yet
Milestone
1.39
Development

Successfully merging this pull request may close these issues.

[feature] win_bash new approach [bug] unix_path() uses WSL path flavor on Windows
2 participants
@lasote @memsharded