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

Update powershell conf to select from powershell and pwsh #17416

Merged
merged 30 commits into from
Dec 16, 2024
Merged

Update powershell conf to select from powershell and pwsh #17416

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
fcd9977
wip
czoido Dec 2, 2024
734c785
wip
czoido Dec 3, 2024
b706bb4
wip
czoido Dec 3, 2024
c307ca9
simplify diff a bit
czoido Dec 4, 2024
9def34e
change conf
czoido Dec 4, 2024
d5cf89e
fix
czoido Dec 4, 2024
1b81b5d
update tests
czoido Dec 4, 2024
e9457c6
wip
czoido Dec 4, 2024
d72091a
wip
czoido Dec 4, 2024
5e0945f
fix tests
czoido Dec 4, 2024
e048ae2
try with commdn
czoido Dec 5, 2024
60c98d3
extend test
czoido Dec 5, 2024
e0b3768
restore test
czoido Dec 5, 2024
876d827
add test
czoido Dec 5, 2024
ae00de8
fix concatenation
czoido Dec 5, 2024
c0fae07
fix test
czoido Dec 5, 2024
c954e9d
Merge branch 'develop2' into pwsh-conf
czoido Dec 5, 2024
4238d63
Merge branch 'develop2' into pwsh-conf
czoido Dec 10, 2024
676ec4b
Merge branch 'develop2' into pwsh-conf
czoido Dec 11, 2024
7c709ee
Merge branch 'develop2' into pwsh-conf
czoido Dec 11, 2024
cdc238d
Merge branch 'develop2' into pwsh-conf
czoido Dec 11, 2024
5948758
Merge branch 'develop2' into pwsh-conf
czoido Dec 12, 2024
6a9c787
Update conan/tools/env/environment.py
czoido Dec 12, 2024
cb2fef7
use string with arguments
czoido Dec 12, 2024
a61ce35
wip
czoido Dec 12, 2024
5317f32
remove choices
czoido Dec 12, 2024
5fc07d2
fix
czoido Dec 13, 2024
0db1335
fix
czoido Dec 13, 2024
116e245
fix logic
czoido Dec 13, 2024
e8a5865
fix test
czoido Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix concatenation
  • Loading branch information
@czoido
czoido committed Dec 5, 2024
commit ae00de8789fb46e12bd161c2ce19e70e70571e64
4 changes: 2 additions & 2 deletions conan/tools/env/environment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def environment_wrap_command(conanfile, env_filenames, env_folder, cmd, subsyste
if bats:
launchers = " && ".join('"{}"'.format(b) for b in bats)
if ps1s:
ps1_launchers = " ; ".join('{} -Command "&\'{}\'"'.format(powershell, f) for f in ps1s)
ps1_launchers = f'{powershell} -Command "' + " ; ".join('&\'{}\''.format(f) for f in ps1s) + '"'
cmd = cmd.replace('"', "'")
return '{} && {} ; cmd /c {}'.format(launchers, ps1_launchers, cmd)
else:
Expand All @@ -72,7 +72,7 @@ def environment_wrap_command(conanfile, env_filenames, env_folder, cmd, subsyste
launchers = " && ".join('. "{}"'.format(f) for f in shs)
return '{} && {}'.format(launchers, cmd)
elif ps1s:
ps1_launchers = " ; ".join('{} -Command "&\'{}\'"'.format(powershell, f) for f in ps1s)
ps1_launchers = f'{powershell} -Command "' + " ; ".join('&\'{}\''.format(f) for f in ps1s) + '"'
cmd = cmd.replace('"', "'")
return '{} ; cmd /c {}'.format(ps1_launchers, cmd)
else:
Expand Down
9 changes: 5 additions & 4 deletions test/functional/toolchains/env/test_virtualenv_powershell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def build(self):
def test_concatenate_build_and_run_env(powershell):
# this tests that if we have both build and run env, they are concatenated correctly when using
# powershell
client = TestClient(path_with_spaces=False)
client = TestClient(path_with_spaces=True)
compiler_bat = "@echo off\necho MYTOOL {}!!\n"
conanfile = textwrap.dedent("""\
import os
Expand Down Expand Up @@ -200,13 +200,14 @@ class Pkg(ConanFile):

client.save({"conanfile.py": conanfile}, clean_first=True)
client.run(f"install . -c tools.env.virtualenv:powershell={powershell}")

cmd = environment_wrap_command(ConanFileMock(),["conanrunenv", "conanbuildenv"],
conanfile = ConanFileMock()
conanfile.conf.define("tools.env.virtualenv:powershell", powershell)
cmd = environment_wrap_command(conanfile,["conanrunenv", "conanbuildenv"],
client.current_folder,"mycompiler0.bat")
client.run_command(cmd)
assert "MYTOOL 0!!" in client.out

cmd = environment_wrap_command(ConanFileMock(),["conanrunenv", "conanbuildenv"],
cmd = environment_wrap_command(conanfile,["conanrunenv", "conanbuildenv"],
client.current_folder,"mycompiler1.bat")
client.run_command(cmd)
assert "MYTOOL 1!!" in client.out
Loading