Changeset 103038 in vbox for trunk/src/VBox/Installer

Timestamp:

Jan 24, 2024 5:42:19 PM (12 months ago)

Author:

vboxsync

Message:

Main/Python: Windows installer fixes. ​bugref:10579

Location:

trunk/src/VBox/Installer/win

Files:

• VBoxMergePython.wxi (modified) (3 diffs)
• VirtualBox.wxs (modified) (1 diff)

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

@@ -37 +37 @@
     </Component>
     <Directory Id="dir_VBoxPythonSDKVBoxAPI" Name="vboxapi">
-        <Component Id="cp_VBoxPyMod" Guid="DF19CB76-5102-11DE-943B-13C755D89593" Win64="$(var.Property_Win64)">
+        <Component Id="cp_VBoxPySetup" Guid="" Win64="$(var.Property_Win64)">
             <File Id="file_setup.py" Name="setup.py"
                   Source="$(env.PATH_OUT)\bin\sdk\installer\python\vboxapi\setup.py"
@@ -44 +44 @@
                   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">
+        </Component>
+        <Directory Id="dir_VBoxPythonSDKVBoxAPISrc" Name="src">
+            <Directory Id="dir_VBoxPythonSDKVBoxAPISrcRoot" 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\src\vboxapi\__init__.py"
@@ -52 +54 @@
                           Source="$(env.PATH_OUT)\bin\sdk\installer\python\vboxapi\src\vboxapi\VirtualBox_constants.py"
                           DiskId="$(var.Property_DiskIdCommon)" />
-                </Directory>
+                </Component>
             </Directory>
-        </Component>
+        </Directory>
     </Directory>
     <Component Id="cp_VBoxPyDel" Guid="D3C59511-E148-49FA-ADFF-718F2FF1B07A" Win64="$(var.Property_Win64)">

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -512 +512 @@
     <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
         <ComponentRef Id="cp_VBoxPyInst" />
+        <ComponentRef Id="cp_VBoxPySetup" />
         <ComponentRef Id="cp_VBoxPyMod" />
         <ComponentRef Id="cp_VBoxPyDel" />