Changeset 98439 in vbox for trunk/src/VBox
- Timestamp:
- Feb 2, 2023 12:47:31 PM (23 months ago)
- Location:
- trunk/src/VBox
- Files:
-
- 11 edited
-
Debugger/Makefile.kmk (modified) (1 diff)
-
Devices/Makefile.kmk (modified) (1 diff)
-
Disassembler/Makefile.kmk (modified) (1 diff)
-
Disassembler/testcase/Makefile.kmk (modified) (6 diffs)
-
Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
-
ImageMounter/Makefile.kmk (modified) (1 diff)
-
ImageMounter/vboximg-mount/Makefile.kmk (modified) (1 diff)
-
Makefile.kmk (modified) (1 diff)
-
Runtime/Makefile.kmk (modified) (2 diffs)
-
Storage/testcase/Makefile.kmk (modified) (8 diffs)
-
ValidationKit/Makefile.kmk (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Debugger/Makefile.kmk
r98169 r98439 104 104 105 105 if defined(VBOX_WITH_QTGUI) && defined(VBOX_WITH_DEBUGGER_GUI) 106 #107 # Debugger GUI component (Qt).108 #106 # 107 # Debugger GUI component (Qt). 108 # 109 109 ifndef VBOX_WITH_QT6 110 USES += qt5110 USES += qt5 111 111 else 112 USES += qt6112 USES += qt6 113 113 endif 114 DLLS += VBoxDbg115 VBoxDbg_TEMPLATE = VBoxQtGuiDll116 VBoxDbg_DEFS = IN_DBG_R3117 VBoxDbg_INCS = .118 VBoxDbg_QT_MODULES = Core Gui Widgets119 VBoxDbg_QT_MOCHDRS = \120 VBoxDbgGui.h \121 VBoxDbgConsole.h \122 VBoxDbgStatsQt.h123 VBoxDbg_SOURCES = \124 VBoxDbg.cpp \125 VBoxDbgGui.cpp \126 VBoxDbgBase.cpp \127 VBoxDbgConsole.cpp \128 VBoxDbgStatsQt.cpp129 VBoxDbg_LDFLAGS.darwin = \130 -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxDbg.dylib131 $(call VBOX_SET_VER_INFO_DLL,VBoxDbg,VirtualBox Debugger GUI)114 DLLS += VBoxDbg 115 VBoxDbg_TEMPLATE = VBoxQtGuiDll 116 VBoxDbg_DEFS = IN_DBG_R3 117 VBoxDbg_INCS = . 118 VBoxDbg_QT_MODULES = Core Gui Widgets 119 VBoxDbg_QT_MOCHDRS = \ 120 VBoxDbgGui.h \ 121 VBoxDbgConsole.h \ 122 VBoxDbgStatsQt.h 123 VBoxDbg_SOURCES = \ 124 VBoxDbg.cpp \ 125 VBoxDbgGui.cpp \ 126 VBoxDbgBase.cpp \ 127 VBoxDbgConsole.cpp \ 128 VBoxDbgStatsQt.cpp 129 VBoxDbg_LDFLAGS.darwin = \ 130 -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxDbg.dylib 131 $(call VBOX_SET_VER_INFO_DLL,VBoxDbg,VirtualBox Debugger GUI) 132 132 endif # Qt 133 133 -
trunk/src/VBox/Devices/Makefile.kmk
r98410 r98439 1434 1434 ServicesR0_SOURCES = \ 1435 1435 Network/SrvIntNetR0.cpp 1436 # $(if $(VBOX_WITH_PCI_PASSTHROUGH),Bus/SrvPciRawR0.cpp,)1436 # $(if $(VBOX_WITH_PCI_PASSTHROUGH),Bus/SrvPciRawR0.cpp,) 1437 1437 Network/SrvIntNetR0.cpp_CXXFLAGS := $(if-expr $(KBUILD_TARGET) == "win",,$(VBOX_GCC_Wno-array_bounds)) 1438 1438 -
trunk/src/VBox/Disassembler/Makefile.kmk
r98133 r98439 43 43 DisasmTables.cpp \ 44 44 DisasmTablesX64.cpp \ 45 45 DisasmMisc.cpp \ 46 46 DisasmFormatBytes.cpp \ 47 47 DisasmFormatYasm.cpp -
trunk/src/VBox/Disassembler/testcase/Makefile.kmk
r98169 r98439 31 31 32 32 33 if1of ($(KBUILD_TARGET_ARCH), amd64 x86)34 PROGRAMS+= tstDisasm-135 tstDisasm-1_TEMPLATE= VBoxR3TstExe36 tstDisasm-1_DEFS= IN_DIS37 tstDisasm-1_SOURCES= \38 tstDisasm-1.cpp \39 tstDisasm-1A.asm40 tstDisasm-1_LIBS= \41 $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) \42 $(LIB_RUNTIME)43 44 PROGRAMS+= tstDisasmCore-145 tstDisasmCore-1_EXTENDS = tstDisasm-146 tstDisasmCore-1_DEFS= IN_DIS DIS_CORE_ONLY47 tstDisasmCore-1_LIBS= \48 $(PATH_STAGE_LIB)/DisasmCoreR3$(VBOX_SUFF_LIB) \49 $(LIB_RUNTIME)50 endif51 52 53 PROGRAMS += tstDisasm-254 tstDisasm-2_TEMPLATE= VBoxR3TstExe55 tstDisasm-2_DEFS= IN_DIS56 tstDisasm-2_SOURCES= \57 tstDisasm-2.cpp58 tstDisasm-2_LIBS= \59 $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) \60 $(LIB_RUNTIME)61 62 # Tests that will be build, disassembled and re-build from disassembly.63 VBOX_DISAS_TESTS_BUILD = \64 tstAsmFnstsw-1.asm \65 tstAsmLock-1.asm \66 tstAsmMovFixedReg-1.asm \67 tstAsmMovSeg-1.asm \68 tstAsmMovzx-1.asm \69 tstAsmPop-1.asm \70 tstAsmPush-1.asm \71 tstAsmSignExtend-1.asm \72 tstAsmRegs-1.asm \73 tstAsm3DNow-1.asm \ 74 75 # Tests that only contains invalid/undefined instructions.76 VBOX_DISAS_TESTS_INVALID = \77 tstAsmLock-2.asm \78 tstAsmLock-3.asm79 80 # Tests that will be disassembled and re-build from disassembly (list of binaries).81 ## @todo tstBinMovzx-1.bin: does C7 imply 32-bit reg in 16-bit mode, or what exactly does it do?82 VBOX_DISAS_TESTS_BINARIES := \83 tstBinMovzx-1.bin \84 tstBinFnstsw-1.bin85 ifeq ($(USER)x,bird)86 VBOX_DISAS_TESTS_BINARIES += \87 tstBin-1.bin \88 tstBin-2.bin \89 tstBin-3.bin \90 tstBin-4.bin \91 tstBin-5.bin \92 tstBin-6.bin93 # $(PATH_STAGE_BIN)/testcase/tstDisasm-2$(SUFF_EXEC)94 endif95 VBOX_DISAS_TESTS_BINARIES_NOT_16BIT := \96 tstBinFnstsw-1.bin97 VBOX_DISAS_TESTS_BINARIES_NOT_32BIT :=98 VBOX_DISAS_TESTS_BINARIES_NOT_64BIT :=99 100 101 #102 # The gory bits...103 #104 105 # Where we put the output files from the testcases.106 VBOX_DISAS_TEST_OUT_DIR := $(PATH_TARGET)/Disassembler/testcase107 BLDDIRS += $(VBOX_DISAS_TEST_OUT_DIR)108 109 # Generate the rules for creating the .bin files.110 VBOX_DISAS_TESTS_BIN = $(VBOX_DISAS_TESTS_BUILD) $(VBOX_DISAS_TESTS_INVALID)111 VBOX_DISAS_TEST_CLEAN += $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/,\112 $(VBOX_DISAS_TESTS_BIN:.asm=-16.bin)\113 $(VBOX_DISAS_TESTS_BIN:.asm=-32.bin)\114 $(VBOX_DISAS_TESTS_BIN:.asm=-64.bin))115 116 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BIN:.asm=-16.bin)): $(PATH_SUB_CURRENT)/$$(patsubst %-16.bin,%.asm,$$(notdir $$(@))) | $$(dir $$@)33 if1of ($(KBUILD_TARGET_ARCH), amd64 x86) 34 PROGRAMS += tstDisasm-1 35 tstDisasm-1_TEMPLATE = VBoxR3TstExe 36 tstDisasm-1_DEFS = IN_DIS 37 tstDisasm-1_SOURCES = \ 38 tstDisasm-1.cpp \ 39 tstDisasm-1A.asm 40 tstDisasm-1_LIBS = \ 41 $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) \ 42 $(LIB_RUNTIME) 43 44 PROGRAMS += tstDisasmCore-1 45 tstDisasmCore-1_EXTENDS = tstDisasm-1 46 tstDisasmCore-1_DEFS = IN_DIS DIS_CORE_ONLY 47 tstDisasmCore-1_LIBS = \ 48 $(PATH_STAGE_LIB)/DisasmCoreR3$(VBOX_SUFF_LIB) \ 49 $(LIB_RUNTIME) 50 endif 51 52 53 PROGRAMS += tstDisasm-2 54 tstDisasm-2_TEMPLATE = VBoxR3TstExe 55 tstDisasm-2_DEFS = IN_DIS 56 tstDisasm-2_SOURCES = \ 57 tstDisasm-2.cpp 58 tstDisasm-2_LIBS = \ 59 $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) \ 60 $(LIB_RUNTIME) 61 62 # Tests that will be build, disassembled and re-build from disassembly. 63 VBOX_DISAS_TESTS_BUILD = \ 64 tstAsmFnstsw-1.asm \ 65 tstAsmLock-1.asm \ 66 tstAsmMovFixedReg-1.asm \ 67 tstAsmMovSeg-1.asm \ 68 tstAsmMovzx-1.asm \ 69 tstAsmPop-1.asm \ 70 tstAsmPush-1.asm \ 71 tstAsmSignExtend-1.asm \ 72 tstAsmRegs-1.asm \ 73 tstAsm3DNow-1.asm 74 75 # Tests that only contains invalid/undefined instructions. 76 VBOX_DISAS_TESTS_INVALID = \ 77 tstAsmLock-2.asm \ 78 tstAsmLock-3.asm 79 80 # Tests that will be disassembled and re-build from disassembly (list of binaries). 81 ## @todo tstBinMovzx-1.bin: does C7 imply 32-bit reg in 16-bit mode, or what exactly does it do? 82 VBOX_DISAS_TESTS_BINARIES := \ 83 tstBinMovzx-1.bin \ 84 tstBinFnstsw-1.bin 85 ifeq ($(USER)x,bird) 86 VBOX_DISAS_TESTS_BINARIES += \ 87 tstBin-1.bin \ 88 tstBin-2.bin \ 89 tstBin-3.bin \ 90 tstBin-4.bin \ 91 tstBin-5.bin \ 92 tstBin-6.bin 93 # $(PATH_STAGE_BIN)/testcase/tstDisasm-2$(SUFF_EXEC) 94 endif 95 VBOX_DISAS_TESTS_BINARIES_NOT_16BIT := \ 96 tstBinFnstsw-1.bin 97 VBOX_DISAS_TESTS_BINARIES_NOT_32BIT := 98 VBOX_DISAS_TESTS_BINARIES_NOT_64BIT := 99 100 101 # 102 # The gory bits... 103 # 104 105 # Where we put the output files from the testcases. 106 VBOX_DISAS_TEST_OUT_DIR := $(PATH_TARGET)/Disassembler/testcase 107 BLDDIRS += $(VBOX_DISAS_TEST_OUT_DIR) 108 109 # Generate the rules for creating the .bin files. 110 VBOX_DISAS_TESTS_BIN = $(VBOX_DISAS_TESTS_BUILD) $(VBOX_DISAS_TESTS_INVALID) 111 VBOX_DISAS_TEST_CLEAN += $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, \ 112 $(VBOX_DISAS_TESTS_BIN:.asm=-16.bin) \ 113 $(VBOX_DISAS_TESTS_BIN:.asm=-32.bin) \ 114 $(VBOX_DISAS_TESTS_BIN:.asm=-64.bin)) 115 116 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BIN:.asm=-16.bin)): $(PATH_SUB_CURRENT)/$$(patsubst %-16.bin,%.asm,$$(notdir $$(@))) | $$(dir $$@) 117 117 @$(ECHO) "Assembling: $(<F) into $(@F)" 118 118 $(TOOL_YASM_AS) -f bin -a x86 --force-strict -DTEST_BITS=16 -o $@ $< 119 119 120 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BIN:.asm=-32.bin)): $(PATH_SUB_CURRENT)/$$(patsubst %-32.bin,%.asm,$$(notdir $$(@))) | $$(dir $$@)120 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BIN:.asm=-32.bin)): $(PATH_SUB_CURRENT)/$$(patsubst %-32.bin,%.asm,$$(notdir $$(@))) | $$(dir $$@) 121 121 @$(ECHO) "Assembling: $(<F) into $(@F)" 122 122 $(TOOL_YASM_AS) -f bin -a x86 --force-strict -DTEST_BITS=32 -o $@ $< 123 123 124 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BIN:.asm=-64.bin)): $(PATH_SUB_CURRENT)/$$(patsubst %-64.bin,%.asm,$$(notdir $$(@))) | $$(dir $$@)124 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BIN:.asm=-64.bin)): $(PATH_SUB_CURRENT)/$$(patsubst %-64.bin,%.asm,$$(notdir $$(@))) | $$(dir $$@) 125 125 @$(ECHO) "Assembling: $(<F) into $(@F)" 126 126 $(TOOL_YASM_AS) -f bin -a x86 --force-strict -DTEST_BITS=64 -o $@ $< 127 127 128 128 129 # Generate the rules for the 'build' tests.130 VBOX_DISAS_TEST_CLEAN += $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/,\131 $(VBOX_DISAS_TESTS_BUILD:.asm=-16-disas.asm)\132 $(VBOX_DISAS_TESTS_BUILD:.asm=-32-disas.asm)\133 $(VBOX_DISAS_TESTS_BUILD:.asm=-64-disas.asm))134 135 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BUILD:.asm=-16-disas.asm)): $$(subst -disas.asm,.bin,$$@) $$(tstDisasm-2_1_STAGE_TARGET) | $$(dir $$@)129 # Generate the rules for the 'build' tests. 130 VBOX_DISAS_TEST_CLEAN += $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, \ 131 $(VBOX_DISAS_TESTS_BUILD:.asm=-16-disas.asm) \ 132 $(VBOX_DISAS_TESTS_BUILD:.asm=-32-disas.asm) \ 133 $(VBOX_DISAS_TESTS_BUILD:.asm=-64-disas.asm)) 134 135 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BUILD:.asm=-16-disas.asm)): $$(subst -disas.asm,.bin,$$@) $$(tstDisasm-2_1_STAGE_TARGET) | $$(dir $$@) 136 136 @$(ECHO) "Generating: $(@F) from $(<F)" 137 137 $(REDIRECT) -E VBOX_LOG_DEST=nofile -o $@ -- $(tstDisasm-2_1_STAGE_TARGET) --style=yasm --cpumode=16 $< 138 138 139 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BUILD:.asm=-32-disas.asm)): $$(subst -disas.asm,.bin,$$@) $$(tstDisasm-2_1_STAGE_TARGET) | $$(dir $$@)139 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BUILD:.asm=-32-disas.asm)): $$(subst -disas.asm,.bin,$$@) $$(tstDisasm-2_1_STAGE_TARGET) | $$(dir $$@) 140 140 @$(ECHO) "Generating: $(@F) from $(<F)" 141 141 $(REDIRECT) -E VBOX_LOG_DEST=nofile -o $@ -- $(tstDisasm-2_1_STAGE_TARGET) --style=yasm --cpumode=32 $< 142 142 143 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BUILD:.asm=-64-disas.asm)): $$(subst -disas.asm,.bin,$$@) $$(tstDisasm-2_1_STAGE_TARGET) | $$(dir $$@)143 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BUILD:.asm=-64-disas.asm)): $$(subst -disas.asm,.bin,$$@) $$(tstDisasm-2_1_STAGE_TARGET) | $$(dir $$@) 144 144 @$(ECHO) "Generating: $(@F) from $(<F)" 145 145 $(REDIRECT) -E VBOX_LOG_DEST=nofile -o $@ -- $(tstDisasm-2_1_STAGE_TARGET) --style=yasm --cpumode=64 $< 146 146 147 147 148 VBOX_DISAS_TEST_CLEAN += $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/,\149 $(VBOX_DISAS_TESTS_BUILD:.asm=-16-disas.bin)\150 $(VBOX_DISAS_TESTS_BUILD:.asm=-32-disas.bin)\151 $(VBOX_DISAS_TESTS_BUILD:.asm=-64-disas.bin))152 153 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BUILD:.asm=-16-disas.bin)): $$(subst .bin,.asm,$$@) | $$(dir $$@)148 VBOX_DISAS_TEST_CLEAN += $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, \ 149 $(VBOX_DISAS_TESTS_BUILD:.asm=-16-disas.bin) \ 150 $(VBOX_DISAS_TESTS_BUILD:.asm=-32-disas.bin) \ 151 $(VBOX_DISAS_TESTS_BUILD:.asm=-64-disas.bin)) 152 153 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BUILD:.asm=-16-disas.bin)): $$(subst .bin,.asm,$$@) | $$(dir $$@) 154 154 @$(ECHO) "Re-assembling: $(<F) into $(@F)" 155 155 $(TOOL_YASM_AS) -f bin -a x86 --force-strict -DTEST_BITS=16 -o $@ $< 156 156 157 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BUILD:.asm=-32-disas.bin)): $$(subst .bin,.asm,$$@) | $$(dir $$@)157 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BUILD:.asm=-32-disas.bin)): $$(subst .bin,.asm,$$@) | $$(dir $$@) 158 158 @$(ECHO) "Re-assembling: $(<F) into $(@F)" 159 159 $(TOOL_YASM_AS) -f bin -a x86 --force-strict -DTEST_BITS=32 -o $@ $< 160 160 161 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BUILD:.asm=-64-disas.bin)): $$(subst .bin,.asm,$$@) | $$(dir $$@)161 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_BUILD:.asm=-64-disas.bin)): $$(subst .bin,.asm,$$@) | $$(dir $$@) 162 162 @$(ECHO) "Re-assembling: $(<F) into $(@F)" 163 163 $(TOOL_YASM_AS) -f bin -a x86 --force-strict -DTEST_BITS=64 -o $@ $< 164 164 165 165 166 VBOX_DISAS_TESTS += $(foreach test, $(VBOX_DISAS_TESTS_BUILD:.asm=), $(test)-16.tst $(test)-32.tst $(test)-64.tst)167 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/,\168 $(VBOX_DISAS_TESTS_BUILD:.asm=-16.tst)\169 $(VBOX_DISAS_TESTS_BUILD:.asm=-32.tst)\170 $(VBOX_DISAS_TESTS_BUILD:.asm=-64.tst) ): $$(subst .tst,-disas.bin,$$@) | $$(dir $$@)166 VBOX_DISAS_TESTS += $(foreach test, $(VBOX_DISAS_TESTS_BUILD:.asm=), $(test)-16.tst $(test)-32.tst $(test)-64.tst) 167 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, \ 168 $(VBOX_DISAS_TESTS_BUILD:.asm=-16.tst) \ 169 $(VBOX_DISAS_TESTS_BUILD:.asm=-32.tst) \ 170 $(VBOX_DISAS_TESTS_BUILD:.asm=-64.tst) ): $$(subst .tst,-disas.bin,$$@) | $$(dir $$@) 171 171 @$(ECHO) "Verifying build: $(<F) and $(@F:.tst=.bin)" 172 172 @$(RM) -f $@ … … 177 177 178 178 179 # Generate the rules for the 'invalid' tests.180 VBOX_DISAS_TESTS += $(foreach test, $(VBOX_DISAS_TESTS_INVALID:.asm=), $(test)-16.tst $(test)-32.tst $(test)-64.tst)181 182 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_INVALID:.asm=-16.tst)): $$(patsubst %.tst,%.bin,$$@) $$(tstDisasm-2_1_STAGE_TARGET) | $$(dir $$@)179 # Generate the rules for the 'invalid' tests. 180 VBOX_DISAS_TESTS += $(foreach test, $(VBOX_DISAS_TESTS_INVALID:.asm=), $(test)-16.tst $(test)-32.tst $(test)-64.tst) 181 182 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_INVALID:.asm=-16.tst)): $$(patsubst %.tst,%.bin,$$@) $$(tstDisasm-2_1_STAGE_TARGET) | $$(dir $$@) 183 183 @$(ECHO) "TESTING: $(@F) [--undef-op=all]" 184 184 @$(RM) -f $@ … … 187 187 @$(ECHO) " PASSED: $(@F) [--undef-op=all]" 188 188 189 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_INVALID:.asm=-32.tst)): $$(patsubst %.tst,%.bin,$$@) $$(tstDisasm-2_1_STAGE_TARGET) | $$(dir $$@)189 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_INVALID:.asm=-32.tst)): $$(patsubst %.tst,%.bin,$$@) $$(tstDisasm-2_1_STAGE_TARGET) | $$(dir $$@) 190 190 @$(ECHO) "TESTING: $(@F) [--undef-op=all]" 191 191 @$(RM) -f $@ … … 194 194 @$(ECHO) " PASSED: $(@F) [--undef-op=all]" 195 195 196 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_INVALID:.asm=-64.tst)): $$(patsubst %.tst,%.bin,$$@) $$(tstDisasm-2_1_STAGE_TARGET) | $$(dir $$@)196 $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS_INVALID:.asm=-64.tst)): $$(patsubst %.tst,%.bin,$$@) $$(tstDisasm-2_1_STAGE_TARGET) | $$(dir $$@) 197 197 @$(ECHO) "TESTING: $(@F) [--undef-op=all]" 198 198 @$(RM) -f $@ … … 202 202 203 203 204 # Generate the rules for the binary tests.205 define def_vbox_disas_binary_rules206 $(outbase).asm: $(full_binary) $$$$(tstDisasm-2_1_STAGE_TARGET) | $(VBOX_DISAS_TEST_OUT_DIR)/204 # Generate the rules for the binary tests. 205 define def_vbox_disas_binary_rules 206 $(outbase).asm: $(full_binary) $$$$(tstDisasm-2_1_STAGE_TARGET) | $(VBOX_DISAS_TEST_OUT_DIR)/ 207 207 @$$(ECHO) "Generating: $$(@F) from $$(<F)" 208 208 $$(REDIRECT) -E VBOX_LOG_DEST=nofile -o $$@ -- $$(tstDisasm-2_1_STAGE_TARGET) --style=yasm --cpumode=$(bits) --undef-op=db $$< 209 209 210 $(outbase).bin + $(outbase).lst: $(outbase).asm210 $(outbase).bin + $(outbase).lst: $(outbase).asm 211 211 @$$(ECHO) "Re-assembling: $$(<F) into $$(@F)" 212 212 $$(TOOL_YASM_AS) -f bin -a x86 --force-strict -l $(outbase).lst -o $$@ $$< 213 213 214 $(outbase).tst: $(outbase).bin214 $(outbase).tst: $(outbase).bin 215 215 @$$(ECHO) "Verifying build: $$(<F) against $(not-dir $(full_binary))" 216 216 @$$(RM) -f $$@ … … 219 219 @$$(ECHO) " PASSED: $$(<F) [binary]" 220 220 221 $(name).tst:: $(outbase).tst222 VBOX_DISAS_TEST_CLEAN += $(outbase).tst $(outbase).bin $(outbase).asm223 VBOX_DISAS_TESTS += $(name)-rebuild-$(bits).tst224 endef # def_vbox_disas_binary_rules225 226 define def_vbox_disas_binary227 local name := $(notdir $(basename $(binary)))228 local full_binary := $(abspathex $(binary),$(PATH_SUB_CURRENT))229 local outbase := $(VBOX_DISAS_TEST_OUT_DIR)/$(name)-rebuild-$(bits)230 $(eval $(def_vbox_disas_binary_rules))231 endef # def_vbox_disas_binary232 233 ## @todo 64-bit is problematic because of bugs like POP RDI ending up as POP EDI (incorrect default opmode).234 #$(foreach bits, 64, $(foreach binary, $(VBOX_DISAS_TESTS_BINARIES), $(evalvalctx def_vbox_disas_binary)))235 $(foreach bits, 32 16, $(foreach binary, $(filter-out $(VBOX_DISAS_TESTS_BINARIES_NOT_$(bits)BIT), $(VBOX_DISAS_TESTS_BINARIES)) \221 $(name).tst:: $(outbase).tst 222 VBOX_DISAS_TEST_CLEAN += $(outbase).tst $(outbase).bin $(outbase).asm 223 VBOX_DISAS_TESTS += $(name)-rebuild-$(bits).tst 224 endef # def_vbox_disas_binary_rules 225 226 define def_vbox_disas_binary 227 local name := $(notdir $(basename $(binary))) 228 local full_binary := $(abspathex $(binary),$(PATH_SUB_CURRENT)) 229 local outbase := $(VBOX_DISAS_TEST_OUT_DIR)/$(name)-rebuild-$(bits) 230 $(eval $(def_vbox_disas_binary_rules)) 231 endef # def_vbox_disas_binary 232 233 ## @todo 64-bit is problematic because of bugs like POP RDI ending up as POP EDI (incorrect default opmode). 234 #$(foreach bits, 64, $(foreach binary, $(VBOX_DISAS_TESTS_BINARIES), $(evalvalctx def_vbox_disas_binary))) 235 $(foreach bits, 32 16, $(foreach binary, $(filter-out $(VBOX_DISAS_TESTS_BINARIES_NOT_$(bits)BIT), $(VBOX_DISAS_TESTS_BINARIES)) \ 236 236 , $(evalvalctx def_vbox_disas_binary))) 237 237 238 238 239 # Add the .tst to the clean up.240 VBOX_DISAS_TEST_CLEAN += $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS))241 OTHER_CLEAN += $(VBOX_DISAS_TEST_CLEAN)242 243 244 #245 # Add the tests to the target list for the testing pass.246 # (kBuild r1646)247 #248 TESTING += $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/,$(VBOX_DISAS_TESTS))249 250 251 #252 # The test aliases253 #254 # To run the tstAsmLock-3.asm test: kmk tstAsmLock-3.tst255 # To run the 64-bit tstAsmLock-3.asm test: kmk tstAsmLock-3-64.tst256 #257 define def_vbox_test_aliases258 local test_base := $(basename $(test))259 local test_root := $(patsubst %-16,%,$(patsubst %-32,%,$(patsubst %-64,%,$(test_base))))260 $(test_base).tst:: $(VBOX_DISAS_TEST_OUT_DIR)/$(test)261 $(test_root).tst:: $(test_base).tst262 $(test_base).o:: $(test_base).tst263 $(test_base).obj:: $(test_base).tst264 $(test_root).o:: $(test_root).tst265 $(test_root).obj:: $(test_root).tst266 endef267 $(foreach test,$(VBOX_DISAS_TESTS),$(evalvalctx def_vbox_test_aliases))239 # Add the .tst to the clean up. 240 VBOX_DISAS_TEST_CLEAN += $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/, $(VBOX_DISAS_TESTS)) 241 OTHER_CLEAN += $(VBOX_DISAS_TEST_CLEAN) 242 243 244 # 245 # Add the tests to the target list for the testing pass. 246 # (kBuild r1646) 247 # 248 TESTING += $(addprefix $(VBOX_DISAS_TEST_OUT_DIR)/,$(VBOX_DISAS_TESTS)) 249 250 251 # 252 # The test aliases 253 # 254 # To run the tstAsmLock-3.asm test: kmk tstAsmLock-3.tst 255 # To run the 64-bit tstAsmLock-3.asm test: kmk tstAsmLock-3-64.tst 256 # 257 define def_vbox_test_aliases 258 local test_base := $(basename $(test)) 259 local test_root := $(patsubst %-16,%,$(patsubst %-32,%,$(patsubst %-64,%,$(test_base)))) 260 $(test_base).tst:: $(VBOX_DISAS_TEST_OUT_DIR)/$(test) 261 $(test_root).tst:: $(test_base).tst 262 $(test_base).o:: $(test_base).tst 263 $(test_base).obj:: $(test_base).tst 264 $(test_root).o:: $(test_root).tst 265 $(test_root).obj:: $(test_root).tst 266 endef 267 $(foreach test,$(VBOX_DISAS_TESTS),$(evalvalctx def_vbox_test_aliases)) 268 268 269 269 endif # VBOX_WITH_TESTCASES -
trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
r98412 r98439 1793 1793 + $(PATH_TARGET)/UICommonComWrapperFiles.dep \ 1794 1794 +| $(if-expr defined(UICommon_VBOX_COMWRAPPERS) \ 1795 , $(UICommon_VBOX_COMWRAPPERS) \1796 , $$(UICommon_0_OUTDIR)/include/COMEnums.h \1797 $$(UICommon_0_OUTDIR)/include/COMWrappers.cpp \1798 ): \1795 , $(UICommon_VBOX_COMWRAPPERS) \ 1796 , $$(UICommon_0_OUTDIR)/include/COMEnums.h \ 1797 $$(UICommon_0_OUTDIR)/include/COMWrappers.cpp \ 1798 ): \ 1799 1799 $(VBOX_XIDL_FILE) \ 1800 1800 $(VBOX_VIRTUALBOX_SRC)/src/globals/COMWrappers.xsl \ -
trunk/src/VBox/ImageMounter/Makefile.kmk
r98103 r98439 30 30 31 31 if defined(VBOX_WITH_VBOXIMGMOUNT) && "$(intersects $(KBUILD_TARGET_ARCH), $(VBOX_SUPPORTED_HOST_ARCHS))" != "" 32 32 include $(PATH_SUB_CURRENT)/vboximg-mount/Makefile.kmk 33 33 endif 34 34 -
trunk/src/VBox/ImageMounter/vboximg-mount/Makefile.kmk
r98187 r98439 34 34 PROGRAMS += vboximg-mount 35 35 36 vboximg-mount_TEMPLATE = 36 vboximg-mount_TEMPLATE = VBoxMainClientExe 37 37 vboximg-mount_DEFS.darwin = __FreeBSD_==10 38 38 vboximg-mount_DEFS = _FILE_OFFSET_BITS=64 39 39 40 40 vboximg-mount_SOURCES = \ 41 42 43 44 45 46 47 48 49 41 vboximg-mount.cpp \ 42 vboximg-mount.h \ 43 vboximgCrypto.cpp \ 44 vboximgCrypto.h \ 45 vboximgMedia.cpp \ 46 vboximgMedia.h \ 47 vboximgOpts.h \ 48 SelfSizingTable.h \ 49 fuse.cpp 50 50 51 51 vboximg-mount_LIBS = \ -
trunk/src/VBox/Makefile.kmk
r98103 r98439 33 33 include $(PATH_SUB_CURRENT)/Runtime/Makefile.kmk 34 34 if defined(VBOX_WITH_CROGL) || defined(VBOX_WITH_HGSMI) 35 if1of ($(KBUILD_TARGET), win linux solaris freebsd netbsd haiku)35 if1of ($(KBUILD_TARGET), win linux solaris freebsd netbsd haiku) 36 36 include $(PATH_SUB_CURRENT)/GuestHost/Makefile.kmk 37 37 endif -
trunk/src/VBox/Runtime/Makefile.kmk
r98409 r98439 1755 1755 $$($(target)_2_VBOX_NOCRT_ALIAS_KMK_FILE).ts +| $$($(target)_2_VBOX_NOCRT_ALIAS_KMK_FILE): \ 1756 1756 $$(abspathex \ 1757 $$($(target)_SOURCES) \1758 $$($(target)_SOURCES.$(bld_trg)) \1759 $$($(target)_SOURCES.$(bld_trg).$(bld_type)) \1760 $$($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \1761 $$($(target)_SOURCES.$(bld_trg).$(bld_trg_arch).$(bld_type)) \1762 $$($(target)_SOURCES.$(bld_trg_arch)) \1763 $$($(target)_SOURCES.$(bld_trg_cpu)) \1764 $$($(target)_SOURCES.$(bld_type)) \1765 , $(firstfile $(defpath) $(PATH_SUB_CURRENT))) \1757 $$($(target)_SOURCES) \ 1758 $$($(target)_SOURCES.$(bld_trg)) \ 1759 $$($(target)_SOURCES.$(bld_trg).$(bld_type)) \ 1760 $$($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \ 1761 $$($(target)_SOURCES.$(bld_trg).$(bld_trg_arch).$(bld_type)) \ 1762 $$($(target)_SOURCES.$(bld_trg_arch)) \ 1763 $$($(target)_SOURCES.$(bld_trg_cpu)) \ 1764 $$($(target)_SOURCES.$(bld_type)) \ 1765 , $(firstfile $(defpath) $(PATH_SUB_CURRENT))) \ 1766 1766 $$(VBOX_PATH_RUNTIME_SRC)//nocrt-aliases.sed 1767 1767 $$(call MSG_GENERATE,$(target),$$@,) … … 2977 2977 $(PATH_SUB_CURRENT)/r3/win/VBoxRT-openssl-3.0.def \ 2978 2978 $(if-expr "$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)" == "win.x86" && defined(VBOX_WITH_MORE_NT4_COMPAT_BINARIES) \ 2979 ,$(PATH_SUB_CURRENT)/r3/win/VBoxRT-msvcr100-win32.def ,) \2979 ,$(PATH_SUB_CURRENT)/r3/win/VBoxRT-msvcr100-win32.def ,) \ 2980 2980 | $$(dir $$@) #$(PATH_SUB_CURRENT)/r3/win/VBoxRT-msvcp100-win32.def 2981 2981 $(RM) -f -- $@ -
trunk/src/VBox/Storage/testcase/Makefile.kmk
r98256 r98439 54 54 TSTVDIO_BUILTIN_TESTS_FILE = $(tstVDIo_0_OUTDIR)/BuiltinTests.cpp 55 55 TSTVDIO_BUILTIN_TESTS := \ 56 57 58 59 60 61 56 tstVDIo=tstVDIo.vd \ 57 tstVDResize=tstVDResize.vd \ 58 tstVDCompact=tstVDCompact.vd \ 59 tstVDCopy=tstVDCopy.vd \ 60 tstVDDiscard=tstVDDiscard.vd \ 61 tstVDShareable=tstVDShareable.vd 62 62 TSTVDIO_BUILTIN_TEST_NAMES := $(foreach test,$(TSTVDIO_BUILTIN_TESTS),$(firstword $(subst =,$(SPACE) ,$(test)))) 63 63 TSTVDIO_PATH_TESTS := $(PATH_SUB_CURRENT) … … 65 65 # 1=name, 2=filter 66 66 TSTVDIO_GEN_TEST_MACRO = 'TSTVDIOTESTENTRY const g_a$(1)[] =' '{' \ 67 $(foreach testnm,$(filter $(2),$(TSTVDIO_BUILTIN_TEST_NAMES)), ' TSTVDIOTESTENTRY_GEN($(testnm), g_ab$(testnm)),') \68 '};' 'unsigned const g_c$(1) = RT_ELEMENTS(g_a$(1));' '' ''67 $(foreach testnm,$(filter $(2),$(TSTVDIO_BUILTIN_TEST_NAMES)), ' TSTVDIOTESTENTRY_GEN($(testnm), g_ab$(testnm)),') \ 68 '};' 'unsigned const g_c$(1) = RT_ELEMENTS(g_a$(1));' '' '' 69 69 70 70 $$(TSTVDIO_BUILTIN_TESTS_FILE): $(MAKEFILE_CURRENT) \ 71 $(foreach test,$(TSTVDIO_BUILTIN_TESTS),$(TSTVDIO_PATH_TESTS)/$(lastword $(subst =,$(SPACE) ,$(test)))) \72 $(VBOX_BIN2C) \73 | $$(dir $$@)71 $(foreach test,$(TSTVDIO_BUILTIN_TESTS),$(TSTVDIO_PATH_TESTS)/$(lastword $(subst =,$(SPACE) ,$(test)))) \ 72 $(VBOX_BIN2C) \ 73 | $$(dir $$@) 74 74 $(QUIET)$(RM) -f -- $@ [email protected] 75 75 $(QUIET)$(APPEND) -n "$@" \ … … 82 82 "$@") 83 83 84 # Generate test lists.84 # Generate test lists. 85 85 $(QUIET)$(APPEND) -n "$@" '' \ 86 86 $(call TSTVDIO_GEN_TEST_MACRO,VDIoTests,%) \ … … 119 119 # vbox-img - static because it might be used as a standalone tool. 120 120 # 121 ifneq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), 122 vbox-img_TEMPLATE := VBoxR3Exe123 vbox-img_DEFS:= IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS121 ifneq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),solaris.sparc32 solaris.sparc64) 122 vbox-img_TEMPLATE := VBoxR3Exe 123 vbox-img_DEFS := IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS 124 124 else 125 vbox-img_TEMPLATE := VBoxR3Static126 vbox-img_DEFS:= IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS125 vbox-img_TEMPLATE := VBoxR3Static 126 vbox-img_DEFS := IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS 127 127 endif 128 128 vbox-img_INCS := \ 129 ../../Main/include129 ../../Main/include 130 130 vbox-img_SOURCES := \ 131 vbox-img.cpp \132 ../VD.cpp \133 ../VDPlugin.cpp \134 ../VDVfs.cpp \135 ../VDI.cpp \136 ../VMDK.cpp \137 ../VHD.cpp \138 ../DMG.cpp \139 ../Parallels.cpp \140 ../ISCSI.cpp \141 ../RAW.cpp \142 ../QED.cpp \143 ../QCOW.cpp \144 ../VHDX.cpp \145 ../CUE.cpp \146 ../VISO.cpp \147 ../VCICache.cpp \148 ../VDIfVfs.cpp131 vbox-img.cpp \ 132 ../VD.cpp \ 133 ../VDPlugin.cpp \ 134 ../VDVfs.cpp \ 135 ../VDI.cpp \ 136 ../VMDK.cpp \ 137 ../VHD.cpp \ 138 ../DMG.cpp \ 139 ../Parallels.cpp \ 140 ../ISCSI.cpp \ 141 ../RAW.cpp \ 142 ../QED.cpp \ 143 ../QCOW.cpp \ 144 ../VHDX.cpp \ 145 ../CUE.cpp \ 146 ../VISO.cpp \ 147 ../VCICache.cpp \ 148 ../VDIfVfs.cpp 149 149 vbox-img_SOURCES.win = \ 150 vbox-img.rc150 vbox-img.rc 151 151 ifeq ($(vbox-img_TEMPLATE),VBoxR3Exe) 152 152 vbox-img_LIBS = \ 153 $(LIB_RUNTIME)153 $(LIB_RUNTIME) 154 154 ifeq ($(KBUILD_TARGET),freebsd) 155 155 vbox-img_LIBS += geom bsdxml sbuf … … 160 160 else 161 161 vbox-img_LIBS = \ 162 $(VBOX_LIB_RUNTIME_STATIC)163 if1of ($(KBUILD_TARGET), os2 win)162 $(VBOX_LIB_RUNTIME_STATIC) 163 if1of ($(KBUILD_TARGET), os2 win) 164 164 vbox-img_LIBS += \ 165 $(SDK_VBoxLzf_STATIC_LIBS) \166 $(SDK_VBoxZlibStatic_LIBS)165 $(SDK_VBoxLzf_STATIC_LIBS) \ 166 $(SDK_VBoxZlibStatic_LIBS) 167 167 else 168 168 vbox-img_LIBS += \ 169 $(SDK_VBoxLzf_LIBS) \170 $(SDK_VBoxZlib_LIBS)169 $(SDK_VBoxLzf_LIBS) \ 170 $(SDK_VBoxZlib_LIBS) 171 171 endif 172 172 ifeq ($(KBUILD_TARGET),linux) … … 193 193 endif 194 194 195 if 196 197 195 if defined(VBOX_WITH_TESTCASES) && defined(VBOX_WITH_PLUGIN_CRYPT) \ 196 && defined(VBOX_WITH_EXTPACK_PUEL) && defined(VBOX_WITH_EXTPACK_PUEL_BUILD) \ 197 && defined(VBOX_WITH_VDKEYSTOREMGR) 198 198 PROGRAMS += vdkeystoremgr 199 199 … … 204 204 vdkeystoremgr_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS 205 205 vdkeystoremgr_SOURCES = \ 206 vdkeystoremgr.cpp \207 ../VDKeyStore.cpp206 vdkeystoremgr.cpp \ 207 ../VDKeyStore.cpp 208 208 vdkeystoremgr_SOURCES.win = \ 209 vdkeystoremgr_SOURCES.rc209 vdkeystoremgr_SOURCES.rc 210 210 vdkeystoremgr_LIBS = \ 211 $(VBOX_LIB_RUNTIME_STATIC) \212 $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB)213 if1of ($(KBUILD_TARGET), os2 win)211 $(VBOX_LIB_RUNTIME_STATIC) \ 212 $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB) 213 if1of ($(KBUILD_TARGET), os2 win) 214 214 vdkeystoremgr_LIBS += \ 215 $(SDK_VBoxLzf_STATIC_LIBS) \216 $(SDK_VBoxZlibStatic_LIBS)215 $(SDK_VBoxLzf_STATIC_LIBS) \ 216 $(SDK_VBoxZlibStatic_LIBS) 217 217 else 218 218 vdkeystoremgr_LIBS += \ 219 $(SDK_VBoxLzf_LIBS) \220 $(SDK_VBoxZlib_LIBS)219 $(SDK_VBoxLzf_LIBS) \ 220 $(SDK_VBoxZlib_LIBS) 221 221 endif 222 222 ifeq ($(KBUILD_TARGET),linux) … … 224 224 vdkeystoremgr_LIBS += xml2 225 225 endif 226 else if1of ($(KBUILD_TARGET), darwin freebsd)226 else if1of ($(KBUILD_TARGET), darwin freebsd) 227 227 vdkeystoremgr_LIBS += iconv 228 228 else ifeq ($(KBUILD_TARGET),win) -
trunk/src/VBox/ValidationKit/Makefile.kmk
r98418 r98439 114 114 $(VBOX_PATH_VALIDATIONKIT)/ \ 115 115 $$(foreach inst, $$(VBOX_VALIDATIONKIT_INSTALLS), \ 116 $$(filter $(PATH_STAGE)/$(INST_VALIDATIONKIT)%, $$($$(inst)_2_STAGE_TARGETS)))116 $$(filter $(PATH_STAGE)/$(INST_VALIDATIONKIT)%, $$($$(inst)_2_STAGE_TARGETS))) 117 117 $(call MSG_L1,Packing the Test Suite $@) 118 118 $(QUIET)$(RM) -f $@
Note:
See TracChangeset
for help on using the changeset viewer.
