Changeset 104453 in vbox for trunk/src/VBox/Installer/win/VBoxMergeApp.wxs

Timestamp:

Apr 29, 2024 8:09:47 AM (9 months ago)

Author:

vboxsync

Message:

Windows host installer: Upgraded to WIX v4 (4.0.5). This is a massive change that accumulates the transition from WIX v3 -> v4 where the WIX XML scheme as well as the build system has changed. See comments for details. bugref:10644

File:

• trunk/src/VBox/Installer/win/VBoxMergeApp.wxs (modified) (5 diffs)

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

@@ -1 @@
-<?xml version="1.0"?>
-<!--
+<!--
     VirtualBox Windows Installation Script (WiX)
 -->
@@ -25 +24 @@
 -->
 
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
-     xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
     <?include Defines.wxi ?>
@@ -45 +43 @@
          Old upgrade code of innotek: UpgradeCode="F5FFAEBF-97AE-4038-8F91-4DE719456127" -->
 
-    <Module Id="msm_VBoxApp"
-            Language="!(loc.LANG)"
-            Version="$(var.Property_Version)">
-
-        <Package Id="d255feb6-597d-4f49-a170-e34f289fa0d3"
-                 Keywords="Installer, Setup"
-                 Description="$(env.VBOX_PRODUCT) $(var.Property_VersionExt) installation package"
-                 Comments="$(env.VBOX_PRODUCT) installation package"
-                 Manufacturer="$(env.VBOX_VENDOR)"
-                 InstallerVersion="200"
-                 AdminImage="yes"
-                 InstallPrivileges="elevated"
-                 Platform="$(var.Property_Platform)"
-                 SummaryCodepage="1252"/>
+    <Module Id="msm_VBoxApp" Language="!(loc.LANG)" Version="$(var.Property_Version)" Guid="d255feb6-597d-4f49-a170-e34f289fa0d3" 
+            InstallerVersion="200">
+            
+        <SummaryInformation Keywords="Installer, Setup" 
+                            Description="$(env.VBOX_PRODUCT) $(var.Property_VersionExt) installation package" 
+                            Manufacturer="$(env.VBOX_VENDOR)" />
 
         <?include CommonProperties.wxi ?>
@@ -64 +54 @@
 
         <Property Id="local_VBOX_REGISTERFILEEXTENSIONS" Value="Empty" />
-        <Configuration Name="argRegisterExtensions" Format="Text" DefaultValue="Not passed"/>
-        <Substitution Table="CustomAction" Row="registerExtensions" Column="Target" Value="[=argRegisterExtensions]"/>
+        <Configuration Name="argRegisterExtensions" Format="Text" DefaultValue="Not passed" />
+        <Substitution Table="CustomAction" Row="registerExtensions" Column="Target" Value="[=argRegisterExtensions]" />
         <CustomAction Id="registerExtensions" Property="local_VBOX_REGISTERFILEEXTENSIONS" Value="[local_VBOX_REGISTERFILEEXTENSIONS]" Execute="immediate" />
 
         <!-- Here comes the file/directory list -->
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="msm_VBoxApplicationFolder" FileSource=".">
-
-                <?include VBoxMergeApp.wxi ?>
-
-            </Directory> <!-- msm_VBoxApplicationFolder directory -->
-        </Directory> <!-- TARGETDIR -->
+         <!-- TARGETDIR -->
 
         <!-- Custom actions -->
@@ -82 +66 @@
 
         <InstallExecuteSequence>
-            <Custom Action="registerExtensions" After="AppSearch"/>
+            <Custom Action="registerExtensions" After="AppSearch" />
             <?include VBoxMergeAppSeq.wxi ?>
         </InstallExecuteSequence>
 
-    </Module>
+    
+            <Directory Id="msm_VBoxApplicationFolder" FileSource=".">
+
+                <?include VBoxMergeApp.wxi ?>
+
+            </Directory> <!-- msm_VBoxApplicationFolder directory -->
+        </Module>
 </Wix>