Changeset 107383 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Dec 19, 2024 2:24:31 PM (4 weeks ago)

Author:

vboxsync

Message:

Windows host installer: Fixed MSI installer validator warnings: Removed the component "cp_VBoxSDS" and integrated it into component "cp_MainCOM", as VBoxSDS references files from "cp_MainCOM". bugref:10828

Location:

trunk/src/VBox/Installer/win

Files:

• VBoxMergeApp.wxi (modified) (2 diffs)
• VirtualBox.wxs (modified) (1 diff)

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

@@ -94 +94 @@
         <!-- Include the auto-generated TypeLib block -->
         <?include $(env.PATH_TARGET)\VirtualBox_TypeLib.wxi ?>
-    </Component>
 
 <?if $(env.VBOX_WITH_SDS) = "yes" ?>
-    <Component Id="cp_VBoxSDS" Guid="{3DC151E0-CA53-4213-8711-D983FDA28132}">
-        <File Id="VBoxSDS" Name="VBoxSDS.exe" Vital="yes" KeyPath="yes" Source="$(env.PATH_OUT)\bin\VBoxSDS.exe">
-        </File>
-        <!--
-            The Name of windows service is referenced in different places.
-            Don't forget to change it in other places too If you change it here :
-                VirtualBox.idl (module name),
-                VBoxSDS.cpp and VBoxProxyStub.cpp
-            -->
+        <File Id="VBoxSDS" Name="VBoxSDS.exe" Vital="yes" Source="$(env.PATH_OUT)\bin\VBoxSDS.exe" />
+
+        <!-- The name of the Windows service is referenced in different places.
+             Don't forget to change it in other places too If you change it here :
+               - VirtualBox.idl (module name),
+               - VBoxSDS.cpp and VBoxProxyStub.cpp -->
         <ServiceInstall Id="VBoxSDSInstall" Account="LocalSystem" Type="ownProcess"
                         Name="VBoxSDS" DisplayName="VirtualBox system service"
@@ -113 +109 @@
         </ServiceInstall>
         <ServiceControl Id="VBoxSDSControl" Name="VBoxSDS" Stop="both" Remove="uninstall" />
-    </Component>
-<?endif?>
+<?endif?>
+    </Component>
 
 <?if $(env.VBOX_WITH_MIDL_PROXY_STUB) = "yes" ?>

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

@@ -275 +275 @@
     <?endif?>
     <ComponentRef Id="cp_MainCOM" />
-    <?if $(env.VBOX_WITH_SDS) = "yes" ?>
-        <ComponentRef Id="cp_VBoxSDS" />
-    <?endif?>
     <?if $(env.VBOX_WITH_MIDL_PROXY_STUB) = "yes" ?>
         <ComponentRef Id="cp_ProxyStub" />