Changeset 5976 in vbox

Timestamp:

Dec 6, 2007 4:25:40 AM (17 years ago)

Author:

vboxsync

Message:

Removed the tests for KMK_USE_REDIRECT, KMK_USE_TEST, KMK_NEW_SED and KMK_NEW_CP.

Location:

trunk/src/VBox

Files:

• Devices/Graphics/BIOS/Makefile.kmk (modified) (3 diffs)
• Devices/PC/BIOS/Makefile.kmk (modified) (4 diffs)
• Devices/testcase/Makefile.kmk (modified) (2 diffs)
• Frontends/VirtualBox/Makefile.kmk (modified) (2 diffs)
• Main/Makefile.kmk (modified) (1 diff)
• Runtime/Makefile.kmk (modified) (1 diff)
• VMM/testcase/Makefile.kmk (modified) (4 diffs)

trunk/src/VBox/Devices/Graphics/BIOS/Makefile.kmk

@@ -6 +6 @@
 #
 #  Copyright (C) 2006-2007 innotek GmbH
-# 
+#
 #  This file is part of VirtualBox Open Source Edition (OSE), as
 #  available from http://www.virtualbox.org. This file is free software;
@@ -66 +66 @@
 
 # 1. create vbetables.h
-$(PATH_TARGET)/vbetables.h: $(MAKEFILE_CURRENT)
-ifdef KMK_USE_REDIRECT
+$(PATH_TARGET)/vbetables.h: $(MAKEFILE_CURRENT) $(TARGET_vbetables-gen)
         $(QUIET)$(REDIRECT) -wo $@ -- $(TARGET_vbetables-gen)
-else
-        $(QUIET)$(TARGET_vbetables-gen) > $@
-endif
 
 # 2. precompile
 $(PATH_TARGET)/_vgabios_.c: $(addprefix $(PATH_SUB_CURRENT)/,vgabios.c vgabios.h vbe.h vgatables.h vgafonts.h vbe.c clext.c) $(PATH_TARGET)/vbetables.h
         $(call MSG_TOOL,cpp,VgaBiosBin,$<,$@)
-ifdef KMK_USE_REDIRECT
         $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -P -DVBOX -DVBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" -DVBE -DVGABIOS_DATE="''" $(addprefix -D,$(DEFS) $(DEFS.$(BUILD_TYPE))) -o $@ $<
-else
-        $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -DVBOX -DVBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" -E -P $< -DVBE -DVGABIOS_DATE="''" $(addprefix -D,$(DEFS) $(DEFS.$(BUILD_TYPE))) > $@
-endif
 
 # 3. compile - tempfile clashes, so make sure it's built in solitude.
@@ -91 +83 @@
 $(PATH_TARGET)/vgabios1.s: $(PATH_TARGET)/vgabios0.s
         $(call MSG_TOOL,Adjusting BCC Assembly,VgaBiosBin,$<,$@)
-ifdef KMK_NEW_SED
         $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' --output $@ $^
-else
-        $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' $^ > $@
-endif
 
 # 5. assemble
 $(PATH_TARGET)/vgabios.tmp $(PATH_TARGET)/vgabios.lst: $(PATH_TARGET)/vgabios1.s
         $(call MSG_COMPILE,VgaBiosBin,$<,$@,AS)
