use string with arguments

conan-io · czoido · Dec 16, 2024 · Dec 2, 2024 · Dec 3, 2024 · Dec 3, 2024
commit cb2fef770200dd358929449aff7be2ae6856b8d2
diff --git a/conan/tools/env/environment.py b/conan/tools/env/environment.py
@@ -52,13 +52,7 @@ def environment_wrap_command(conanfile, env_filenames, env_folder, cmd, subsyste
         raise ConanException("Cannot wrap command with different envs,"
                              "{} - {}".format(bats+ps1s, shs))
 
-    try:
-        powershell = conanfile.conf.get("tools.env.virtualenv:powershell", check_type=str,
-                                        choices=["powershell", "pwsh"]) or "powershell"
-    except ConanException:
-        powershell = "powershell"
-
-    powershell = "powershell.exe" if powershell == "powershell" else "pwsh"
+    powershell = conanfile.conf.get("tools.env.virtualenv:powershell") or "powershell.exe"
 
     if bats:
         launchers = " && ".join('"{}"'.format(b) for b in bats)
@@ -531,7 +525,8 @@ def save_sh(self, file_location, generate_deactivate=True):
     def save_script(self, filename):
         """
         Saves a script file (bat, sh, ps1) with a launcher to set the environment.
-        If the conf "tools.env.virtualenv:powershell" is set to True it will generate powershell
+        If the conf "tools.env.virtualenv:powershell" is not an empty string
+        it will generate powershell
         launchers if Windows.
 
         :param filename: Name of the file to generate. If the extension is provided, it will generate
@@ -548,11 +543,14 @@ def save_script(self, filename):
                 is_ps1 = self._conanfile.conf.get("tools.env.virtualenv:powershell", check_type=bool)
                 ConanOutput().warning(
                     "Boolean values for 'tools.env.virtualenv:powershell' are deprecated. "
-                    "Please use 'powershell' or 'pwsh'. "
-                    "Use `tools.env.virtualenv:powershell=!` to unset the conf, equivalent to the old False value behaviour", warn_tag="deprecated"
+                    "Please specify 'powershell.exe' or 'pwsh' instead, appending arguments if needed "
+                    "(for example: 'powershell.exe -argument'). "
+                    "To unset this configuration, use `tools.env.virtualenv:powershell=!`, which matches "
+                    "the previous 'False' behavior.",
+                    warn_tag="deprecated"
                 )
             except ConanException:
-                is_ps1 = self._conanfile.conf.get("tools.env.virtualenv:powershell", check_type=str, choices=["powershell", "pwsh"])
+                is_ps1 = self._conanfile.conf.get("tools.env.virtualenv:powershell", check_type=str)
             if is_ps1:
                 filename = filename + ".ps1"
                 is_bat = False

diff --git a/conan/tools/microsoft/visual.py b/conan/tools/microsoft/visual.py
@@ -160,7 +160,11 @@ def generate(self, scope="build"):
             is_ps1 = self._conanfile.conf.get("tools.env.virtualenv:powershell", check_type=bool)
             ConanOutput().warning(
                 "Boolean values for 'tools.env.virtualenv:powershell' are deprecated. "
-                "Please use 'powershell' or 'pwsh'.", warn_tag="deprecated"
+                "Please specify 'powershell.exe' or 'pwsh' instead, appending arguments if needed "
+                "(for example: 'powershell.exe -argument'). "
+                "To unset this configuration, use `tools.env.virtualenv:powershell=!`, which matches "
+                "the previous 'False' behavior.",
+                warn_tag="deprecated"
             )
         except ConanException:
             is_ps1 = self._conanfile.conf.get("tools.env.virtualenv:powershell", check_type=str,

diff --git a/test/functional/toolchains/env/test_virtualenv_powershell.py b/test/functional/toolchains/env/test_virtualenv_powershell.py
@@ -30,7 +30,7 @@ def package_info(self):
     """
     client.save({"conanfile.py": conanfile})
     client.run("create .")
-    save(client.cache.new_config_path, "tools.env.virtualenv:powershell=True\n")
+    save(client.cache.new_config_path, "tools.env.virtualenv:powershell=powershell.exe\n")
     return client
 
 
@@ -75,7 +75,7 @@ def build(self):
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows powershell")
-@pytest.mark.parametrize("powershell", ["powershell", "pwsh"])
+@pytest.mark.parametrize("powershell", [True, "powershell.exe", "pwsh"])
 def test_virtualenv_test_package(powershell):
     """ The test_package could crash if not cleaning correctly the test_package
     output folder. This will still crassh if the layout is not creating different build folders
@@ -121,7 +121,7 @@ def test(self):
     assert "MYVC_CUSTOMVAR2=PATATA2" in client.out
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows powershell")
-@pytest.mark.parametrize("powershell", ["powershell", "pwsh"])
+@pytest.mark.parametrize("powershell", [True, "powershell.exe", "pwsh"])
 def test_vcvars(powershell):
     client = TestClient()
     conanfile = textwrap.dedent(r"""
@@ -166,7 +166,7 @@ def build(self):
 
 
 @pytest.mark.skipif(platform.system() != "Windows", reason="Test for powershell")
-@pytest.mark.parametrize("powershell", ["powershell", "pwsh"])
+@pytest.mark.parametrize("powershell", [True, "powershell.exe", "pwsh", "powershell.exe -NoProfile", "pwsh -NoProfile"])
 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