fixing virtualbuildenv (#4583)

* fixing virtualbuildenv

* fixing broken tests

* test

conans/client/generators/virtualbuildenv.py

@@ -12,7 +12,10 @@ def __init__(self, conanfile):
         compiler = conanfile.settings.get_safe("compiler")
         if compiler == "Visual Studio":
             self.env = VisualStudioBuildEnvironment(conanfile).vars_dict
-            self.env.update(vcvars_dict(conanfile.settings, output=conanfile.output))
+            settings_vars = vcvars_dict(conanfile.settings, output=conanfile.output)
+            for env_var in self.env:
+                self.env[env_var].extend(settings_vars.pop(env_var, []))
+            self.env.update(settings_vars)
         else:
             self.env = AutoToolsBuildEnvironment(conanfile).vars_dict
 

conans/client/generators/virtualenv.py

@@ -6,7 +6,7 @@
 
 class VirtualEnvGenerator(Generator):
 
-    append_with_spaces = ["CPPFLAGS", "CFLAGS", "CXXFLAGS", "LIBS", "LDFLAGS", "CL"]
+    append_with_spaces = ["CPPFLAGS", "CFLAGS", "CXXFLAGS", "LIBS", "LDFLAGS", "CL", "_LINK_"]
 
     def __init__(self, conanfile):
         self.conanfile = conanfile

conans/test/functional/generators/cmake_generator_test.py

@@ -1,7 +1,5 @@
-import unittest
 import os
-
-from nose.plugins.attrib import attr
+import unittest
 
 from conans import tools
 from conans.test.utils.tools import TestClient
@@ -40,6 +38,7 @@ def build(self):
 os_build={os_build}
 """
 
+
 class CMakeGeneratorTest(unittest.TestCase):
 
     def _check_build_generator(self, os_build, generator):

conans/test/integration/build_environment_test.py

@@ -1,8 +1,11 @@
 import platform
 import unittest
+from textwrap import dedent
 
 from conans.paths import CONANFILE
 from conans.test.utils.tools import TestClient
+from conans.test.utils.cpp_test_files import cpp_hello_conan_files
+
 
 mylibh = '''
 double mean(double a, double b);
@@ -59,9 +62,8 @@ def package_info(self):
 
 class BuildEnvironmenTest(unittest.TestCase):
 
+    @unittest.skipUnless(platform.system() == "Linux", "Requires Linux")
     def use_build_virtualenv_test(self):
-        if platform.system() != "Linux":
-            return
         client = TestClient(path_with_spaces=False)
         client.save({CONANFILE: conanfile, "mean.cpp": mylib, "mean.h": mylibh})
         client.run("export . lasote/stable")
@@ -108,3 +110,37 @@ def build(self):
         client.run("install . --build missing")
         client.run("build .")
         self.assertIn("15", client.user_io.out)
+
+    @unittest.skipUnless(platform.system() == "Windows", "Requires windows")
+    def use_build_virtualenv_windows_test(self):
+        files = cpp_hello_conan_files("hello", "0.1",  use_cmake=False, with_exe=False)
+        client = TestClient(path_with_spaces=False)
+        client.save(files)
+        client.run("create . user/testing")
+        files = cpp_hello_conan_files("hello2", "0.1", deps=["hello/0.1@user/testing"],
+                                      use_cmake=False, with_exe=False)
+        client.save(files, clean_first=True)
+        client.run("create . user/testing")
+
+        reuse_conanfile = dedent('''
+            from conans import ConanFile
+
+            class ConanReuseLib(ConanFile):
+                requires = "hello2/0.1@user/testing"
+                generators = "virtualbuildenv"
+                settings = "os", "compiler", "build_type", "arch"
+
+                def build(self):
+                    self.run('activate_build.bat && cl /c /EHsc hello.cpp')
+                    self.run('activate_build.bat && lib hello.obj -OUT:helloapp.lib')
+                    self.run('activate_build.bat && cl /EHsc main.cpp helloapp.lib')
+            ''')
+
+        reuse = cpp_hello_conan_files("app", "0.1", deps=["hello2/0.1@user/testing"],
+                                      use_cmake=False)
+        reuse["conanfile.py"] = reuse_conanfile
+        client.save(reuse, clean_first=True)
+        client.run("install .")
+        client.run("build .")
+        client.runner("main.exe", cwd=client.current_folder)
+        self.assertIn("Hello app;Hello hello2;Hello hello", ";".join(str(client.out).splitlines()))