Changeset 94160 in vbox for trunk/src/VBox/Additions/WINNT/Mouse

Timestamp:

Mar 10, 2022 7:29:09 PM (3 years ago)

Author:

vboxsync

Message:

Additions: Windows: Use the same approach as with the host driver for .cat files, i.e. create 2 copies, one for Windows versions before 10, and one for 10 and later (which in UEFI Secure Boot mode modified the trusted root list, requiring Attestation Signing). The NSIS installer will deliver the appropriate file.

File:

• trunk/src/VBox/Additions/WINNT/Mouse/NT5/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Mouse/NT5/Makefile.kmk

@@ -58 +58 @@
 VBoxMouse-inf_INST = $(INST_ADDITIONS)
 VBoxMouse-inf_MODE = a+r,u+w
-ifndef VBOX_SIGNING_MODE
-VBoxMouse-inf_SOURCES = VBoxMouse.inf
-else
 VBoxMouse-inf_SOURCES = \
-        $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf \
-        $(if-expr defined(VBOX_SIGN_ADDITIONS),$(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat,)
-VBoxMouse-inf_CLEAN += \
-        $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat \
-        $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.sys \
         $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf
+VBoxMouse-inf_CLEAN = $(VBoxMouse-inf_SOURCES)
 VBoxMouse-inf_BLDDIRS = $(PATH_TARGET)/VBoxMouseCat.dir
 
@@ -74 +67 @@
         $(call VBOX_EDIT_INF_FN,$<,$@)
 
-$(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat: $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf $$(VBoxMouse_1_TARGET)
+if defined(VBOX_SIGNING_MODE) && defined(VBOX_SIGN_ADDITIONS)
+ VBoxMouse-inf_SOURCES += \
+        $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.sys \
+        $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat \
+        $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat=>VBoxMouse-PreW10.cat
+
+ $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.sys: $$(VBoxMouse_1_TARGET) | $$(dir $$@)
+        $(INSTALL) -m 644 -- "$<" "$(@D)"
+
+ $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.cat: \
+                $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.inf \
+                $(PATH_TARGET)/VBoxMouseCat.dir/VBoxMouse.sys
         $(call MSG_TOOL,Inf2Cat,VBoxMouse-inf,$@,$<)
-        $(INSTALL) -m 644 $(VBoxMouse_1_TARGET) $(@D)
         $(call VBOX_MAKE_CAT_FN, $(@D),$@)
 endif # signing