Detect Visual Studio in Windows packaging script

[pbo-linaro]

Summary

Instead of hardcoding a specific VS install, try sequentially:

• %VSINSTALLDIR% (already set from a vs prompt)
• 2019/Enterprise
• 2019/Professional
• 2019/Community
• 2019/BuildTools

It stops when one is found and set vsdevcmd env var.

[hans]

lgtm

[pbo-linaro]

@hans Would that be possible for you to merge it again please?

If that's annoying for you, I can request commit access (have at least 2 more patches coming for this script).
Thanks.

[tschuett]

Phabricator supports stacks. Up right you will find Edit Related Revisions... You could upload your whole list of patches,

[pbo-linaro]

@tschuett Thanks, I'll try that :)

[thieta]

llvm/utils/release/build_llvm_release.bat

56

I wonder if we should allow 2022 here as well. At least with a switch or something. LLVM should work with it and I don't see any reason for users to install 2019 just for this?

[pbo-linaro]

llvm/utils/release/build_llvm_release.bat

56

I'm 100% ok to select VS2022 by default (and fallback to 2019 if needed).
Do you know if everything is building fine under that newer version?

[thieta]

llvm/utils/release/build_llvm_release.bat

56

Yeah we build with 2022 and haven't seen any problems. Maybe after your patch with switches we could introduce a switch to force a VS version if more than one is installed?

[pbo-linaro]

llvm/utils/release/build_llvm_release.bat

56

Great. Is that ok for you to introduce this after that patch? Or I can edit, and add 2022 selection in this one.

[thieta]

llvm/utils/release/build_llvm_release.bat

56

I think it's fine doing it like this now and then adding a new commit that adds vs2022 support.

[hans]

llvm/utils/release/build_llvm_release.bat

56

Okay, i will go ahead and commit this now then.

[compnerd]

llvm/utils/release/build_llvm_release.bat

339

I think that this is better done through vswhere which is packaged up in the Visual Studio installation as of 2019 and newer.

SET vswhere=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe
FOR /F "delims=" %%r IN ('^""%vswhere%" -nologo -latest -products "*" -all -prerelease -property installationPath^"') DO set VsDevCmd=%%r\Common7\Tools\VsDevCmd.bat

Will give you the path to the latest vsdevcmd available in VsDevCmd. It will also implicitly scan different editions, and avoids the need to scan for it manually.

[pbo-linaro]

llvm/utils/release/build_llvm_release.bat

339

As VS2019 was hardcoded before, I thought their was a strong requirement to use this, so I didn't go the vswhere way.
As we discussed about adding a VS2022 flag, I can switch to that if others prefer it.

After trying, on my machine, it says:
$ "%vswhere%" -nologo -latest -products "*" -all -prerelease -property installationPath
C:\Program Files\Microsoft Visual Studio\2022\Preview

Alas, I definitely don't want to use a preview to compile this, but maybe there is a switch or something to have only stable.
I'd like to leave an override possibilty (detecting a VS prompt), so people can do as they want.

@hans @thieta Do you prefer that one?

[thieta]

Vswhere has a million options so I bet we can get it to find whatever we want. What I like about that approach is that it is not relying on hardcoded paths and it will work on any setup.

I think if possible we should do this:

1. if we are in a dev shell - use that
2. if the user pass --vs2022 - try to find latest vs22 installed (exclude preview if possible)
3. find latest non-preview version installed.
4. no vswhere or no VS installed - error out.

[pbo-linaro]

Sounds good. Could we drop the idea for --vs2022 option?
A user can still open a VS prompt if he needs to overwrite thing (and that simplifies the script).

[thieta]

In D135173#3840684, @pbo-linaro wrote:

Sounds good. Could we drop the idea for --vs2022 option?
A user can still open a VS prompt if he needs to overwrite thing (and that simplifies the script).

Yes that's fine!

[pbo-linaro]

I'll make another patch for this change then.

llvm/utils/release/build_llvm_release.bat

-@echo on
+@echo off
 setlocal enabledelayedexpansion
 
 if "%1"=="" goto usage
 goto begin
 
 :usage
 echo Script for building the LLVM installer on Windows,
 echo used for the releases at https://github.com/llvm/llvm-project/releases

 REM   Visual Studio 2019 SDK and Nuget (for the clang-format plugin),
 REM   Perl (for the OpenMP run-time).
 REM
 REM
 REM   For LLDB, SWIG version <= 3.0.8 needs to be used to work around
 REM   https://github.com/swig/swig/issues/769
 
 
-REM You need to modify the paths below:
-set vsdevcmd=C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\Tools\VsDevCmd.bat
+set vsdevcmd=
+set vs_2019_prefix=C:\Program Files (x86)\Microsoft Visual Studio\2019
+:: try potential activated visual studio, then 2019, with different editions
+call :find_visual_studio "%VSINSTALLDIR%"
+call :find_visual_studio "%vs_2019_prefix%\Enterprise"
+call :find_visual_studio "%vs_2019_prefix%\Professional"
+call :find_visual_studio "%vs_2019_prefix%\Community"
+call :find_visual_studio "%vs_2019_prefix%\BuildTools"
+if not exist "%vsdevcmd%" (
+  echo Can't find any installation of Visual Studio
+  exit /b 1
+)
+echo Using VS devcmd: %vsdevcmd%
 
+:: start echoing what we do
+@echo on
 set python32_dir=C:\Users\%USERNAME%\AppData\Local\Programs\Python\Python310-32
 set python64_dir=C:\Users\%USERNAME%\AppData\Local\Programs\Python\Python310
 
 set revision=llvmorg-%1
 set package_version=%1
 set build_dir=%cd%\llvm_package_%package_version%
 
 echo Revision: %revision%
) else (
     set "arg_name="
   )
   shift
   goto :parse_args_start
 
 :parse_args_done
 exit /b 0
 ::==============================================================================
+:find_visual_studio
+set "vs_install=%~1"
+if "%vs_install%" == "" exit /b 1
+
+if "%vsdevcmd%" NEQ "" exit /b 0 :: already found
+
+set "candidate=%vs_install%\Common7\Tools\VsDevCmd.bat"
+echo trying VS devcmd: %candidate%
+if exist "%candidate%" set "vsdevcmd=%candidate%"
+exit /b 0