Changeset 103037 in vbox

Timestamp:

Jan 24, 2024 5:20:52 PM (12 months ago)

Author:

vboxsync

Message:

Main/Python: Windows installer fixes. bugref:10579

File:

• trunk/src/VBox/Installer/win/VBoxMergePython.wxi (modified) (2 diffs)

trunk/src/VBox/Installer/win/VBoxMergePython.wxi

@@ -30 +30 @@
 
 <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
-    <!-- Python bindings -->
+    <!-- Python bindings ("installer\python" folder) -->
     <Component Id="cp_VBoxPyInst" Guid="C9A40306-5102-11DE-A7BA-C3C555D89593" Win64="$(var.Property_Win64)">
          <File Id="file_vboxapisetup.py" Name="vboxapisetup.py"
@@ -38 +38 @@
     <Directory Id="dir_VBoxPythonSDKVBoxAPI" Name="vboxapi">
         <Component Id="cp_VBoxPyMod" Guid="DF19CB76-5102-11DE-943B-13C755D89593" Win64="$(var.Property_Win64)">
-            <File Id="file___init__.py" Name="__init__.py"
-                  Source="$(env.PATH_OUT)\bin\sdk\installer\python\vboxapi\__init__.py"
+            <File Id="file_setup.py" Name="setup.py"
+                  Source="$(env.PATH_OUT)\bin\sdk\installer\python\vboxapi\setup.py"
                   DiskId="$(var.Property_DiskIdCommon)" />
-            <File Id="file_VirtualBox_constants.py" Name="VirtualBox_constants.py"
-                  Source="$(env.PATH_OUT)\bin\sdk\installer\python\vboxapi\VirtualBox_constants.py"
+            <File Id="file_pyproject.toml" Name="pyproject.toml"
+                  Source="$(env.PATH_OUT)\bin\sdk\installer\python\vboxapi\pyproject.toml"
                   DiskId="$(var.Property_DiskIdCommon)" />
+            <Directory Id="dir_VBoxPythonSDKVBoxAPISrc" Name="src">
+                <Directory Id="dir_VBoxPythonSDKVBoxAPISrcRoot" Name="vboxapi">
+                    <File Id="file___init__.py" Name="__init__.py"
+                          Source="$(env.PATH_OUT)\bin\sdk\installer\python\vboxapi\src\vboxapi\__init__.py"
+                          DiskId="$(var.Property_DiskIdCommon)" />
+                    <File Id="file_VirtualBox_constants.py" Name="VirtualBox_constants.py"
+                          Source="$(env.PATH_OUT)\bin\sdk\installer\python\vboxapi\src\vboxapi\VirtualBox_constants.py"
+                          DiskId="$(var.Property_DiskIdCommon)" />
+                </Directory>
+            </Directory>
         </Component>
     </Directory>