Changeset 70377 in vbox

Timestamp:

Dec 28, 2017 8:48:14 PM (7 years ago)

Author:

vboxsync

Message:

ValidationKit: Use import checker.

Location:

trunk/src/VBox/ValidationKit

Files:

• Config.kmk (modified) (3 diffs)
• testboxscript/Makefile.kmk (modified) (1 diff)
• utils/cpu/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/ValidationKit/Config.kmk

@@ -91 +91 @@
 endif
 
-# Make VCC100 output work on NT4, W2K, XP and W2K3.
+# Make VCC100 output work on NT3.x, NT4, W2K, XP and W2K3.
 TEMPLATE_VBoxValidationKitR3_LIBS.win.x86 = \
        $(PATH_TOOL_$(TEMPLATE_VBoxValidationKitR3_TOOL.win.x86)_LIB)/oldnames.lib \
@@ -98 +98 @@
         $(PATH_STAGE_LIB)/RuntimeR3VccTricks$(VBOX_SUFF_LIB)
 ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),win.x86)
-TEMPLATE_VBoxValidationKitR3_POST_CMDS = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out)$$(NLTAB))$(TEMPLATE_VBoxValidationKitR3Base_POST_CMDS)$$(NLTAB)
+ TEMPLATE_VBoxValidationKitR3_POST_CMDS = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out)$$(NLTAB))$(TEMPLATE_VBoxValidationKitR3Base_POST_CMDS)$$(NLTAB)
 endif
 TEMPLATE_VBoxValidationKitR3_LNK_DEPS.win.x86  = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION))
@@ -104 +104 @@
 #TODO: TEMPLATE_VBoxValidationKitR3_EXTENDS = VBOXGUESTR3EXE
 
-
-#
-# Template for building ring-3 progams for the Validation Kit.
+TEMPLATE_VBoxValidationKitR3_USES += vboximportchecker
+TEMPLATE_VBoxValidationKitR3_VBOX_IMPORT_CHECKER.win.x86   = nt350
+TEMPLATE_VBoxValidationKitR3_VBOX_IMPORT_CHECKER.win.amd64 = xp64
+
+
+#
+# Template for building ring-3 programs for the Validation Kit.
 # These programs can run on the host and may take advantage of the support
 # driver when installed.

trunk/src/VBox/ValidationKit/testboxscript/Makefile.kmk

@@ -75 +75 @@
 TestBoxHelper_LIBS.win = $(PATH_SDK_$(VBOX_WINDDK)_LIB)/wbemuuid.lib
 TestBoxHelper_LDFLAGS.darwin = -framework CoreFoundation
+TestBoxHelper_VBOX_IMPORT_CHECKER.win.x86 = $(NO_SUCH_VARIABLE)
 
 

trunk/src/VBox/ValidationKit/utils/cpu/Makefile.kmk

@@ -56 +56 @@
 cidet-app_DEFS.linux = CIDET_REDUCED_CTX
 cidet-app_LIBS = $(PATH_STAGE_LIB)/DisasmR3Static$(VBOX_SUFF_LIB)
+cidet-app_VBOX_IMPORT_CHECKER.win.x86 = $(NO_SUCH_VARIABLE) # doesn't work on NT4 yet.
 
 #PROGRAMS += rdtsc