Changeset 106892 in vbox

Timestamp:

Nov 8, 2024 3:34:41 PM (3 weeks ago)

Author:

vboxsync

Message:

Windows Guest Additions: File renaming and Makefile adjustments for VBoxGuestInstallHelper.dll. Needed as a prerequisite for the upcoming rename of VBoxDrvInst -> VBoxGuestInstallHelper.exe. bugref:10762

Location:

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxGuestInstallHelperDll.cpp (moved) (moved from trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.cpp )
• VBoxGuestInstallHelperDll.rc (moved) (moved from trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/VBoxGuestInstallHelper.rc )

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

@@ -35 +35 @@
 # Stripped down template for arm64.
 #
-TEMPLATE_VBoxGuestInstallerHelperTemplateWithFewerLibs                = hack
-TEMPLATE_VBoxGuestInstallerHelperTemplateWithFewerLibs_EXTENDS       := VBoxGuestR3Dll
-TEMPLATE_VBoxGuestInstallerHelperTemplateWithFewerLibs_LATE_LIBS.x86  = \
+TEMPLATE_VBoxGuestInstallHelperTemplateWithFewerLibs                = hack
+TEMPLATE_VBoxGuestInstallHelperTemplateWithFewerLibs_EXTENDS       := VBoxGuestR3Dll
+TEMPLATE_VBoxGuestInstallHelperTemplateWithFewerLibs_LATE_LIBS.x86  = \
         $(filter-out %/VBoxGuestR3LibShared-x86.lib,$(TEMPLATE_VBoxGuestR3Dll_LATE_LIBS.x86))
 
@@ -45 +45 @@
 # Note! Installation is required for repacking Guest Additions
 #
-DLLS += VBoxGuestInstallHelper
-VBoxGuestInstallHelper_TEMPLATE        := VBoxGuestInstallerHelperTemplateWithFewerLibs
-VBoxGuestInstallHelper_BLD_TRG_ARCH    := x86
-VBoxGuestInstallHelper_INST            := repackadd/resources/VBoxGuestInstallHelper/
+DLLS += VBoxGuestInstallHelperDll
+VBoxGuestInstallHelperDll_TEMPLATE        := VBoxGuestInstallHelperTemplateWithFewerLibs
+VBoxGuestInstallHelperDll_NAME            := VBoxGuestInstallHelper
+VBoxGuestInstallHelperDll_BLD_TRG_ARCH    := x86
+VBoxGuestInstallHelperDll_INST            := repackadd/resources/VBoxGuestInstallHelperDll/
 ifdef VBOX_SIGN_ADDITIONS # (See the parent makefile.)
- VBoxGuestInstallHelper_INSTTYPE       := stage
- VBoxGuestInstallHelper_DEBUG_INSTTYPE := both
+ VBoxGuestInstallHelperDll_INSTTYPE       := stage
+ VBoxGuestInstallHelperDll_DEBUG_INSTTYPE := both
 endif
-VBoxGuestInstallHelper_DEFS            := WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE
+VBoxGuestInstallHelperDll_DEFS            := WIN32_LEAN_AND_MEAN=1 UNICODE _UNICODE
 if1of ($(KBUILD_TARGET_ARCH), x86)
- VBoxGuestInstallHelper_DEFS           := _WIN32_WINNT=0x0400
- VBoxGuestInstallHelper_VBOX_IMPORT_CHECKER.win.x86 := nt4
+ VBoxGuestInstallHelperDll_DEFS           := _WIN32_WINNT=0x0400
+ VBoxGuestInstallHelperDll_VBOX_IMPORT_CHECKER.win.x86 := nt4
 else if1of ($(KBUILD_TARGET_ARCH), amd64)
- VBoxGuestInstallHelper_DEFS           := _WIN32_WINNT=0x0501
- VBoxGuestInstallHelper_VBOX_IMPORT_CHECKER.win.x86 := xp
+ VBoxGuestInstallHelperDll_DEFS           := _WIN32_WINNT=0x0501
+ VBoxGuestInstallHelperDll_VBOX_IMPORT_CHECKER.win.x86 := xp
 else
- VBoxGuestInstallHelper_DEFS           := _WIN32_WINNT=0x0a00
- VBoxGuestInstallHelper_VBOX_IMPORT_CHECKER.win.x86 := w8
+ VBoxGuestInstallHelperDll_DEFS           := _WIN32_WINNT=0x0a00
+ VBoxGuestInstallHelperDll_VBOX_IMPORT_CHECKER.win.x86 := w8
 endif
-VBoxGuestInstallHelper_SOURCES         := \
-        VBoxGuestInstallHelper.cpp \
-        VBoxGuestInstallHelper.rc \
+VBoxGuestInstallHelperDll_SOURCES         := \
+        VBoxGuestInstallHelperDll.cpp \
+        VBoxGuestInstallHelperDll.rc \
         $(PATH_ROOT)/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp
-VBoxGuestInstallHelper_INCS            := \
+VBoxGuestInstallHelperDll_INCS            := \
         $(PATH_ROOT)/src/VBox/Runtime/include