Changeset 98169 in vbox for trunk/Config.kmk

Timestamp:

Jan 20, 2023 8:34:03 PM (23 months ago)

Author:

vboxsync

Message:

*.kmk: s/VBOXR3TSTEXE/VBoxR3TstExe/ bugref:10348

File:

• trunk/Config.kmk (modified) (4 diffs)

trunk/Config.kmk

@@ -6895 +6895 @@
 # This is the VBoxR3Exe template only with a different install dir.
 #
-TEMPLATE_VBOXR3TSTEXE  = VBox Ring 3 Testcase Exe
-TEMPLATE_VBOXR3TSTEXE_EXTENDS = VBoxR3Exe
-TEMPLATE_VBOXR3TSTEXE_LIBS    = $(LIB_RUNTIME) $(TEMPLATE_VBoxR3Exe_LIBS)
-TEMPLATE_VBOXR3TSTEXE_INST    = $(INST_TESTCASE)
+TEMPLATE_VBoxR3TstExe  = VBox Ring 3 Testcase Exe
+TEMPLATE_VBoxR3TstExe_EXTENDS = VBoxR3Exe
+TEMPLATE_VBoxR3TstExe_LIBS    = $(LIB_RUNTIME) $(TEMPLATE_VBoxR3Exe_LIBS)
+TEMPLATE_VBoxR3TstExe_INST    = $(INST_TESTCASE)
 ifdef VBOX_WITH_RUNPATH
- TEMPLATE_VBOXR3TSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_VBoxR3Exe_LDFLAGS)
+ TEMPLATE_VBoxR3TstExe_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_VBoxR3Exe_LDFLAGS)
 else ifdef VBOX_WITH_RELATIVE_RUNPATH
- TEMPLATE_VBOXR3TSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..' $(TEMPLATE_VBoxR3Exe_LDFLAGS)
+ TEMPLATE_VBoxR3TstExe_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..' $(TEMPLATE_VBoxR3Exe_LDFLAGS)
 endif
 if "$(KBUILD_TARGET)" == "win" && defined(VBOX_SIGNING_MODE)
- TEMPLATE_VBOXR3TSTEXE_POST_CMDS =
- TEMPLATE_VBOXR3TSTEXE_LDFLAGS = $(filter-out -IntegrityCheck, $(TEMPLATE_VBoxR3Exe_LDFLAGS))
+ TEMPLATE_VBoxR3TstExe_POST_CMDS =
+ TEMPLATE_VBoxR3TstExe_LDFLAGS = $(filter-out -IntegrityCheck, $(TEMPLATE_VBoxR3Exe_LDFLAGS))
 endif
 if defined(VBOX_WITH_MORE_NT4_COMPAT_BINARIES) && "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.x86"
- TEMPLATE_VBOXR3TSTEXE_POST_CMDS.win.x86 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out))
- TEMPLATE_VBOXR3TSTEXE_LIBS.x86 = \
+ TEMPLATE_VBoxR3TstExe_POST_CMDS.win.x86 = $(if $(eq $(tool_do),LINK_LIBRARY),,$(VBOX_PE_SET_VERSION) $(out))
+ TEMPLATE_VBoxR3TstExe_LIBS.x86 = \
         $(PATH_STAGE_LIB)/RuntimeR3VccTricks2$(VBOX_SUFF_LIB) \
         $(PATH_TOOL_$(TEMPLATE_VBoxR3Exe_TOOL.win.x86)_LIB)/oldnames.lib
@@ -6920 +6920 @@
 #
 TEMPLATE_VBOXR3TSTNPEXE  = VBox Ring 3 Testcase Exe Non-pedantic
-TEMPLATE_VBOXR3TSTNPEXE_EXTENDS = VBOXR3TSTEXE
+TEMPLATE_VBOXR3TSTNPEXE_EXTENDS = VBoxR3TstExe
 ifneq ($(KBUILD_TARGET),win) # (only gcc)
  TEMPLATE_VBOXR3TSTNPEXE_TOOL             = $(VBOX_GCC_TOOL)
