Changeset 70631 in vbox

Timestamp:

Jan 18, 2018 2:38:27 PM (7 years ago)

Author:

vboxsync

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

120355

Message:

Installer/win: move the VBoxSDS and unattended template components to the right place, fixing MSM packaging variant

File:

• trunk/src/VBox/Installer/win/VirtualBox.wxs (modified) (2 diffs)

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

@@ -427 +427 @@
         <ComponentRef Id="cp_MainCOM_x86" />
     <?endif ?>
-        <ComponentRef Id="cp_MainCOM" />
+    <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" />
         <ComponentRef Id="cp_ProxyStubLegacy" />
     <?endif?>
-        <ComponentRef Id="cp_MainBinaries" />
+    <ComponentRef Id="cp_MainBinaries" />
     <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
         <ComponentRef Id="cp_QtPlatforms" />
@@ -448 +451 @@
         <ComponentRef Id="cp_VBoxWebService" />
     <?endif ?>
-        <ComponentRef Id="cp_VBoxCAPI" />
-        <ComponentRef Id="cp_VBoxDrv" />
-<?endif ?>
-
-<?if $(env.VBOX_WITH_UNATTENDED) = "yes" ?>
+    <ComponentRef Id="cp_VBoxCAPI" />
+    <?if $(env.VBOX_WITH_UNATTENDED) = "yes" ?>
         <!-- unattended template component -->
         <ComponentRef Id="cp_UnattendedTemplates" />
-<?endif ?>
-
-<?if $(env.VBOX_WITH_SDS) = "yes" ?>
-        <ComponentRef Id="cp_VBoxSDS" />
+    <?endif ?>
+    <ComponentRef Id="cp_VBoxDrv" />
 <?endif ?>