Changeset 85811 in vbox

Timestamp:

Aug 18, 2020 9:39:10 AM (4 years ago)

Author:

vboxsync

Message:

configure.vbs: Use start menu items for locating VS 2019 and 2017. The former doesn't seem to have any good registry entries, so this could be good help.

File:

• trunk/configure.vbs (modified) (4 diffs)

trunk/configure.vbs

@@ -816 +816 @@
    end function
 
+   public function checkProgItems(strVersionYear)
+      if m_blnFound = False then
+         dim strCandidate
+         for each strCandidate in CollectFromProgramItemLinks(GetRef("VisualCPPCallback"), strVersionYear)
+            check strCandidate, ""
+         next
+      end if
+      checkProgItems = m_blnFound
+   end function
+
    public function checkInternal
       check g_strPathDev & "/win.amd64/vcc/v14.2",  ""
@@ -826 +836 @@
 end class
 
+function VisualCPPCallback(ByRef arrStrings, cStrings, ByRef strVersionYear)
+   VisualCPPCallback = ""
+   ' We're looking for items with three strings like this:
+   '   C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Visual Studio 2019\Visual Studio Tools\VC\x64 Native Tools Command Prompt for VS 2019.lnk
+   '   C:\Windows\system32\cmd.exe
+   '   /k "C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvars64.bat"
+   if cStrings >= 3 then
+      if InStr(1, arrStrings(0), strVersionYear) > 0 then
+         dim strTail : strTail = "\Auxiliary\Build\vcvars64.bat"""
+         dim str     : str     = arrStrings(UBound(arrStrings))
+         if StrComp(Right(str, Len(strTail)), strTail, vbTextCompare) = 0 then
+            dim offColon : offColon = InStr(1, str, ":")
+            if offColon > 1 then
+               VisualCPPCallback = Mid(str, offColon - 1, Len(str) - (offColon - 2) - Len(strTail))
+            end if
+         end if
+      end if
+   end if
+end function
+
 
 ''
@@ -840 +870 @@
    objState.check strOptVC, strOptVCCommon
    if g_blnInternalFirst = True then objState.checkInternal
+   objState.checkProgItems "2019"
    objState.checkProgFiles "Microsoft Visual Studio\2019\BuildTools\VC"
    objState.checkProgFiles "Microsoft Visual Studio\2019\Professional\VC"
    objState.checkProgFiles "Microsoft Visual Studio\2019\Community\VC"
    objState.checkRegistry "Microsoft\VisualStudio\SxS\VS7\16.0",             "VC", ""        ' doesn't work.
+   objState.checkProgItems "2017"
    objState.checkProgFiles "Microsoft Visual Studio\2017\BuildTools\VC"
    objState.checkProgFiles "Microsoft Visual Studio\2017\Professional\VC"
@@ -2062 +2094 @@
    CheckForQt           strOptQt5, strOptQt5Infix
    CheckForPython       strOptPython
-
    CfgPrintAssign "VBOX_WITH_LIBVPX",  "" '' @todo look for libvpx 1.1.0+
    CfgPrintAssign "VBOX_WITH_LIBOPUS", "" '' @todo look for libopus 1.2.1+
                                           '' @todo look for yasm
+                                          '' @todo look for nasm
+
    EnvPrintAppend "PATH", DosSlashes(g_strPath & "\tools\win." & g_strHostArch & "\bin"), ";"
    if g_strHostArch = "amd64" then