Changeset 107341 in vbox

Timestamp:

Dec 17, 2024 11:25:17 AM (4 weeks ago)

Author:

vboxsync

Message:

tools/Makefile.kmk,/Config.kmk,Add/Nt/Installer/Makefile.kmk: Respun the NSIS packages using Visual C++ & PSDK from tools rather than the one installed on the system and applying VBoxPeSetVersion while building. The latter means VBoxNSISTool is no longer needed. Untested. bugref:10761

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Additions/WINNT/Installer/Makefile.kmk (modified) (5 diffs)

trunk/Config.kmk

@@ -2635 +2635 @@
 
 # Path to the null soft installer.
-VBOX_PATH_NSIS ?= $(KBUILD_DEVTOOLS)/win.x86/nsis/v3.10-log
+VBOX_PATH_NSIS ?= $(KBUILD_DEVTOOLS)/win.x86/nsis/v3.10-log-r1
 
 # Windows Installer XML (WIX) toolset.

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

@@ -34 +34 @@
 include $(PATH_SUB_CURRENT)/Loader/Makefile.kmk
 include $(PATH_SUB_CURRENT)/InstallHelper/Makefile.kmk
-include $(PATH_SUB_CURRENT)/NSISTool/Makefile.kmk
 
 
@@ -263 +262 @@
                 $(VBOX_GA_CERT_ROOT_SHA2_R3) \
                 $(VBOX_GA_CERT_ROOT_SHA2_R3_TS))
-
-# Tool is needed in order to repair the NSIS installer .exe's internal CRC32 checksum
-# after touching it via $(VBOX_PE_SET_VERSION).
-VBOX_NSIS_TOOL := $(PATH_OBJ)/VBoxNSISTool/VBoxNSISTool$(HOSTSUFF_EXE)
 
 VB_WIN_ADD_NSIS_ENV := \
@@ -340 +335 @@
                         $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_BRAND_$(lang)_LICENSE_RTF=1') \
                         '$(subst /,\,$<)'
-        $(REDIRECT) -- $(VBOX_PE_SET_VERSION) $@
-        $(REDIRECT) -- $(VBOX_NSIS_TOOL) repair $@
         $(call VBOX_SIGN_IMAGE_FN,$@)
 
@@ -387 +380 @@
                         '/DUNINSTALLER_ONLY=1' \
                         '$(subst /,\,$<)'
-        $(QUIET)$(REDIRECT) -- $(VBOX_PE_SET_VERSION) $@
-        $(QUIET)$(REDIRECT) -- $(VBOX_NSIS_TOOL) repair $@
 
  $(PATH_TARGET)/uninst.exe: \
@@ -527 +518 @@
 
 include $(FILE_KBUILD_SUB_FOOTER)
+