Changeset 98186 in vbox for trunk

Timestamp:

Jan 21, 2023 10:47:27 PM (2 years ago)

Author:

vboxsync

Message:

*.kmk: s/VBOXMAINTSTEXE/VBoxMainTstExe/ bugref:10348

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Main/testcase/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -7338 +7338 @@
         -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)
 
+# x86 version of VBoxMainComp
 TEMPLATE_VBoxMainComp-x86  = 32-bit VBox Main Component (shared library)
 TEMPLATE_VBoxMainComp-x86_EXTENDS = VBoxMainComp
@@ -7370 +7371 @@
 # This is the VBoxMainExe template only with a different install dir.
 #
-TEMPLATE_VBOXMAINTSTEXE  = VBox Main Testcase Exe
-TEMPLATE_VBOXMAINTSTEXE_EXTENDS = VBoxMainExe
-TEMPLATE_VBOXMAINTSTEXE_INST    = $(INST_TESTCASE)
+TEMPLATE_VBoxMainTstExe  = VBox Main Testcase Exe
+TEMPLATE_VBoxMainTstExe_EXTENDS = VBoxMainExe
+TEMPLATE_VBoxMainTstExe_INST    = $(INST_TESTCASE)
 ifdef VBOX_WITH_RUNPATH
- TEMPLATE_VBOXMAINTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_VBoxMainExe_LDFLAGS)
+ TEMPLATE_VBoxMainTstExe_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' $(TEMPLATE_VBoxMainExe_LDFLAGS)
 else ifdef VBOX_WITH_RELATIVE_RUNPATH
- TEMPLATE_VBOXMAINTSTEXE_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..' $(TEMPLATE_VBoxMainExe_LDFLAGS)
+ TEMPLATE_VBoxMainTstExe_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/..' $(TEMPLATE_VBoxMainExe_LDFLAGS)
 endif
 if "$(KBUILD_TARGET)" == "win" && defined(VBOX_SIGNING_MODE)
- TEMPLATE_VBOXMAINTSTEXE_POST_CMDS =
+ TEMPLATE_VBoxMainTstExe_POST_CMDS =
 endif
 

trunk/src/VBox/Main/testcase/Makefile.kmk

@@ -325 +325 @@
 
 INSTALLS += tstUnattendedScriptFiles
-tstUnattendedScriptFiles_TEMPLATE = VBOXMAINTSTEXE
+tstUnattendedScriptFiles_TEMPLATE = VBoxMainTstExe
 tstUnattendedScriptFiles_SOURCES = \
         tstUnattendedScript-1.template \