VirtualBox

Changeset 96688 in vbox for trunk/src/VBox/Additions/WINNT


Ignore:
Timestamp:
Sep 11, 2022 9:21:51 PM (3 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
153571
Message:

Add/Nt/Installer: Some makefile cleanups - shouldn't change anything. bugref:10261

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r96684 r96688  
    2929include $(KBUILD_PATH)/subheader.kmk
    3030
     31#
    3132# Include Sub-Makefiles.
     33#
    3234include $(PATH_SUB_CURRENT)/Loader/Makefile.kmk
    3335include $(PATH_SUB_CURRENT)/InstallHelper/Makefile.kmk
    3436
     37
     38#
    3539# Globals
     40#
    3641VBOX_PATH_WIN_ADD_INS_SRC := $(PATH_SUB_CURRENT)
    3742VBOX_PATH_ADDITIONS.win.x86 := $(PATH_OUT_BASE)/win.x86/$(KBUILD_TYPE)/bin/additions
    3843VBOX_WITH_GUEST_INSTALL_HELPER := 1 # Use our guest install helper DLL.
    3944## @todo VBOX_WIN_ADD_INS_OUT_DIR := $(PATH_TARGET)/Additions/Installer/win
     45
     46ifdef VBOX_GA_ATTESTATION_SIGNING
     47 VBOX_DRIVERS_PACK_NAME := VBoxDrivers-$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)r$(VBOX_SVN_REV)-$(KBUILD_TARGET_ARCH).cab
     48 VBOX_SIGNED_DRIVERS_ZIP_NAME := $(VBOX_DRIVERS_PACK_NAME).Signed.zip
     49 include $(KBUILD_PATH)/tools/ZIP.kmk
     50 TOOL_ZIP_PACK ?= zip
     51endif
     52
    4053
    4154#
    … …  
    5972VBoxDrvInst_VBOX_IMPORT_CHECKER.win.x86 := nt4 # setupapi was introduced in NT4
    6073
     74
    6175#
    6276# RegCleanup - A NT4 post-install registry cleanup helper preventing the
    … …  
    7286RegCleanup_VBOX_IMPORT_CHECKER.win.x86 := nt4
    7387
     88
    7489#
    7590# The installer.
    7691#
    7792PACKING     += $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe
    78 OTHER_CLEAN += \
    79         $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe
    80 
    81 ## @todo r=andy Rename DRIVER_FILES to INST_FILES or something, as those files are not strictly driver-related files.
    82 
    83 DRIVER_FILES := \
     93OTHER_CLEAN += $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe
     94
     95VBOX_WINDOWS_ADDITIONS_DEPS := \
    8496        $(PATH_STAGE_BIN)/additions/RegCleanup.exe \
    8597        $(PATH_STAGE_BIN)/additions/VBoxMouse.sys \
    … …  
    93105        $(PATH_STAGE_BIN)/additions/VBoxService.exe
    94106ifeq ($(KBUILD_TARGET_ARCH),amd64)
    95       # Also include 32-bit network provider DLLs on 64-bit guests to enable
    96       # running 32-bit apps which use that.
    97       DRIVER_FILES += \
    98                 $(PATH_STAGE_BIN)/additions/VBoxMRXNP-x86.dll
     107# Also include 32-bit network provider DLLs on 64-bit guests to enable
     108# running 32-bit apps which use that.
     109VBOX_WINDOWS_ADDITIONS_DEPS += \
     110        $(PATH_STAGE_BIN)/additions/VBoxMRXNP-x86.dll
    99111endif
    100112ifeq ($(KBUILD_TARGET_ARCH),x86)
    101 DRIVER_FILES += \
     113VBOX_WINDOWS_ADDITIONS_DEPS += \
    102114        $(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys \
    103115        $(PATH_STAGE_BIN)/additions/VBoxSFW2K.sys
    104116endif
    105 DRIVER_FILES += \
     117VBOX_WINDOWS_ADDITIONS_DEPS += \
    106118        $(PATH_STAGE_BIN)/additions/VBoxVideo.inf \
    107119        $(PATH_STAGE_BIN)/additions/VBoxGuest.inf \
    108120        $(PATH_STAGE_BIN)/additions/VBoxMouse.inf
    109121ifdef VBOX_SIGN_ADDITIONS
    110 DRIVER_FILES += \
     122VBOX_WINDOWS_ADDITIONS_DEPS += \
    111123        $(PATH_STAGE_BIN)/additions/VBoxVideo.cat \
    112124        $(PATH_STAGE_BIN)/additions/VBoxVideo-PreW10.cat \
    … …  
    117129endif
    118130ifdef VBOX_WITH_WDDM
    119 DRIVER_FILES += \
     131VBOX_WINDOWS_ADDITIONS_DEPS += \
    120132        $(PATH_STAGE_BIN)/additions/VBoxWddm.sys \
    121133        $(PATH_STAGE_BIN)/additions/VBoxWddm.inf \
    122134        $(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll
    123135 ifdef VBOX_WITH_WDDM_DX
    124 DRIVER_FILES += \
     136VBOX_WINDOWS_ADDITIONS_DEPS += \
    125137        $(PATH_STAGE_BIN)/additions/VBoxDX.dll
    126138 endif
    127139 ifdef VBOX_WITH_MESA3D
    128 DRIVER_FILES += \
     140VBOX_WINDOWS_ADDITIONS_DEPS += \
    129141        $(PATH_STAGE_BIN)/additions/VBoxNine.dll \
    130142        $(PATH_STAGE_BIN)/additions/VBoxSVGA.dll \
    … …  
    132144 endif
    133145 ifdef VBOX_SIGN_ADDITIONS
    134 DRIVER_FILES += \
     146VBOX_WINDOWS_ADDITIONS_DEPS += \
    135147        $(PATH_STAGE_BIN)/additions/VBoxWddm.cat \
    136148        $(PATH_STAGE_BIN)/additions/VBoxWddm-PreW10.cat
    137149 endif
    138150 ifeq ($(KBUILD_TARGET_ARCH),amd64)
    139 DRIVER_FILES += \
     151VBOX_WINDOWS_ADDITIONS_DEPS += \
    140152        $(PATH_STAGE_BIN)/additions/VBoxDispD3D-x86.dll
    141153  ifdef VBOX_WITH_WDDM_DX
    142 DRIVER_FILES += \
     154VBOX_WINDOWS_ADDITIONS_DEPS += \
    143155        $(PATH_STAGE_BIN)/additions/VBoxDX-x86.dll
    144156  endif
    145157  ifdef VBOX_WITH_MESA3D
    146 DRIVER_FILES += \
     158VBOX_WINDOWS_ADDITIONS_DEPS += \
    147159        $(PATH_STAGE_BIN)/additions/VBoxNine-x86.dll \
    148160        $(PATH_STAGE_BIN)/additions/VBoxSVGA-x86.dll \
    … …  
    153165
    154166ifdef env.VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
    155  DRIVER_FILES += \
    156   $(PATH_STAGE_BIN)/additions/VBoxAudioTest.exe
     167VBOX_WINDOWS_ADDITIONS_DEPS += \
     168        $(PATH_STAGE_BIN)/additions/VBoxAudioTest.exe
    157169endif
    158170
    … …  
    188200        -E 'KBUILD_TARGET_ARCH=$(KBUILD_TARGET_ARCH)'
    189201
     202$(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe: \
     203                $(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi \
     204                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsCommon.nsh \
     205                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsExternal.nsh \
     206                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsLog.nsh \
     207                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstall.nsh \
     208                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstallOld.nsh \
     209                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsW2KXP.nsh \
     210                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh \
     211                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \
     212                $(VBOX_WINDOWS_ADDITIONS_DEPS) \
     213                $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \
     214                $(VBOX_NSIS_ICON_FILE) \
     215                $(if $(VBOX_SIGNING_MODE),$(PATH_TARGET)/uninst.exe) \
     216                $(if $(VBOX_GA_ATTESTATION_SIGNING),$(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME)) \
     217                $(VBOX_VERSION_STAMP) \
     218                $$(VBoxDrvInst_1_STAGE_TARGET)
     219        $(call MSG_L1,Creating $@, from $<)
     220ifdef VBOX_GA_ATTESTATION_SIGNING # Unpack the attestation signed drivers
     221        $(TOOL_ZIP_UNPACK) -voj $(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME) -d $(PATH_STAGE_BIN)/additions/
     222endif
     223        $(QUIET)$(REDIRECT) -C $(VBOX_PATH_WIN_ADD_INS_SRC) \
     224                $(VB_WIN_ADD_NSIS_ENV) \
     225                -- $(EXEC_X86_WIN32) $(VBOX_PATH_NSIS)/makensis.exe /NOCD /V2 \
     226                        $(if $(VBOX_SIGN_ADDITIONS),'/DVBOX_SIGN_ADDITIONS=1') \
     227                        $(if $(VBOX_SIGNING_MODE),'/DEXTERNAL_UNINSTALLER=1') \
     228                        $(if $(VBOX_WITH_VBOX_LEGACY_TS_CA),'/DVBOX_WITH_VBOX_LEGACY_TS_CA=1') \
     229                        $(if $(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_INSTALLER_ADD_LANGUAGES=1') \
     230                        $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_BRAND_$(lang)_LICENSE_RTF=1') \
     231                        '$(subst /,\,$<)'
     232        $(call VBOX_SIGN_FILE_FN,$@)
     233
     234
    190235ifdef VBOX_SIGNING_MODE
    191236#
    … …  
    193238# See http://nsis.sourceforge.net/Signing_an_Uninstaller for more details.
    194239#
    195 OTHER_CLEAN += $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe
    196 
     240OTHER_CLEAN += \
     241        $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe \
     242        $(PATH_TARGET)/uninst.exe
    197243$(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe: \
    198244                $(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi \
    … …  
    205251                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh \
    206252                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \
    207                 $(DRIVER_FILES) \
     253                $(VBOX_WINDOWS_ADDITIONS_DEPS) \
    208254                $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \
    209255                $(VBOX_NSIS_ICON_FILE) \
    … …  
    222268                        '$(subst /,\,$<)'
    223269
    224 OTHER_CLEAN += $(PATH_TARGET)/uninst.exe
    225270$(PATH_TARGET)/uninst.exe: $(PATH_TARGET)/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH)-uninst.exe | $$(dir $$@)
    226271        $(call MSG_L1,Creating $@, from $<)
    … …  
    229274        $(TEST) -f $@
    230275        $(call VBOX_SIGN_FILE_FN,$@)
    231 endif
     276
     277endif # VBOX_SIGNING_MODE
     278
    232279
    233280ifdef VBOX_GA_ATTESTATION_SIGNING
    234 VBOX_DRIVERS_PACK_NAME := VBoxDrivers-$(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)r$(VBOX_SVN_REV)-$(KBUILD_TARGET_ARCH).cab
    235 VBOX_SIGNED_DRIVERS_ZIP_NAME := $(VBOX_DRIVERS_PACK_NAME).Signed.zip
    236 include $(KBUILD_PATH)/tools/ZIP.kmk
    237 ifndef TOOL_ZIP_PACK
    238  TOOL_ZIP_PACK = zip
    239 endif
    240 endif
    241 
    242 $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe: \
    243                 $(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi \
    244                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsCommon.nsh \
    245                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsExternal.nsh \
    246                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsLog.nsh \
    247                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstall.nsh \
    248                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsUninstallOld.nsh \
    249                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsW2KXP.nsh \
    250                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh \
    251                 $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \
    252                 $(DRIVER_FILES) \
    253                 $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \
    254                 $(VBOX_NSIS_ICON_FILE) \
    255                 $(if $(VBOX_SIGNING_MODE),$(PATH_TARGET)/uninst.exe) \
    256                 $(if $(VBOX_GA_ATTESTATION_SIGNING),$(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME)) \
    257                 $(VBOX_VERSION_STAMP) \
    258                 $$(VBoxDrvInst_1_STAGE_TARGET)
    259         $(call MSG_L1,Creating $@, from $<)
    260 ifdef VBOX_GA_ATTESTATION_SIGNING
    261         $(TOOL_ZIP_UNPACK) -oj $(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME) -d $(PATH_STAGE_BIN)/additions/
    262 endif
    263         $(QUIET)$(REDIRECT) -C $(VBOX_PATH_WIN_ADD_INS_SRC) \
    264                 $(VB_WIN_ADD_NSIS_ENV) \
    265                 -- $(EXEC_X86_WIN32) $(VBOX_PATH_NSIS)/makensis.exe /NOCD /V2 \
    266                         $(if $(VBOX_SIGN_ADDITIONS),'/DVBOX_SIGN_ADDITIONS=1') \
    267                         $(if $(VBOX_SIGNING_MODE),'/DEXTERNAL_UNINSTALLER=1') \
    268                         $(if $(VBOX_WITH_VBOX_LEGACY_TS_CA),'/DVBOX_WITH_VBOX_LEGACY_TS_CA=1') \
    269                         $(if $(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_INSTALLER_ADD_LANGUAGES=1') \
    270                         $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES),'/DVBOX_BRAND_$(lang)_LICENSE_RTF=1') \
    271                         '$(subst /,\,$<)'
    272         $(call VBOX_SIGN_FILE_FN,$@)
    273 
    274 ifdef VBOX_GA_ATTESTATION_SIGNING
     281#
     282# This automagically attestation signs the GA drivers.
     283#
    275284$(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME): \
    276285                $(PATH_OUT)/repackadd/sign-attestation.sh \
    … …  
    280289        $(MV_EXT) $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME).*.zip $(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME)
    281290
     291#
     292# This creates a .CAB file of the driver files that should be attestation signed.
     293#
    282294$(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME): \
    283                 $(PATH_OUT)/repackadd/PackDriversForSubmission.cmd
     295                $(PATH_OUT)/repackadd/PackDriversForSubmission.cmd ## @todo r=bird: Missing almost all driver file dependencies.
    284296        $(RM_EXT) -f $(PATH_OUT)/repackadd/*.cab
    285297        $(RM_EXT) -f $(PATH_OUT)/repackadd/*.ddf
    286298        $(RM_EXT) -f $(PATH_OUT)/repackadd/*.inf
    287299        $(RM_EXT) -f $(PATH_OUT)/repackadd/*.rpt
    288         $(EXEC_X86_WIN32) cmd /c $(PATH_OUT)/repackadd/PackDriversForSubmission.cmd -b $(PATH_STAGE_BIN) -a $(KBUILD_TARGET_ARCH) -x -n --no-main --ga -o $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME)
     300        $(EXEC_X86_WIN32) cmd /c $(PATH_OUT)/repackadd/PackDriversForSubmission.cmd -b $(PATH_STAGE_BIN) -a $(KBUILD_TARGET_ARCH) \
     301                -x -n --no-main --ga -o $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME)
    289302        $(call VBOX_SIGN_EV_FILE_FN,$@)
    290 endif #VBOX_GA_ATTESTATION_SIGNING
     303endif # VBOX_GA_ATTESTATION_SIGNING
     304
    291305
    292306#
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette