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

Timestamp:

Nov 15, 2024 11:20:04 AM (5 months ago)

Author:

vboxsync

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

165955

Message:

Installer/win: Specify the architecture/platform when invoking 'wix build'. The minimum MSI installer version for windows/arm64 is 5.0 (500). Some other arm64 adjustments. jiraref:VBP-1442

Location:

trunk/src/VBox/Installer/win

Files:

• Defines.wxi (modified) (3 diffs)
• Makefile.kmk (modified) (10 diffs)
• VirtualBox.wxs (modified) (2 diffs)

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

@@ -34 +34 @@
 
   <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
+      <?define VBoxProperty_MsiInstallerVersion = "200" ?>
       <?define Property_ProgramFiles = "StandardDirectory" ?>
       <?define Property_Platform     = "x64" ?>
@@ -39 +40 @@
       <?define Property_Bitness      = "always64" ?>
 
-      <?if $(env.VBOX_SIGNING_MODE)!= none ?>
+      <?if $(env.VBOX_SIGNING_MODE) != "none" ?>
           <?define Property_DriverLegacy = "no" ?>
       <?else?>
           <?define Property_DriverLegacy = "yes" ?>
       <?endif?>
+  <?endif?>
 
-  <?else?>
+  <?if $(env.KBUILD_TARGET_ARCH) = "arm64" ?>
+      <?define VBoxProperty_MsiInstallerVersion = "500" ?>
+      <?define Property_ProgramFiles = "StandardDirectory" ?>
+      <!-- Property_Platform     = "Arm64" - doesn't seem to be used anywhere. -->
+      <!-- Property_IsWin64      = "yes"   - doesn't seem to be used anywhere. -->
+      <?define Property_Bitness      = "always64" ?>
+      <!-- Property_DriverLegacy = "no"    - doesn't seem to be used anywhere. -->
+  <?endif?>
+
+  <?if $(env.KBUILD_TARGET_ARCH) = "x86" ?>
+      <?define VBoxProperty_MsiInstallerVersion = "200" ?>
       <?define Property_ProgramFiles = "ProgramFilesFolder" ?>
       <?define Property_Platform     = "x86" ?>
@@ -51 +63 @@
       <?define Property_Bitness      = "always32" ?>
 
-      <?if $(env.VBOX_SIGNING_MODE)!= none ?>
+      <?if $(env.VBOX_SIGNING_MODE) != "none" ?>
           <!-- Note: Settings this to 'no' breaks Windows 2000 installs (!) -->
           <?define Property_DriverLegacy = "yes" ?>

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -100 +100 @@
 VBOX_WIN_INST_OUT_DIR      := $(PATH_TARGET)/Installer/win
 VBOX_WIN_INST_REPACK_DIR   := $(PATH_OUT)/repack
+
+# Translate our architecture names to MSI platform/arch.
+VBOX_INS_PROD_ARCH.amd64 = x64
+VBOX_INS_PROD_ARCH.arm64 = Arm64
+VBOX_INS_PROD_ARCH.x86   = Intel
+VBOX_INS_PROD_ARCH := $(VBOX_INS_PROD_ARCH.$(KBUILD_TARGET_ARCH))
+ifeq ($(VBOX_INS_PROD_ARCH),)
+ $(error VBOX_INS_PROD_ARCH is empty!)
+endif
 
 # Note: en_US *must* come first for the dependency file generation.
@@ -622 +631 @@
         kmk_time $$(REDIRECT_EXT) $(VBOX_WIN_INST_ENV) -E WIX_TEMP='$$(subst /,\,$$(@D))' \
                 -- $(VBOX_TOOLS_WIN_WIX_BIN) build \
-                -defaultcompressionlevel high \
+                -arch "$(VBOX_INS_PROD_ARCH)" \
+                -defaultcompressionlevel "$(VBOX_CAB_COMPRESSION_LEVEL)" \
                 -intermediatefolder $$(@D)/wix-temp/ \
                 -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
