Changeset 105160 in vbox for trunk/tools

Timestamp:

Jul 5, 2024 12:02:04 PM (5 months ago)

Author:

vboxsync

Message:

*.kmk,bldprogs/VBoxPeSetVersion: Created a unit for setting the PE version so it can more easily be controlled per target. This is helpful with the two GINA targets in the additions, since using NT 3.51 instead of NT 3.1 as minimum avoids trouble with some AV heuristics.

File:

• trunk/tools/kBuildUnits/vboxsetpeversion.kmk (copied) (copied from trunk/tools/kBuildUnits/vboximportchecker.kmk ) (2 diffs)

trunk/tools/kBuildUnits/vboxsetpeversion.kmk

@@ -1 +1 @@
 # $Id$
 ## @file
-# VBox import checker unit.
+# VBox PE version setter unit.
 #
 
 #
-# Copyright (C) 2017-2023 Oracle and/or its affiliates.
+# Copyright (C) 2017-2024 Oracle and/or its affiliates.
 #
 # This file is part of VirtualBox base platform packages, as
@@ -26 +26 @@
 #
 
-UNIT_vboximportchecker = bldRTLdrCheckImports
+UNIT_vboxsetpeversion = VBoxPeSetVersion
 
 # Add our property.
-PROPS_SINGLE          += VBOX_IMPORT_CHECKER
-PROPS_SINGLE_LNK      += VBOX_IMPORT_CHECKER
-PROPS_PROGRAMS_SINGLE += VBOX_IMPORT_CHECKER
-PROPS_DLLS_SINGLE     += VBOX_IMPORT_CHECKER
-PROPS_SYSMODS_SINGLE  += VBOX_IMPORT_CHECKER
+PROPS_SINGLE          += VBOX_SET_PE_VERSION
+PROPS_SINGLE_LNK      += VBOX_SET_PE_VERSION
+PROPS_PROGRAMS_SINGLE += VBOX_SET_PE_VERSION
+PROPS_DLLS_SINGLE     += VBOX_SET_PE_VERSION
+PROPS_SYSMODS_SINGLE  += VBOX_SET_PE_VERSION
 
 # Helper for expanding certain variables while assigning.
-define def_unit_vboximportchecker_internal_expand_twice
- $(target)_POST_CMDS += $$(if-expr "$$(tool_do)" != "LINK_LIBRARY",$$(NLTAB)$$(VBOX_RTLDRCHECKIMPORTS) -q -p "$$(KBUILD_DEVTOOLS)/$(bld_trg).$(bld_trg_arch)/exports/$$($(target)_2_VBOX_IMPORT_CHECKER)" $$(out),)
+define def_unit_vboxsetpeversion_internal_expand_twice
+ $(target)_POST_CMDS += $$(NLTAB)$$(VBOX_PE_SET_VERSION) $$(addprefix --,$$($(target)_2_VBOX_SET_PE_VERSION)) "$$(out)"
 endef
 
-define def_unit_vboximportchecker_target_pre
- # Do not apply to ASAN builds as it requires newere DLLs.
- ifneq ($(KBUILD_TYPE),asan)
+define def_unit_vboxsetpeversion_target_pre
 
-  # Set pass 2 variable (simpler) and act on it.
-  $(target)_2_VBOX_IMPORT_CHECKER := $(evalcall def_fn_prop_get_first_defined,VBOX_IMPORT_CHECKER)
-  ifdef $(target)_2_VBOX_IMPORT_CHECKER
-   $(target)_LNK_ORDERDEPS += $(VBOX_RTLDRCHECKIMPORTS)
-   $(eval $(def_unit_vboximportchecker_internal_expand_twice))
+ # Set pass 2 variable (simpler) and act on it.
+ $(target)_2_VBOX_SET_PE_VERSION := $(evalcall def_fn_prop_get_first_defined,VBOX_SET_PE_VERSION)
+ ifdef $(target)_2_VBOX_SET_PE_VERSION
+  ifneq ($(tool_do),LINK_LIBRARY)
+   $(target)_LNK_ORDERDEPS += $(VBOX_PE_SET_VERSION)
+   $(eval $(def_unit_vboxsetpeversion_internal_expand_twice))
   endif
-
  endif