This is an archive of the discontinued LLVM Phabricator instance.

Differential D135873

Detect Visual Studio automatically in Windows packaging script
ClosedPublic

Authored by pbo-linaro on Oct 13 2022, 6:24 AM.

Details

Reviewers
hans
thieta
compnerd
Commits
rGb1e5e81efda4: Detect Visual Studio automatically in Windows packaging script
Summary

Instead of hardcoding several VS paths, use vswhere.exe (available from
VS 2017) to get latest version available.

Diff Detail

Event Timeline

pbo-linaro created this revision.Oct 13 2022, 6:24 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 13 2022, 6:24 AM
pbo-linaro requested review of this revision.Oct 13 2022, 6:24 AM
Herald added a project: Restricted Project. · View Herald TranscriptOct 13 2022, 6:24 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
pbo-linaro added a parent revision: D135255: Introduce options for Windows packaging script.Oct 13 2022, 6:24 AM
Harbormaster completed remote builds in B191954: Diff 467457.Oct 13 2022, 6:24 AM
pbo-linaro added reviewers: hans, thieta.Oct 13 2022, 6:26 AM
pbo-linaro added a reviewer: compnerd.
hans accepted this revision.Oct 14 2022, 7:15 AM

lgtm

llvm/utils/release/build_llvm_release.bat
90

"use" sounds like it's asking the user to do something. Maybe it should say "using" instead?

This revision is now accepted and ready to land.Oct 14 2022, 7:15 AM
pbo-linaro updated this revision to Diff 467775.Oct 14 2022, 7:28 AM

Replace "use" by "using" for better clarity.

pbo-linaro marked an inline comment as done.Oct 14 2022, 7:29 AM
pbo-linaro added inline comments.
llvm/utils/release/build_llvm_release.bat
90

You're right. I just updated it.

Harbormaster completed remote builds in B192178: Diff 467775.Oct 14 2022, 7:29 AM
thieta accepted this revision.Oct 20 2022, 4:51 AM
thieta added a comment.Oct 20 2022, 5:16 AM

Ah this doesn't fit correctly now that I landed D135255 - can you rebase?

pbo-linaro marked an inline comment as done.Oct 20 2022, 5:17 AM

Yes, I'm doing it! Thanks

pbo-linaro updated this revision to Diff 469180.EditedOct 20 2022, 5:20 AM

Rebased change

Harbormaster completed remote builds in B193198: Diff 469180.Oct 20 2022, 5:21 AM
This revision was landed with ongoing or failed builds.Oct 20 2022, 7:29 AM
Closed by commit rGb1e5e81efda4: Detect Visual Studio automatically in Windows packaging script (authored by pbo-linaro, committed by thieta). · Explain Why
This revision was automatically updated to reflect the committed changes.
thieta added a commit: rGb1e5e81efda4: Detect Visual Studio automatically in Windows packaging script.
thieta added a comment.Oct 20 2022, 7:31 AM

Landed! Thanks for you work on this script!

pbo-linaro added a comment.Oct 20 2022, 7:35 AM

Thanks for your comments and help on all this.

I'll now be able to upstream arm64 support, before coming back on the dependencies script patch.

Revision Contents

PathSize
llvm/
utils/
release/
31 lines

Diff 469228

llvm/utils/release/build_llvm_release.bat

Show First 20 Lines • Show All 77 Lines • ▼ Show 20 Lines
REM Perl (for the OpenMP run-time). REM Perl (for the OpenMP run-time).
REM REM
REM REM
REM For LLDB, SWIG version <= 3.0.8 needs to be used to work around REM For LLDB, SWIG version <= 3.0.8 needs to be used to work around
REM https://github.com/swig/swig/issues/769 REM https://github.com/swig/swig/issues/769
REM REM
:: Detect Visual Studio :: Detect Visual Studio
set vsdevcmd= set vsinstall=
set vs_2019_prefix=C:\Program Files (x86)\Microsoft Visual Studio\2019 set vswhere=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe
:: try potential activated visual studio, then 2019, with different editions
call :find_visual_studio "%VSINSTALLDIR%" if "%VSINSTALLDIR%" NEQ "" (
call :find_visual_studio "%vs_2019_prefix%\Enterprise" echo using enabled Visual Studio installation
hansUnsubmitted
Done
ReplyInline Actions

"use" sounds like it's asking the user to do something. Maybe it should say "using" instead?

hans: "use" sounds like it's asking the user to do something. Maybe it should say "using" instead?
pbo-linaroAuthorUnsubmitted
Done
ReplyInline Actions

You're right. I just updated it.

pbo-linaro: You're right. I just updated it.
call :find_visual_studio "%vs_2019_prefix%\Professional" set "vsinstall=%VSINSTALLDIR%"
call :find_visual_studio "%vs_2019_prefix%\Community" ) else (
call :find_visual_studio "%vs_2019_prefix%\BuildTools" echo using vswhere to detect Visual Studio installation
FOR /F "delims=" %%r IN ('^""%vswhere%" -nologo -latest -products "*" -all -property installationPath^"') DO set vsinstall=%%r
)
set "vsdevcmd=%vsinstall%\Common7\Tools\VsDevCmd.bat"
if not exist "%vsdevcmd%" ( if not exist "%vsdevcmd%" (
echo Can't find any installation of Visual Studio echo Can't find any installation of Visual Studio
exit /b 1 exit /b 1
) )
echo Using VS devcmd: %vsdevcmd% echo Using VS devcmd: %vsdevcmd%
::============================================================================== ::==============================================================================
:: start echoing what we do :: start echoing what we do
▲ Show 20 Lines • Show All 252 Lines • ▼ Show 20 Lines ) else (
set "%arg_name%=%1" set "%arg_name%=%1"
set "arg_name=" set "arg_name="
) )
shift shift
goto :parse_args_start goto :parse_args_start
:parse_args_done :parse_args_done
exit /b 0 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