Adding autodetection for Visual Studio 2019

[kuhnel]

Summary

The current autodetection from VS2017 does not work with VS2019 as it
requires an additional parameter "-products *". I'm not sure if this
parameter is backwards compatible, so I propose to add a new
"autodetect19" option to be safe here.

See https://github.com/microsoft/vswhere/issues/103 for the bug description.

[gkistanova]

Hello Christian,

This is what I see with the VS 2019 Community Edition:

> "%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer\\vswhere.exe" -latest -property installationPath
C:\Program Files (x86)\Microsoft Visual Studio\2019\Community

What kind of Visual Studio 2019 do you have a problem detecting?

[kuhnel]

@gkistanova I'm using the build-tools only installation (without GUI), as configured in the Dockerfile in D82873.
You should be able to run the commands in a local shell to get the exact same installation.

[gkistanova]

https://reviews.llvm.org/rZORG0e45046f4212 should fix this for you.

[kuhnel]

already fixed in https://reviews.llvm.org/rZORG0e45046f4212

buildbot/osuosl/master/config/builders.py

return [
                                           '-DLLVM_TARGETS_TO_BUILD=X86'])},
 
         {'name' : "clang-x86-ninja-win10",
          'slavenames' : ["windows10-vs2019"],
          'builddir' : "clang-x86-ninja-win10",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                         clean=True,
                         checkout_lld=False,
-                        vs="autodetect",
+                        # autodetection Visual Studio 2019 installation                       
+                        vs="autodetect19",
+                        # Compile for 32bit windows
                         vs_target_arch='x86',
                         testStage1=True,
                         useTwoStage=True,
                         stage1_config='Release',
                         stage2_config='Release',
                         extra_cmake_args=['-DLLVM_ENABLE_ASSERTIONS=ON',
                                           '-DLLVM_TARGETS_TO_BUILD=X86',
+                                          # enable SCCACHE
                                           '-DCMAKE_C_COMPILER_LAUNCHER=sccache',
                                           '-DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
                                           ])},
 
     ]
 
 # Polly builders.
 def _get_polly_builders():

zorg/buildbot/builders/Util.py

if vs.lower() == "autodetect":
 
         It doesn't work when VS is not installed at the default location.
         """
 
         # TODO: Implement autodetect for VS versions other than 2017
         vcvars_command = "for /f \"tokens=* USEBACKQ\" %%F in " \
                             "(`\"%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer\\vswhere.exe\" -latest -property installationPath`) DO " \
                             "\"%%F\"\\VC\\Auxiliary\\Build\\vcvarsall.bat"
+    elif vs.lower() == "autodetect19":
+        # The autodetection does not work with Vistual Studio 2019, see https://github.com/microsoft/vswhere/issues/103
+        # We need an additional "-products *" argument. Not sure if this is backwards-compatible with all
+        # Visual Studio 2017versions, so creating a separate option for this.
+        vcvars_command = "for /f \"tokens=* USEBACKQ\" %%F in " \
+                            "(`\"%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer\\vswhere.exe\" -products * -latest -property installationPath`) DO " \
+                            "\"%%F\"\\VC\\Auxiliary\\Build\\vcvarsall.bat"
     else:
         # Older versions of VS
         vcvars_command = "\"" + "\\".join((vs, '..','..','VC', 'vcvarsall.bat')) + "\""
 
     vcvars_command = "%s %s && set" % (vcvars_command, arch_arg)
     return vcvars_command
 
 def extractSlaveEnvironment(exit_status, stdout, stderr):