- TEMPLATE_VBOXR3TSTNPEXE_CFLAGS           = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_C)  ,$(TEMPLATE_VBOXR3TSTEXE_CFLAGS)) \
+ TEMPLATE_VBOXR3TSTNPEXE_CFLAGS           = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_C)  ,$(TEMPLATE_VBoxR3TstExe_CFLAGS)) \
         -Wno-sign-compare
- TEMPLATE_VBOXR3TSTNPEXE_CXXFLAGS         = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_CXX),$(TEMPLATE_VBOXR3TSTEXE_CXXFLAGS)) \
+ TEMPLATE_VBOXR3TSTNPEXE_CXXFLAGS         = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_CXX),$(TEMPLATE_VBoxR3TstExe_CXXFLAGS)) \
         -Wno-sign-compare
- TEMPLATE_VBOXR3TSTNPEXE_PCHFLAGS         = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_CXX),$(TEMPLATE_VBOXR3TSTEXE_PCHFLAGS)) \
+ TEMPLATE_VBOXR3TSTNPEXE_PCHFLAGS         = $(filter-out $(VBOX_GCC_WERR) $(VBOX_GCC_WARN_MASOCHISTIC) $(VBOX_GCC_PEDANTIC_CXX),$(TEMPLATE_VBoxR3TstExe_PCHFLAGS)) \
         -Wno-sign-compare
 endif
@@ -6936 +6936 @@
 #
 TEMPLATE_VBoxR3TstDll = VBox Ring-3 Testcase Dll
-TEMPLATE_VBoxR3TstDll_EXTENDS = VBOXR3TSTEXE
+TEMPLATE_VBoxR3TstDll_EXTENDS = VBoxR3TstExe
 ifn1of ($(KBUILD_TARGET), darwin win os2)
- TEMPLATE_VBoxR3TstDll_DEFS     = $(TEMPLATE_VBOXR3TSTEXE_DEFS) PIC
- TEMPLATE_VBoxR3TstDll_CFLAGS   = $(TEMPLATE_VBOXR3TSTEXE_CFLAGS) -fPIC
- TEMPLATE_VBoxR3TstDll_CXXFLAGS = $(TEMPLATE_VBOXR3TSTEXE_CXXFLAGS) -fPIC
- TEMPLATE_VBoxR3TstDll_PCHFLAGS = $(TEMPLATE_VBOXR3TSTEXE_PCHFLAGS) -fPIC
- TEMPLATE_VBoxR3TstDll_LDFLAGS  = $(TEMPLATE_VBOXR3TSTEXE_LDFLAGS) -fPIC
+ TEMPLATE_VBoxR3TstDll_DEFS     = $(TEMPLATE_VBoxR3TstExe_DEFS) PIC
+ TEMPLATE_VBoxR3TstDll_CFLAGS   = $(TEMPLATE_VBoxR3TstExe_CFLAGS) -fPIC
+ TEMPLATE_VBoxR3TstDll_CXXFLAGS = $(TEMPLATE_VBoxR3TstExe_CXXFLAGS) -fPIC
+ TEMPLATE_VBoxR3TstDll_PCHFLAGS = $(TEMPLATE_VBoxR3TstExe_PCHFLAGS) -fPIC
+ TEMPLATE_VBoxR3TstDll_LDFLAGS  = $(TEMPLATE_VBoxR3TstExe_LDFLAGS) -fPIC
 endif
 
@@ -6950 +6950 @@
 #
 TEMPLATE_VBOXCPPUNITEXE  = VBox CppUnit Testcase Exe
-TEMPLATE_VBOXCPPUNITEXE_EXTENDS = VBOXR3TSTEXE
+TEMPLATE_VBOXCPPUNITEXE_EXTENDS = VBoxR3TstExe
 ## @todo make a CPPUNIT SDK and add cppunit tools packages for windows, mac, solaris and OS/2.
 #TEMPLATE_VBOXCPPUNITEXE_SDKS = CPPUNIT -
 TEMPLATE_VBOXCPPUNITEXE_LIBS = \
-        $(TEMPLATE_VBOXR3TSTEXE_LIBS) \
+        $(TEMPLATE_VBoxR3TstExe_LIBS) \
         cppunit