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

Timestamp:

Sep 11, 2022 10:17:35 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

153574

Message:

Add/*.kmk: Always check for both VBOX_SIGNING_MODE and VBOX_SIGN_ADDITIONS.

Location:

trunk/src/VBox/Additions/WINNT

Files:

• Graphics/Video/disp/Makefile.kmk (modified) (1 diff)
• Graphics/Video/mp/Makefile.kmk (modified) (2 diffs)
• Installer/Makefile.kmk (modified) (6 diffs)
• VBoxTray/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk

@@ -95 +95 @@
 VBoxDisp_VBOX_IMPORT_CHECKER.win.amd64 = xp64/r0
 
-# Signing requires both miniport and display drivers
-# so it'd be dealt with in the parent makefile.
-ifdef VBOX_SIGN_ADDITIONS
- VBoxDisp_INSTTYPE           = none
- VBoxDisp_DEBUG_INSTTYPE     = both
+# Signing requires both miniport and display drivers so it'll be dealt with in the parent makefile.
+if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
+ VBoxDisp_INSTTYPE           := none
+ VBoxDisp_DEBUG_INSTTYPE     := both
  ifdef VBOX_WITH_WDDM
-  VBoxDispD3D_INSTTYPE       = none
-  VBoxDispD3D_DEBUG_INSTTYPE = both
+  VBoxDispD3D_INSTTYPE       := none
+  VBoxDispD3D_DEBUG_INSTTYPE := both
   ifdef VBOX_WITH_WDDM_DX
-   VBoxDX_INSTTYPE           = none
-   VBoxDX_DEBUG_INSTTYPE     = both
+   VBoxDX_INSTTYPE           := none
+   VBoxDX_DEBUG_INSTTYPE     := both
   endif
  endif

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/Makefile.kmk

@@ -184 +184 @@
 
 #
-# Signing requires both miniport and display drivers
-# so it'd be dealt with in the parent makefile.
+# Signing requires both miniport and display drivers so it'll be dealt with in the parent makefile.
 #
-ifdef VBOX_SIGN_ADDITIONS
+if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
  VBoxVideo_INSTTYPE            = none
  VBoxVideo_DEBUG_INSTTYPE      = both
@@ -194 +193 @@
   VBoxWddm_DEBUG_INSTTYPE      = both
  endif
-endif # VBOX_SIGN_ADDITIONS
+endif
 
 include $(FILE_KBUILD_SUB_FOOTER)

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

@@ -114 +114 @@
 endif
 
-VBOX_WINDOWS_ADDITIONS_OTHER_FILES := \
-        $(PATH_STAGE_BIN)/additions/VBoxService.exe \
-        $(PATH_STAGE_BIN)/additions/RegCleanup.exe
-
-ifdef VBOX_SIGN_ADDITIONS
+if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
         $(PATH_STAGE_BIN)/additions/VBoxVideo.cat \
@@ -128 +124 @@
 endif
 
+VBOX_WINDOWS_ADDITIONS_OTHER_FILES := \
+        $(PATH_STAGE_BIN)/additions/VBoxService.exe \
+        $(PATH_STAGE_BIN)/additions/VBoxHook.dll \
+        $(PATH_STAGE_BIN)/additions/RegCleanup.exe
+
 ifeq ($(KBUILD_TARGET_ARCH),x86)
 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
@@ -133 +134 @@
         $(PATH_STAGE_BIN)/additions/VBoxSFW2K.sys
 endif
-ifdef VBOX_SIGN_ADDITIONS
-VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
-        $(PATH_STAGE_BIN)/additions/VBoxVideo.cat \
-        $(PATH_STAGE_BIN)/additions/VBoxVideo-PreW10.cat \
-        $(PATH_STAGE_BIN)/additions/VBoxGuest.cat \
-        $(PATH_STAGE_BIN)/additions/VBoxGuest-PreW10.cat \
-        $(PATH_STAGE_BIN)/additions/VBoxMouse.cat \
-        $(PATH_STAGE_BIN)/additions/VBoxMouse-PreW10.cat
-endif
+
 ifdef VBOX_WITH_WDDM
 VBOX_WINDOWS_ADDITIONS_ATTESTATION_SIGNED_FILES += \
@@ -174 +167 @@
  endif
 
- ifdef VBOX_SIGN_ADDITIONS
+ if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
 VBOX_WINDOWS_ADDITIONS_OTHER_FILES += \
         $(PATH_STAGE_BIN)/additions/VBoxWddm.cat \
         $(PATH_STAGE_BIN)/additions/VBoxWddm-PreW10.cat
  endif
-endif
+endif # VBOX_WITH_WDDM
 
 ifdef env.VBOX_WITH_ADDITIONS_SHIPPING_AUDIO_TEST
@@ -297 +290 @@
 
 
-ifdef VBOX_GA_ATTESTATION_SIGNING
+if defined(VBOX_GA_ATTESTATION_SIGNING) && defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
 #
 # This automagically attestation signs the GA drivers.
@@ -321 +314 @@
                 -x -n --no-main --ga -o $(PATH_OUT)/repackadd/$(VBOX_DRIVERS_PACK_NAME)
         $(call VBOX_SIGN_EV_FILE_FN,$@)
-endif # VBOX_GA_ATTESTATION_SIGNING
+endif # VBOX_GA_ATTESTATION_SIGNING && VBOX_SIGNING_MODE && VBOX_SIGN_ADDITIONS
 
 

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

@@ -31 +31 @@
 PROGRAMS += VBoxTray
 VBoxTray_TEMPLATE = VBoxGuestR3Exe
-ifdef VBOX_SIGN_ADDITIONS # (See the parent makefile.)
- VBoxTray_INSTTYPE = none
- VBoxTray_DEBUG_INSTTYPE = both
+if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS) # (See the parent makefile.)
+ VBoxTray_INSTTYPE       := none
+ VBoxTray_DEBUG_INSTTYPE := both
 endif
 VBoxTray_SDKS     = ReorderCompilerIncs $(VBOX_WINDDK_GST)