Changeset 107374 in vbox for trunk/src/VBox/Additions

Timestamp:

Dec 18, 2024 11:51:03 PM (4 weeks ago)

Author:

vboxsync

Message:

Add/Nt/Installer: Use solid lzma compression as it reduces the installer size by half. Introduced experimental VBOX_WITH_NATIVE_NSIS_INSTALLER build config option (only works for amd64 & x86).

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• InstallHelper/Makefile.kmk (modified) (2 diffs)
• Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/Makefile.kmk

@@ -76 +76 @@
 VBoxGuestInstallHelperDll_TEMPLATE        := VBoxGuestInstallHelperDllTemplateWithFewerLibs
 VBoxGuestInstallHelperDll_NAME            := VBoxGuestInstallHelper
-VBoxGuestInstallHelperDll_BLD_TRG_ARCH    := x86
+ifndef VBOX_WITH_NATIVE_NSIS_INSTALLER
+ VBoxGuestInstallHelperDll_BLD_TRG_ARCH   := x86
+endif
 VBoxGuestInstallHelperDll_INST            := repackadd/resources/VBoxGuestInstallHelperDll/
 ifdef VBOX_SIGN_ADDITIONS # (See the parent makefile.)
@@ -85 +87 @@
 if1of ($(KBUILD_TARGET_ARCH), x86)
  VBoxGuestInstallHelperDll_DEFS           += _WIN32_WINNT=0x0400
- VBoxGuestInstallHelperDll_VBOX_IMPORT_CHECKER.win.x86 := nt4
+ VBoxGuestInstallHelperDll_VBOX_IMPORT_CHECKER.win.x86   := nt4
 else if1of ($(KBUILD_TARGET_ARCH), amd64)
  VBoxGuestInstallHelperDll_DEFS           += _WIN32_WINNT=0x0501
- VBoxGuestInstallHelperDll_VBOX_IMPORT_CHECKER.win.x86 := xp
+ VBoxGuestInstallHelperDll_VBOX_IMPORT_CHECKER.win.x86   := xp
+ VBoxGuestInstallHelperDll_VBOX_IMPORT_CHECKER.win.amd64 := xp64
 else
  VBoxGuestInstallHelperDll_DEFS           += _WIN32_WINNT=0x0a00
- VBoxGuestInstallHelperDll_VBOX_IMPORT_CHECKER.win.x86 := w8
+ VBoxGuestInstallHelperDll_VBOX_IMPORT_CHECKER.win.x86   := w8
+ VBoxGuestInstallHelperDll_VBOX_IMPORT_CHECKER.win.arm64 := w10-1709
 endif
 VBoxGuestInstallHelperDll_SOURCES         := \

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -293 +293 @@
                 ,-E '$(base)=$(firstword $($(base)) none)' -E '$(base)_TS=$(firstword $($(base)_TS) none)')
 
+# Notes on SetCompressor: solid + lzma w/ 16MB dict reduced the amd64 installer
+#   from 16280616 to 7679592 bytes, or by ~53%.  For x86 we use a smaller
+#   dictionary (the default) since ancient windows VMs doesn't require a lot of
+#   memory and the VMs might have a lot of RAM configured.  Size reduction is
+#   from 9530296 to 5056096 bytes / by ~47%. (4 MB dict: 5948856 bytes / 38%)
 $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe: \
                 $(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi \
@@ -326 +331 @@
         $(REDIRECT) -C $(VBOX_PATH_WIN_ADD_INS_SRC) \
                 $(VB_WIN_ADD_NSIS_ENV) \
-                -- $(EXEC_X86_WIN32) $(VBOX_PATH_NSIS)/makensis.exe /NOCD /V2 \
+                -- $(EXEC_X86_WIN32) $(VBOX_PATH_NSIS)/makensis.exe /NOCD /V3 \
+                        "/XSetCompressor /SOLID lzma" "/XSetCompressorDictSize $(if-expr $(KBUILD_TARGET_ARCH) == x86,4,16)" \
+                        $(if-expr defined(VBOX_WITH_NATIVE_NSIS_INSTALLER),"/XTarget $(KBUILD_TARGET_ARCH)-unicode",) \
                         $(if $(VBOX_SIGNING_MODE),'/DEXTERNAL_UNINSTALLER=1') \
                        $(if-expr defined(VBOX_SIGN_ADDITIONS) && defined(VBOX_SIGNING_MODE), \
@@ -374 +381 @@
                 $(VB_WIN_ADD_NSIS_ENV) \
                 -- $(EXEC_X86_WIN32) $(VBOX_PATH_NSIS)/makensis.exe /NOCD /V2 \
+                        $(if-expr defined(VBOX_WITH_NATIVE_NSIS_INSTALLER),"/XTarget $(KBUILD_TARGET_ARCH)-unicode",) \
                         $(if $(VBOX_SIGN_ADDITIONS),'/DVBOX_SIGN_ADDITIONS=1') \
                         $(if $(VBOX_WITH_VBOX_LEGACY_TS_CA),'/DVBOX_WITH_VBOX_LEGACY_TS_CA=1') \