Changeset 96431 in vbox

Timestamp:

Aug 23, 2022 8:39:25 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

153261

Message:

ValidationKit/testdriver/vboxinstaller.py: Added options --[no-]-win-install-mscrt to download + install the current MS Visual Studio Redistributable on Windows hosts. See @todo. bugref:10284

File:

• trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py (modified) (4 diffs)

trunk/src/VBox/ValidationKit/testdriver/vboxinstaller.py

@@ -85 +85 @@
         self._fKernelDrivers          = True;
         self._fWinForcedInstallTimestampCA = True;
+        self._fInstallMSCRT = False; # By default we don't install any CRT.
 
     #
@@ -110 +111 @@
         reporter.log('      If not forced, it will only installed on the hosts that needs it.');
         reporter.log('      Default: --no-forced-win-install-timestamp-ca');
+        reporter.log('  --win-install-mscrt, --no-win-install-mscrt');
+        reporter.log('      Whether to install the MS Visual Studio Redistributable.');
+        reporter.log('      Default: --no-win-install-mscrt');
         reporter.log('  --');
         reporter.log('      Indicates the end of our parameters and the start of the sub');
@@ -142 +146 @@
         elif asArgs[iArg] == '--forced-win-install-timestamp-ca':
             self._fWinForcedInstallTimestampCA = True;
+        elif asArgs[iArg] == '--no-win-install-mscrt':
+            self._fInstallMSCRT = False;
+        elif asArgs[iArg] == '--win-install-mscrt':
+            self._fInstallMSCRT = True;
         else:
             return TestDriverBase.parseOption(self, asArgs, iArg);
@@ -925 +933 @@
             return None; # There shouldn't be anything to uninstall, and if there is, it's not our fault.
 
+        #
+        # Install the MS Visual Studio Redistributable, if needed.
+        #
+        # Since VBox 7.0 this is a prerequisite, as we don't ship our own redistributable files anymore.
+        #
+        if self._fInstallMSCRT:
+            reporter.log('Installing MS Visual Studio Redistributable ...');
+            sName = "vc_redist.x64.exe"
+            ## @todo Can we cache this somewhere, so that we don't need to download this everytime?
+            sUrl  = "https://aka.ms/vs/17/release/" + sName # Permalink, according to MS.
+            if webutils.downloadFile(sUrl, sName, self.sBuildPath, reporter.log, reporter.log) is not True:
+                sExe   = os.path.join(self.sBuildPath, sName);
+                asArgs = [ sExe, '/Q' ];
+                fRc2, iRc = self._sudoExecuteSync(asArgs);
+                if fRc2 is False:
+                    reporter.error('Installing MS Visual Studio Redistributable failed, exit code: %s' % (iRc,));
+                    return False;
+                reporter.log('Installing MS Visual Studio Redistributable done');
+
         # We need the help text to detect supported options below.
         reporter.log('Executing: %s' % ([sExe, '--silent', '--help'], ));