VirtualBox

Changeset 96689 in vbox for trunk


Ignore:
Timestamp:
Sep 11, 2022 9:43:13 PM (2 years ago)
Author:
vboxsync
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r96688 r96689  
    9393OTHER_CLEAN += $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe
    9494
    95 VBOX_WINDOWS_ADDITIONS_DEPS := \
    96         $(PATH_STAGE_BIN)/additions/RegCleanup.exe \
     95VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES := \
     96        $(PATH_STAGE_BIN)/additions/VBoxGuest.inf \
     97        $(PATH_STAGE_BIN)/additions/VBoxGuest.sys \
     98        $(PATH_STAGE_BIN)/additions/VBoxTray.exe \
     99        $(PATH_STAGE_BIN)/additions/VBoxControl.exe \
     100       \
     101        $(PATH_STAGE_BIN)/additions/VBoxMouse.inf \
    97102        $(PATH_STAGE_BIN)/additions/VBoxMouse.sys \
    98         $(PATH_STAGE_BIN)/additions/VBoxGuest.sys \
     103       \
     104        $(PATH_STAGE_BIN)/additions/VBoxVideo.inf \
    99105        $(PATH_STAGE_BIN)/additions/VBoxVideo.sys \
    100106        $(PATH_STAGE_BIN)/additions/VBoxDisp.dll \
     107       \
    101108        $(PATH_STAGE_BIN)/additions/VBoxSF.sys \
    102         $(PATH_STAGE_BIN)/additions/VBoxMRXNP.dll \
    103         $(PATH_STAGE_BIN)/additions/VBoxTray.exe \
    104         $(PATH_STAGE_BIN)/additions/VBoxControl.exe \
    105         $(PATH_STAGE_BIN)/additions/VBoxService.exe
    106 ifeq ($(KBUILD_TARGET_ARCH),amd64)
    107 # Also include 32-bit network provider DLLs on 64-bit guests to enable
    108 # running 32-bit apps which use that.
    109 VBOX_WINDOWS_ADDITIONS_DEPS += \
     109        $(PATH_STAGE_BIN)/additions/VBoxMRXNP.dll
     110
     111ifeq ($(KBUILD_TARGET_ARCH),amd64) # 32-bit network provider DLLs for 32-bit apps running on a 64-bit system
     112VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
    110113        $(PATH_STAGE_BIN)/additions/VBoxMRXNP-x86.dll
    111114endif
    112 ifeq ($(KBUILD_TARGET_ARCH),x86)
    113 VBOX_WINDOWS_ADDITIONS_DEPS += \
    114         $(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys \
    115         $(PATH_STAGE_BIN)/additions/VBoxSFW2K.sys
    116 endif
    117 VBOX_WINDOWS_ADDITIONS_DEPS += \
    118         $(PATH_STAGE_BIN)/additions/VBoxVideo.inf \
    119         $(PATH_STAGE_BIN)/additions/VBoxGuest.inf \
    120         $(PATH_STAGE_BIN)/additions/VBoxMouse.inf
     115
     116VBOX_WINDOWS_ADDITIONS_OTHER_FILES := \
     117        $(PATH_STAGE_BIN)/additions/VBoxService.exe \
     118        $(PATH_STAGE_BIN)/additions/RegCleanup.exe
     119
    121120ifdef VBOX_SIGN_ADDITIONS
    122 VBOX_WINDOWS_ADDITIONS_DEPS += \
     121VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
    123122        $(PATH_STAGE_BIN)/additions/VBoxVideo.cat \
    124123        $(PATH_STAGE_BIN)/additions/VBoxVideo-PreW10.cat \
    … …  
    128127        $(PATH_STAGE_BIN)/additions/VBoxMouse-PreW10.cat
    129128endif
     129
     130ifeq ($(KBUILD_TARGET_ARCH),x86)
     131VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
     132        $(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys \
     133        $(PATH_STAGE_BIN)/additions/VBoxSFW2K.sys
     134endif
     135ifdef VBOX_SIGN_ADDITIONS
     136VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
     137        $(PATH_STAGE_BIN)/additions/VBoxVideo.cat \
     138        $(PATH_STAGE_BIN)/additions/VBoxVideo-PreW10.cat \
     139        $(PATH_STAGE_BIN)/additions/VBoxGuest.cat \
     140        $(PATH_STAGE_BIN)/additions/VBoxGuest-PreW10.cat \
     141        $(PATH_STAGE_BIN)/additions/VBoxMouse.cat \
     142        $(PATH_STAGE_BIN)/additions/VBoxMouse-PreW10.cat
     143endif
    130144ifdef VBOX_WITH_WDDM
    131 VBOX_WINDOWS_ADDITIONS_DEPS += \
     145VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
     146        $(PATH_STAGE_BIN)/additions/VBoxWddm.inf \
    132147        $(PATH_STAGE_BIN)/additions/VBoxWddm.sys \
    133         $(PATH_STAGE_BIN)/additions/VBoxWddm.inf \
    134148        $(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll
     149 ifeq ($(KBUILD_TARGET_ARCH),amd64)
     150VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
     151        $(PATH_STAGE_BIN)/additions/VBoxDispD3D-x86.dll
     152 endif
     153
    135154 ifdef VBOX_WITH_WDDM_DX
    136 VBOX_WINDOWS_ADDITIONS_DEPS += \
     155VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
    137156        $(PATH_STAGE_BIN)/additions/VBoxDX.dll
     157  ifeq ($(KBUILD_TARGET_ARCH),amd64)
     158VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
     159        $(PATH_STAGE_BIN)/additions/VBoxDX-x86.dll
     160  endif
    138161 endif
     162
    139163 ifdef VBOX_WITH_MESA3D
    140 VBOX_WINDOWS_ADDITIONS_DEPS += \
     164VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
    141165        $(PATH_STAGE_BIN)/additions/VBoxNine.dll \
    142166        $(PATH_STAGE_BIN)/additions/VBoxSVGA.dll \
    143167        $(PATH_STAGE_BIN)/additions/VBoxGL.dll
    144  endif
    145  ifdef VBOX_SIGN_ADDITIONS
    146 VBOX_WINDOWS_ADDITIONS_DEPS += \
    147         $(PATH_STAGE_BIN)/additions/VBoxWddm.cat \
    148         $(PATH_STAGE_BIN)/additions/VBoxWddm-PreW10.cat
    149  endif
    150  ifeq ($(KBUILD_TARGET_ARCH),amd64)
    151 VBOX_WINDOWS_ADDITIONS_DEPS += \
    152         $(PATH_STAGE_BIN)/additions/VBoxDispD3D-x86.dll
    153   ifdef VBOX_WITH_WDDM_DX
    154 VBOX_WINDOWS_ADDITIONS_DEPS += \
    155         $(PATH_STAGE_BIN)/additions/VBoxDX-x86.dll
    156   endif
    157   ifdef VBOX_WITH_MESA3D
    158 VBOX_WINDOWS_ADDITIONS_DEPS += \
     168  ifeq ($(KBUILD_TARGET_ARCH),amd64)
     169VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
    159170        $(PATH_STAGE_BIN)/additions/VBoxNine-x86.dll \
    160171        $(PATH_STAGE_BIN)/additions/VBoxSVGA-x86.dll \
    … …  
    162173  endif
    163174 endif
     175
     176 ifdef VBOX_SIGN_ADDITIONS
     177VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
     178        $(PATH_STAGE_BIN)/additions/VBoxWddm.cat \
     179        $(PATH_STAGE_BIN)/additions/VBoxWddm-PreW10.cat
     180 endif
    164181endif
    165182
    166183ifdef env.VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
    167 VBOX_WINDOWS_ADDITIONS_DEPS += \
     184VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
    168185        $(PATH_STAGE_BIN)/additions/VBoxAudioTest.exe
    169186endif
    … …  
    210227                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh \
    211228                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \
    212                 $(VBOX_WINDOWS_ADDITIONS_DEPS) \
     229                $(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) \
     230                $(VBOX_WINDOWS_ADDITIONS_OTHER_FILES) \
    213231                $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \
    214232                $(VBOX_NSIS_ICON_FILE) \
    … …  
    218236                $$(VBoxDrvInst_1_STAGE_TARGET)
    219237        $(call MSG_L1,Creating $@, from $<)
    220 ifdef VBOX_GA_ATTESTATION_SIGNING # Unpack the attestation signed drivers
     238ifdef VBOX_GA_ATTESTATION_SIGNING # Unpack the attestation signed drivers - this is an ugly has 'ing heck hack!
    221239        $(TOOL_ZIP_UNPACK) -voj $(PATH_OUT)/repackadd/$(VBOX_SIGNED_DRIVERS_ZIP_NAME) -d $(PATH_STAGE_BIN)/additions/
    222240endif
    … …  
    251269                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsVista.nsh \
    252270                $(PATH_SUB_CURRENT)/VBoxGuestAdditionsNT4.nsh \
    253                 $(VBOX_WINDOWS_ADDITIONS_DEPS) \
     271                $(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) \
     272                $(VBOX_WINDOWS_ADDITIONS_OTHER_FILES) \
    254273                $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \
    255274                $(VBOX_NSIS_ICON_FILE) \
    … …  
    293312#
    294313$(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME): \
    295                 $(PATH_OUT)/repackadd/PackDriversForSubmission.cmd ## @todo r=bird: Missing almost all driver file dependencies.
     314                $(PATH_OUT)/repackadd/PackDriversForSubmission.cmd \
     315#               $(VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES) - is is unsafe, because of the 'ing ugly hack replacing most of them above during packing.
    296316        $(RM_EXT) -f $(PATH_OUT)/repackadd/*.cab
    297317        $(RM_EXT) -f $(PATH_OUT)/repackadd/*.ddf
Note: See TracChangeset for help on using the changeset viewer.

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