@@ -682 +692 @@
         kmk_time $$(REDIRECT_EXT) $(VBOX_WIN_INST_ENV) -E WIX_TEMP='$$(subst /,\,$$(@D))' \
                 -- $(VBOX_TOOLS_WIN_WIX_BIN) build \
-                -defaultcompressionlevel high \
+                -arch "$(VBOX_INS_PROD_ARCH)" \
+                -defaultcompressionlevel "$(VBOX_CAB_COMPRESSION_LEVEL)" \
                 -intermediatefolder $$(@D)/wix-temp/ \
                 -loc $(VBOX_WIN_INST_OUT_DIR)/NLS/Language_$(lang).wxl \
@@ -776 +787 @@
                 -- \
                 $(VBOX_TOOLS_WIN_WIX_BIN) build $(filter-out $(VBOX_VERSION_STAMP),$<) \
-                        -defaultcompressionlevel high \
+                        -arch "$(VBOX_INS_PROD_ARCH)" \
+                        -defaultcompressionlevel "$(VBOX_CAB_COMPRESSION_LEVEL)" \
                         -intermediatefolder $(@D)/wix-temp/ \
                         $(VBOX_TOOLS_WIN_WIX_EXT) \
@@ -818 +830 @@
                 -- \
                 $(VBOX_TOOLS_WIN_WIX_BIN) build $(filter-out $(VBOX_VERSION_STAMP),$$<) \
-                        -defaultcompressionlevel high \
+                        -arch "$(VBOX_INS_PROD_ARCH)" \
+                        -defaultcompressionlevel "$(VBOX_CAB_COMPRESSION_LEVEL)" \
                         -intermediatefolder $$(@D)/wix-temp/ \
                         $(VBOX_TOOLS_WIN_WIX_EXT) \
@@ -969 +982 @@
         kmk_time $$(REDIRECT_EXT) -E WIX_TEMP='$$(subst /,\,$$(@D))' $(VBOX_WIN_INST_ENV) \
                 -- $(VBOX_TOOLS_WIN_WIX_BIN) build \
+                -arch "$(VBOX_INS_PROD_ARCH)" \
                 -defaultcompressionlevel none \
                 -intermediatefolder $$(@D)/wix-temp/ \
@@ -991 +1005 @@
 
 # Create WISUMINFO argument.
-VBOX_INS_PROD_ARCH.amd64 = x64
-VBOX_INS_PROD_ARCH.arm64 = Arm64
-VBOX_INS_PROD_ARCH.x86   = Intel
-VBOX_INS_PROD_ARCH := $(VBOX_INS_PROD_ARCH.$(KBUILD_TARGET_ARCH))
-ifeq ($(VBOX_INS_PROD_ARCH),)
- $(error VBOX_INS_PROD_ARCH is empty!)
-endif
 VBOX_INS_PROD_LANG := 7="$(VBOX_INS_PROD_ARCH);1033
 $(foreach lang, $(filter-out en_US,$(VBOX_INSTALLER_LANGUAGES))\
@@ -1004 +1011 @@
 
 # The multilingual installer rule.
+$(call KB_FN_AUTO_CMD_DEPS,$(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG).msi)
 $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG).msi \
 + $(VBOX_WIN_INST_REPACK_DIR)/2-multilingual-$(PACKAGE_NAME_LANG).cmd: \
                 $(VBOX_WIN_INST_OUT_DIR)/en_US/$(PACKAGE_NAME_LANG)_en_US.msi \
                 $(foreach lang,$(filter-out en_US,$(VBOX_INSTALLER_LANGUAGES)),$(VBOX_WIN_INST_OUT_DIR)/$(lang)/$(lang).mst)
+        $(call KB_FN_AUTO_CMD_DEPS_COMMANDS)
         $(call MSG_L1,Creating final multilingual MSI)
         $(QUIET)$(RM) -f -- \
@@ -1018 +1027 @@
 
         $(REDIRECT) -C $(@D) -- cscript.exe /nologo $(VBOX_PATH_WISUBSTG) $(@F)
+        $(REDIRECT) -C $(@D) -- cscript.exe /nologo $(VBOX_PATH_WISUMINFO) $@
         $(REDIRECT) -C $(@D) -- cscript.exe /nologo $(VBOX_PATH_WISUMINFO) $@ $(VBOX_INS_PROD_LANG)
+        $(REDIRECT) -C $(@D) -- cscript.exe /nologo $(VBOX_PATH_WISUMINFO) $@
         $(call VBOX_SIGN_MSI_FN,$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing)
 
@@ -1034 +1045 @@
                 'call sign-sha1.cmd $(@F) || exit /b1' \
                 ) ) \
-        $(if-expr defined(VBOX_WITH_COMBINED_PACKAGE),'copy /y "$(@F)" "$(notdir $(PACKAGE_NAME_FINAL))" || exit /b1',) \
+                $(if-expr defined(VBOX_WITH_COMBINED_PACKAGE),'copy /y "$(@F)" "$(notdir $(PACKAGE_NAME_FINAL))" || exit /b1',) \
                 '@echo Created multilanguage MSI: $(notdir $(PACKAGE_NAME_FINAL))'
-
-# Copy multilingual installer to bin.
+        $(call MSG_L1,Start validation of "$@" - errors will be ignored)
+        -$(REDIRECT) -- $(VBOX_TOOLS_WIN_WIX_BIN) msi validate "$@"
+        $(call MSG_L1,Finished validating "$@" - any errors was ignored)
+
+
+# Copy multilingual installer to bin, deleting any older .msi files to avoid wasting space.
 $(PACKAGE_NAME_FINAL): $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG).msi | $$(dir $$@)
         $(QUIET)$(RM) -f $(wildcard $(@D)/$(PACKAGE_BASE)-r*$(if-expr defined(VBOX_WITH_COMBINED_PACKAGE),_$(KBUILD_TARGET_ARCH),).msi)

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

@@ -54 +54 @@
 <?endif?>
 
-    <Package UpgradeCode="C4BAD770-BFE8-4D2C-A592-693028A7215B" Name="$(env.VBOX_PRODUCT) $(env.VBOX_VERSION_STRING)" Language="!(loc.LANG)" Version="$(var.Property_Version)" Manufacturer="$(env.VBOX_VENDOR)" InstallerVersion="200"><SummaryInformation Keywords="Installer" Description="$(env.VBOX_PRODUCT) $(var.Property_VersionExt) installation package" Manufacturer="$(env.VBOX_VENDOR)" />
+    <Package UpgradeCode="C4BAD770-BFE8-4D2C-A592-693028A7215B" Name="$(env.VBOX_PRODUCT) $(env.VBOX_VERSION_STRING)"
+        Language="!(loc.LANG)" Version="$(var.Property_Version)" Manufacturer="$(env.VBOX_VENDOR)"
+        InstallerVersion="$(var.VBoxProperty_MsiInstallerVersion)">
+
+        <SummaryInformation Keywords="Installer"
+            Description="$(env.VBOX_PRODUCT) $(var.Property_VersionExt) installation package" Manufacturer="$(env.VBOX_VENDOR)" />
 
     <?include CommonProperties.wxi ?>
 
+    <!-- @todo indentation is wrong here and it goes on to about line 525. -->
     <!-- Global properties -->
     <Property Id="ARPPRODUCTICON" Value="IconVirtualBox" />
@@ -80 +86 @@
     <?include PublicProperties.wxi ?>
 
-    <!-- Make sure installation will not start on anything other but the NT family -->
-<?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
+    <!-- Make doubly sure we're on 64-bit windows NT.
+         Note! This is normally checked by  -->
     <Launch Condition="VersionNT64" Message="!(loc.Only64Bit)" />
-<?else?>
-    <Launch Condition="NOT VersionNT64" Message="!(loc.Only32Bit)" />
-
-    <Launch Condition="NOT VersionNT=500 AND NOT Version9X AND NOT VersionNT64" Message="!(loc.WrongOS)" />
-
-<?endif?>
 
     <Launch Condition="Privileged" Message="!(loc.NeedAdmin)" />