-ifdef KMK_USE_REDIRECT
         $(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(PATH_TARGET)/vgabios.tmp -u- -w- -g -0 -j -O -l $(PATH_TARGET)/vgabios.lst
-else
-        $(QUIET)$(VBOX_AS86) -b $(PATH_TARGET)/vgabios.tmp -u- -w- -g -0 -j -O -l $(PATH_TARGET)/vgabios.lst < $^
-endif
 
 # 6. checksums

trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk

@@ -6 +6 @@
 #
 #  Copyright (C) 2006-2007 innotek GmbH
-# 
+#
 #  This file is part of VirtualBox Open Source Edition (OSE), as
 #  available from http://www.virtualbox.org. This file is free software;
@@ -63 +63 @@
 $(PATH_TARGET)/_rombios_.c: $(PATH_SUB_CURRENT)/rombios.c $(PATH_SUB_CURRENT)/logo.c $(PATH_SUB_CURRENT)/apmbios.S | $(call DIRDEP,$(TARGET_PATH))
         $(call MSG_TOOL,cpp,PcBiosBin,$<,$@)
-ifdef KMK_USE_REDIRECT
         $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -I$(PATH_TARGET) -I$(VBOX_PATH_DEVICES_SRC)/PC -I$(PATH_ROOT)/include -I$(PATH_OUT) -DBX_SMP_PROCESSORS=1 -DVBOX $(addprefix -D,$(DEFS) $(DEFS.$(BUILD_TYPE))) -P -o $@ $<
-else
-        $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -I$(PATH_TARGET) -I$(VBOX_PATH_DEVICES_SRC)/PC -I$(PATH_ROOT)/include -I$(PATH_OUT) -DBX_SMP_PROCESSORS=1 -DVBOX $(addprefix -D,$(DEFS) $(DEFS.$(BUILD_TYPE))) -P $< > $@
-endif
 
 # 2. compile to intermediate asm file - tempfile clashes, make sure it's built alone.
@@ -78 +74 @@
 $(PATH_TARGET)/rombios1.s: $(PATH_TARGET)/rombios0.s
         $(call MSG_TOOL,Adjusting BCC Assembly,PcBiosBin,$<,$@)
-ifdef KMK_NEW_SED
         $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' --output $@ $^
-else
-        $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' $^ > $@
-endif
 
 # 4. assemble the intermediate asm file. (also creates a listing rombios.lst)
 $(PATH_TARGET)/pcbios.tmp $(PATH_TARGET)/pcbios.lst: $(PATH_TARGET)/rombios1.s
         $(call MSG_COMPILE,PcBiosBin,$<,$@,AS)
-ifdef KMK_USE_REDIRECT
         $(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(PATH_TARGET)/pcbios.tmp -u- -w- -g -0 -j -O -l $(PATH_TARGET)/pcbios.lst
-else
-        $(QUIET)$(VBOX_AS86) -b $(PATH_TARGET)/pcbios.tmp -u- -w- -g -0 -j -O -l $(PATH_TARGET)/pcbios.lst < $^
-endif
 
 # 5. calculate checksums for the final BIOS image.
@@ -102 +90 @@
 $(PATH_TARGET)/pcbios-syms.h: $(PATH_TARGET)/pcbios.lst $(MAKEFILE_CURRENT)
         $(call MSG_GENERATE,PcBiosBin,$<,$@)
-ifdef KMK_NEW_SED
         $(QUIET)$(SED) \
                 -e  '/^[0-9][0-9][0-9][0-9][0-9]                       000[0-9A-F]*            [[:space:]]*[a-zA-Z0-9_]*:/!d' \
                 -e 's/^[0-9][0-9][0-9][0-9][0-9]                       \(000[0-9A-F]*\)            [[:space:]]*\([a-zA-Z0-9_]*\):.*$$/    DEFSYM(0x\1, "\2"),/' \
                 --output $@ \
-                $(PATH_TARGET)/pcbios.lst 
-else
-        $(QUIET)$(SED) \
-                -e  '/^[0-9][0-9][0-9][0-9][0-9]                       000[0-9A-F]*            [[:space:]]*[a-zA-Z0-9_]*:/!d' \
-                -e 's/^[0-9][0-9][0-9][0-9][0-9]                       \(000[0-9A-F]*\)            [[:space:]]*\([a-zA-Z0-9_]*\):.*$$/    DEFSYM(0x\1, "\2"),/' \
-                $(PATH_TARGET)/pcbios.lst > $@
-endif
+                $(PATH_TARGET)/pcbios.lst
 
 

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

@@ -6 +6 @@
 #
 #  Copyright (C) 2006-2007 innotek GmbH
-# 
+#
 #  This file is part of VirtualBox Open Source Edition (OSE), as
 #  available from http://www.virtualbox.org. This file is free software;
@@ -87 +87 @@
 $(PATH_TARGET)/tstDeviceStructSizeGC.h: $$(INSTARGET_tstDeviceStructSizeGC)
         $(call MSG_GENERATE,,$@)
-ifdef KMK_USE_REDIRECT
         $(QUIET)$(REDIRECT) -wo $@ -- $(INSTARGET_tstDeviceStructSizeGC)
-else
-        $(QUIET)$(INSTARGET_tstDeviceStructSizeGC) > $@
-endif
 
 # 3. run it.

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -329 +329 @@
         $(call MSG_GENERATE,VirtualBoxVM.app,$<,$@)
         $(QUIET)$(RM) -f $@
-ifdef KMK_NEW_SED
         $(QUIET)$(SED) \
                 -e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
@@ -336 +335 @@
                 -e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
                 --output $@ $<
-else
-        $(QUIET)$(SED) \
-                -e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-                -e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-                -e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-                -e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-                $< > $@
-endif
 
 #

trunk/src/VBox/Main/Makefile.kmk

@@ -86 +86 @@
         $(RM) -f $(wildcard $(PATH_OUT)/docs/Main/html/*)
         $(VBOX_XSLTPROC) -o $(PATH_TARGET)/VirtualBox.idl idl/doxygen.xsl idl/VirtualBox.xidl
-ifdef KMK_USE_REDIRECT
         $(REDIRECT) -E 'PATH_OUT=$(PATH_OUT)' -E 'PATH_TARGET=$(PATH_TARGET)' -E 'PATH_CHM=$(subst /,\,$(PATH_BIN)/VirtualBoxAPI.chm)' \
                 -- doxygen Doxyfile.Main
-else
-        PATH_OUT="$(PATH_OUT)" PATH_TARGET="$(PATH_TARGET)" PATH_CHM="$(subst /,\\,$(PATH_BIN)/VirtualBoxAPI.chm)" doxygen Doxyfile.Main
-endif
         -$(EXEC_X86_WIN32) $(VBOX_PATH_HTML_HELP_WORKSHOP)/hhc.exe $(subst /,\\,$(PATH_OUT)/docs/Main/html/index.hhp)
         $(APPEND) $(PATH_TARGET)/docs.Main

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1075 +1075 @@
         $(call MSG_GENERATE,,$@,$(filter %.h,$^))
         $(QUIET)$(MKDIR) -p $(PATH_TARGET)
-ifdef KMK_USE_REDIRECT
         $(QUIET)$(REDIRECT) -wo $@ -- $(SED) -f $< $(filter %.h,$^)
-else
-        $(QUIET)$(SED) -f $< $(filter %.h,$^) > $@
-endif
+
 ## @todo r=bird: rename this to indicate that it's not only COM errors, but all win32/64 errors.
 $(PATH_TARGET)/errmsgcomdata.h: common/err/errmsgcom.sed $(PATH_SDK_WINPSDK_INC)/WinError.h
         $(call MSG_GENERATE,,$@,$(filter %.h,$^))
         $(QUIET)$(MKDIR) -p $(PATH_TARGET)
-ifdef KMK_USE_REDIRECT
         $(QUIET)$(REDIRECT) -wo $@ -- $(SED) -f $< $(filter %.h,$^)
-else
-        $(QUIET)$(SED) -f $< $(filter %.h,$^) > $@
-endif
+
 $(PATH_TARGET)/errmsgxpcomdata.h: common/err/errmsgxpcom.sed $(DEPTH)/src/libs/xpcom18a4/xpcom/base/nsError.h
         $(call MSG_GENERATE,,$@,$(filter %.h,$^))
         $(QUIET)$(MKDIR) -p $(PATH_TARGET)
-ifdef KMK_USE_REDIRECT
         $(QUIET)$(REDIRECT) -wo $@ -- $(SED) -f $< $(filter %.h,$^)
-else
-        $(QUIET)$(SED) -f $< $(filter %.h,$^) > $@
-endif
 
 

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

@@ -236 +236 @@
 ifndef DONT_USE_YASM
         $(QUIET)$(TOOL_YASM_AS) $(MY_ASA_ASM_STUFF) -o [email protected] -l [email protected] $<
-ifdef KMK_NEW_SED
         $(SED) -f $(VBOX_PATH_VMM_SRC)/testcase/tstAsmStructsAsm-lst.sed --output $@ [email protected]
-else
-        $(SED) -f $(VBOX_PATH_VMM_SRC)/testcase/tstAsmStructsAsm-lst.sed [email protected] > $@
-endif
 else
         $(QUIET)$(TOOL_NASM_AS) -g $(MY_ASA_ASM_STUFF) -o [email protected] -l [email protected] $<
@@ -266 +262 @@
         $(call MSG_GENERATE,tstVMStructSize,$@,$<)
         $(QUIET)$(RM) -f $@ [email protected] [email protected]
-ifdef KMK_USE_REDIRECT
         $(QUIET)$(REDIRECT) -wo [email protected] -- $(VBOX_NM) $<
-else
-        $(VBOX_NM) $< > [email protected]
-endif
-ifdef KMK_NEW_SED
         $(QUIET)$(SED) -e '/STAMPROFILEADV/d' \
                -e '/00[0-9a-fA-F]* [aA] [^_.]*\./!d'       -e 's/\(00[0-9a-fA-F]*\) [aA] \([^.]*\)\.\(.*$$\)/    CHECK_OFF(\2, 0x0\1, \3);/' \
-               --output [email protected] [email protected] 
+               --output [email protected] [email protected]
         $(QUIET)$(SED) -e '/VM_size$$/d' \
                -e '/00[0-9a-fA-F]* [aA] [^_.]*_size$$/!d'  -e 's/\(00[0-9a-fA-F]*\) [aA] \([^_.]*\)_size/    CHECK_SIZE(\2, 0x0\1);/' \
                --append [email protected] [email protected]
-else
-        $(QUIET)$(SED) -e '/STAMPROFILEADV/d' \
-               -e '/00[0-9a-fA-F]* [aA] [^_.]*\./!d'       -e 's/\(00[0-9a-fA-F]*\) [aA] \([^.]*\)\.\(.*$$\)/    CHECK_OFF(\2, 0x0\1, \3);/' \
-               [email protected] >  [email protected]
-        $(QUIET)$(SED) -e '/VM_size$$/d' \
-               -e '/00[0-9a-fA-F]* [aA] [^_.]*_size$$/!d'  -e 's/\(00[0-9a-fA-F]*\) [aA] \([^_.]*\)_size/    CHECK_SIZE(\2, 0x0\1);/' \
-               [email protected] >> [email protected]
-endif
         $(QUIET)$(MV) -f [email protected] $@
         $(QUIET)$(RM) -f [email protected]
@@ -292 +275 @@
 $(PATH_TARGET)/tstAsmStructsGC.h: $(PATH_TARGET)/tstAsmStructsHC.h
         $(call MSG_GENERATE,tstVMStructSize,$@,$<)
-ifdef KMK_NEW_SED
         $(QUIET)$(SED) -e '/VMMSWITCHERDEF/d' --output $@ $^
-else
-        $(QUIET)$(SED) -e '/VMMSWITCHERDEF/d' \
-                $^ > $@
-endif
 
 ## @todo make this default kBuild behaviour.
@@ -318 +296 @@
 $(PATH_TARGET)/tstVMStructGC.h: $$(INSTARGET_tstVMStructGC)
         $(call MSG_GENERATE,tstVMStructSize,$@)
-ifdef KMK_USE_REDIRECT
         $(QUIET)$(REDIRECT) -wo $@ -- $(INSTARGET_tstVMStructGC)
-else
-        $(QUIET)$(INSTARGET_tstVMStructGC) > $@
-endif
 
 # 2. run it.