Merge branch 'release/1.41' into develop

conan/tools/env/environment.py

@@ -203,7 +203,7 @@ def save_bat(self, filename, generate_deactivate=True, pathsep=os.pathsep):
             for %%v in ({vars}) do (
                 set foundenvvar=
                 for /f "delims== tokens=1,2" %%a in ('set') do (
-                    if "%%a" == "%%v" (
+                    if /I "%%a" == "%%v" (
                         echo set %%a=%%b>> "deactivate_{filename}"
                         set foundenvvar=1
                     )

conans/client/generators/__init__.py

@@ -72,7 +72,7 @@ def __init__(self):
                                 "MesonToolchain", "MSBuildDeps", "QbsToolchain", "msbuild",
                                 "VirtualRunEnv", "VirtualBuildEnv", "AutotoolsDeps",
                                 "AutotoolsToolchain", "BazelDeps", "BazelToolchain", "PkgConfigDeps",
-                                "VCVars"]
+                                "VCVars", "IntelCC"]
 
     def add(self, name, generator_class, custom=False):
         if name not in self._generators or custom:
@@ -119,6 +119,9 @@ def _new_generator(self, generator_name, output):
         elif generator_name == "VCVars":
             from conan.tools.microsoft import VCVars
             return VCVars
+        elif generator_name == "IntelCC":
+            from conan.tools.intel import IntelCC
+            return IntelCC
         elif generator_name == "QbsToolchain" or generator_name == "QbsProfile":
             from conan.tools.qbs.qbsprofile import QbsProfile
             return QbsProfile

conans/test/integration/toolchains/intel/test_intel_cc.py

@@ -0,0 +1,64 @@
+import platform
+import textwrap
+
+import pytest
+
+from conans.test.utils.tools import TestClient
+
+conanfile = textwrap.dedent("""\
+[generators]
+IntelCC
+""")
+
+intelprofile = textwrap.dedent("""\
+[settings]
+os=%s
+arch=x86_64
+arch_build=x86_64
+compiler=intel-cc
+compiler.mode=dpcpp
+compiler.version=2021.3
+compiler.libcxx=libstdc++
+build_type=Release
+[options]
+
+[build_requires]
+[env]
+CC=dpcpp
+CXX=dpcpp
+
+[conf]
+tools.intel:installation_path=%s
+""")
+
+
+def get_intel_cc_generator_file(os_, installation_path, filename):
+    profile = intelprofile % (os_, installation_path)
+    client = TestClient()
+    client.save({
+        "conanfile.txt": conanfile,
+        "intelprofile": profile,
+    })
+    client.run("install . -pr intelprofile")
+    return client.load(filename)
+
+
+@pytest.mark.skipif(platform.system() != "Windows", reason="Requires Windows")
+def test_intel_cc_generator_windows():
+    os_ = "Windows"
+    installation_path = "C:\\Program Files (x86)\\Intel\\oneAPI"
+    conanintelsetvars = get_intel_cc_generator_file(os_, installation_path, "conanintelsetvars.bat")
+    expected = textwrap.dedent("""\
+        @echo off
+        call "C:\\Program Files (x86)\\Intel\\oneAPI\\setvars.bat" intel64
+        """)
+    assert conanintelsetvars == expected
+
+
+@pytest.mark.skipif(platform.system() != "Linux", reason="Requires Linux")
+def test_intel_cc_generator_linux():
+    os_ = "Linux"
+    installation_path = "/opt/intel/oneapi"
+    conanintelsetvars = get_intel_cc_generator_file(os_, installation_path, "conanintelsetvars.sh")
+    expected = '. "/opt/intel/oneapi/setvars.sh" intel64'
+    assert conanintelsetvars == expected

conans/test/unittests/tools/env/test_env.py

@@ -285,26 +285,30 @@ def test_windows_case_insensitive():
     env.define("MYVAR", "MyValueB")
     env.define("MyVar1", "MyValue1A")
     env.append("MYVAR1", "MyValue1B")
+    env.define("MyVar2", "MyNewValue2")
     folder = temp_folder()
 
     display_bat = textwrap.dedent("""\
         @echo off
         echo MyVar=%MyVar%!!
         echo MyVar1=%MyVar1%!!
+        echo MyVar2=%MyVar2%!!
         """)
 
     with chdir(folder):
         env.save_bat("test.bat")
         save("display.bat", display_bat)
         cmd = "test.bat && display.bat && deactivate_test.bat && display.bat"
         out, _ = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
-                                  shell=True).communicate()
+                                  shell=True, env={"MYVAR2": "OldValue2"}).communicate()
 
     out = out.decode()
     assert "MyVar=MyValueB!!" in out
     assert "MyVar=!!" in out
     assert "MyVar1=MyValue1A MyValue1B!!" in out
     assert "MyVar1=!!" in out
+    assert "MyVar2=MyNewValue2!!" in out
+    assert "MyVar2=OldValue2!!" in out
 
 
 def test_dict_access():