Changeset 103028 in vbox for trunk/src/VBox/Installer/win/InstallHelper

Timestamp:

Jan 24, 2024 3:53:59 PM (16 months ago)

Author:

vboxsync

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

161263

Message:

Main/Python: Big revamp to modernize our vboxapi Python package to now use a so-called src-layout, which also can be used with pip directly. Also added compatibility w/ Python 3.12 where distutils are not shipped anymore. We also now do have automatic linting for our code, which hopefully should improve quality in this area. Moved some Python-related files into an own sub folder so that it's more clear to which these belong to. The "sdk/installer" directories also have an own "python" sub directory where the stuff resides now. The Windows installer also uses "sdk/installer" instead of "sdk/install", to match the other platforms. bugref:10579

File:

• trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (2 diffs)

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

@@ -608 +608 @@
      */
     /* Get the VBox API setup string. */
-    WCHAR wszVBoxSDKPath[RTPATH_MAX];
-    rcWin = VBoxGetMsiProp(hModule, L"CustomActionData", wszVBoxSDKPath, RT_ELEMENTS(wszVBoxSDKPath));
+    WCHAR wszVBoxPythonInstallerPath[RTPATH_MAX];
+    rcWin = VBoxGetMsiProp(hModule, L"CustomActionData", wszVBoxPythonInstallerPath, RT_ELEMENTS(wszVBoxPythonInstallerPath));
     if (rcWin == ERROR_SUCCESS)
     {
         /* Make sure our current working directory is the VBox installation path. */
-        if (SetCurrentDirectoryW(wszVBoxSDKPath))
+        if (SetCurrentDirectoryW(wszVBoxPythonInstallerPath))
         {
             /* Set required environment variables. */
-            if (SetEnvironmentVariableW(L"VBOX_INSTALL_PATH", wszVBoxSDKPath))
-            {
-                logStringF(hModule, "InstallPythonAPI: Invoking vboxapisetup.py in \"%ls\" ...", wszVBoxSDKPath);
+            if (SetEnvironmentVariableW(L"VBOX_INSTALL_PATH", wszVBoxPythonInstallerPath)) /** @todo BUGBUG r=andy That can't be right! */
+            {
+                logStringF(hModule, "InstallPythonAPI: Invoking vboxapisetup.py in \"%ls\" ...", wszVBoxPythonInstallerPath);
 
                 rcWin = procRun(hModule, wszPythonExe, L"vboxapisetup.py install");
@@ -650 +650 @@
         else
             logStringF(hModule, "InstallPythonAPI: Could set working directory to \"%ls\": LastError=%u",
-                       wszVBoxSDKPath, GetLastError());
+                       wszVBoxPythonInstallerPath, GetLastError());
     }
     else