VirtualBox

Changeset 5898 in vbox


Ignore:
Timestamp:
Dec 2, 2007 6:08:26 AM (17 years ago)
Author:
vboxsync
Message:

kBuild 0.1.2 preps: Avoid the shell at all costs because cygwin is messing up on smp boxes and screwing up the tinderbox.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r5884 r5898  
    958958$(PATH_OUT)/GCCConfig.kmk: $(PATH_ROOT)/Config.kmk $(LOCALCFG) $(AUTOCFG)
    959959        $(call MSG_GENERATE,,$@,)
    960         $(QUIET)$(RM) -f "$@"
     960        $(QUIET)$(RM) -f '$@'
    961961        $(QUIET)$(MKDIR) -p $(@D)
    962962
    963963        @# HC compiler switch detection.
    964         $(APPEND) "$@" "VBOX_GCC_VERSION_CC            ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CC))"
    965         $(APPEND) "$@" "VBOX_GCC_VERSION_CXX           ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CXX))"
    966         $(APPEND) "$@" "VBOX_GCC_LIBGCC                ?= $(shell $(TOOL_$(VBOX_GCC_TOOL)_CC) -print-libgcc-file-name)"
    967         $(APPEND) "$@" "VBOX_GCC_Wno-pointer-sign      ?= $(call VBOX_GCC_CHECK_CC,-Wno-pointer-sign,)"
    968         $(APPEND) "$@" "VBOX_GCC_Wno-variadic-macros   ?= $(call VBOX_GCC_CHECK_CXX,-Wno-variadic-macros,)"
    969         $(APPEND) "$@" "VBOX_GCC_Wno-invalid-offsetof  ?= $(call VBOX_GCC_CHECK_CXX,-Wno-invalid-offsetof,)"
    970         $(APPEND) "$@" "VBOX_GCC_Wno-extra             ?= $(call VBOX_GCC_CHECK_CXX,-Wno-extra)"
    971         $(APPEND) "$@" "VBOX_GCC_fno-stack-protector   ?= $(call VBOX_GCC_CHECK_CC,-fno-stack-protector,)"
     964        $(APPEND) '$@' 'VBOX_GCC_VERSION_CC            ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CC))'
     965        $(APPEND) '$@' 'VBOX_GCC_VERSION_CXX           ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC_TOOL)_CXX))'
     966        $(APPEND) '$@' 'VBOX_GCC_LIBGCC                ?= $(shell $(TOOL_$(VBOX_GCC_TOOL)_CC) -print-libgcc-file-name)'
     967        $(APPEND) '$@' 'VBOX_GCC_Wno-pointer-sign      ?= $(call VBOX_GCC_CHECK_CC,-Wno-pointer-sign,)'
     968        $(APPEND) '$@' 'VBOX_GCC_Wno-variadic-macros   ?= $(call VBOX_GCC_CHECK_CXX,-Wno-variadic-macros,)'
     969        $(APPEND) '$@' 'VBOX_GCC_Wno-invalid-offsetof  ?= $(call VBOX_GCC_CHECK_CXX,-Wno-invalid-offsetof,)'
     970        $(APPEND) '$@' 'VBOX_GCC_Wno-extra             ?= $(call VBOX_GCC_CHECK_CXX,-Wno-extra)'
     971        $(APPEND) '$@' 'VBOX_GCC_fno-stack-protector   ?= $(call VBOX_GCC_CHECK_CC,-fno-stack-protector,)'
    972972        @# Produce code optimized for the most common IA32/AMD64/EM64T processors. Introduced with gcc version 4.2.
    973         $(APPEND) "$@" "VBOX_GCC_mtune-generic         ?= $(call VBOX_GCC_CHECK_CC,-mtune=generic,)"
     973        $(APPEND) '$@' 'VBOX_GCC_mtune-generic         ?= $(call VBOX_GCC_CHECK_CC,-mtune=generic,)'
    974974ifneq ($(BUILD_TARGET),l4)
    975975        @# Set default attribute for ELF and MACH-O symbols to ``hidden'' to reduce the number
    976976        @# of relocation entries and PLT indirections in shared libraries. Don't allow for gcc version < 4.
    977         $(APPEND) "$@" "ifneq ($$(VBOX_GCC_VERSION_CC),)"
    978         $(APPEND) "$@" " ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CC),40000),)"
    979         $(APPEND) "$@" "  VBOX_GCC_fvisibility-hidden  ?= $(call VBOX_GCC_CHECK_CC,-fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN,)"
    980         $(APPEND) "$@" " endif"
    981         $(APPEND) "$@" "endif"
     977        $(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CC),)'
     978        $(APPEND) '$@' ' ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CC),40000),)'
     979        $(APPEND) '$@' '  VBOX_GCC_fvisibility-hidden  ?= $(call VBOX_GCC_CHECK_CC,-fvisibility=hidden -DVBOX_HAVE_VISIBILITY_HIDDEN,)'
     980        $(APPEND) '$@' ' endif'
     981        $(APPEND) '$@' 'endif'
    982982endif
    983983ifneq ($(BUILD_TARGET),l4)
    984984        @# Set default attribute for inline functions to ``hidden'' to reduce the number
    985985        @# of relocation entries and PLT indirections in shared libraries. Don't allow for gcc version < 4.
    986         $(APPEND) "$@" "ifneq ($$(VBOX_GCC_VERSION_CXX),)"
    987         $(APPEND) "$@" " ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CXX),40000),)"
    988         $(APPEND) "$@" "  VBOX_GCC_fvisibility-inlines-hidden ?= $(call VBOX_GCC_CHECK_CXX,-fvisibility-inlines-hidden,)"
    989         $(APPEND) "$@" " endif"
    990         $(APPEND) "$@" "endif"
     986        $(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CXX),)'
     987        $(APPEND) '$@' ' ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CXX),40000),)'
     988        $(APPEND) '$@' '  VBOX_GCC_fvisibility-inlines-hidden ?= $(call VBOX_GCC_CHECK_CXX,-fvisibility-inlines-hidden,)'
     989        $(APPEND) '$@' ' endif'
     990        $(APPEND) '$@' 'endif'
    991991endif
    992992        @# Find the compiler includes for IPRT no-crt.
    993993        @# Note that `$(dir $(gcc -print-libgcc-file-name))/include does not work for a 64-bit cross build on a 32-bit build host.
    994         $(APPEND) "$@" "VBOX_PATH_GCC_INCS             ?= $(shell LC_ALL=C $(TOOL_$(VBOX_GCC_TOOL)_CC) -print-search-dirs|$(SED_EXT) -ne 's+^install: \(.*[^/][^/]*\)/+\1+p')/include"
     994        $(APPEND) '$@' 'VBOX_PATH_GCC_INCS             ?= $(shell LC_ALL=C $(TOOL_$(VBOX_GCC_TOOL)_CC) -print-search-dirs|$(SED_EXT) -ne 's+^install: \(.*[^/][^/]*\)/+\1+p')/include'
    995995
    996996        @# 32-bit (GC) compiler switch detection.
    997         $(APPEND) "$@" "VBOX_GCC32_VERSION_CC          ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC32_TOOL)_CC))"
    998         $(APPEND) "$@" "VBOX_GCC32_VERSION_CXX         ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC32_TOOL)_CXX))"
    999         $(APPEND) "$@" "VBOX_GCC32_LIBGCC              ?= $(shell $(TOOL_$(VBOX_GCC32_TOOL)_CC) -print-libgcc-file-name)"
    1000         $(APPEND) "$@" "VBOX_GCC32_Wno-variadic-macros ?= $(call VBOX_GCC32_CHECK_CXX,-Wno-variadic-macros,)"
     997        $(APPEND) '$@' 'VBOX_GCC32_VERSION_CC          ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC32_TOOL)_CC))'
     998        $(APPEND) '$@' 'VBOX_GCC32_VERSION_CXX         ?= $(call VBOX_GCC_VERSION,$(TOOL_$(VBOX_GCC32_TOOL)_CXX))'
     999        $(APPEND) '$@' 'VBOX_GCC32_LIBGCC              ?= $(shell $(TOOL_$(VBOX_GCC32_TOOL)_CC) -print-libgcc-file-name)'
     1000        $(APPEND) '$@' 'VBOX_GCC32_Wno-variadic-macros ?= $(call VBOX_GCC32_CHECK_CXX,-Wno-variadic-macros,)'
    10011001
    10021002include $(PATH_OUT)/GCCConfig.kmk
    … …  
    10841084# @param    1   The inf file to edit.
    10851085# @param    2   The output file.
     1086ifdef KMK_NEW_SED
     1087VBOX_EDIT_INF32_FN = $(SED) $(if $(VBOX_SIGNING_MODE),-e 's/^;cat  *//', -e '/^;cat /d') -e 's/^;x86  *//' -e '/^;amd64 /d' --output $(2) $(1)
     1088else
    10861089VBOX_EDIT_INF32_FN = $(SED) $(if $(VBOX_SIGNING_MODE),-e 's/^;cat  *//', -e '/^;cat /d') -e 's/^;x86  *//' -e '/^;amd64 /d' $(1) > $(2)
     1090endif
    10871091## Edit an inf file an x86 target.
    10881092# @param    1   The inf file to edit.
    10891093# @param    2   The output file.
     1094ifdef KMK_NEW_SED
     1095VBOX_EDIT_INF64_FN = $(SED) $(if $(VBOX_SIGNING_MODE),-e 's/^;cat  *//', -e '/^;cat /d') -e 's/^;amd64  *//' -e '/^;x86 /d' --output $(2) $(1)
     1096else
    10901097VBOX_EDIT_INF64_FN = $(SED) $(if $(VBOX_SIGNING_MODE),-e 's/^;cat  *//', -e '/^;cat /d') -e 's/^;amd64  *//' -e '/^;x86 /d' $(1) > $(2)
     1098endif
    10911099
    10921100#
    … …  
    26052613        $(QUIET)$(MKDIR) -p $(@D)
    26062614        $(QUIET)$(RM) -f $@ [email protected]
    2607         $(QUIET)$(APPEND) [email protected] "#ifndef ___version_generated_h___"
    2608         $(QUIET)$(APPEND) [email protected] "#define ___version_generated_h___"
    2609         $(QUIET)$(APPEND) [email protected] ""
    2610         $(QUIET)$(APPEND) [email protected] "#define VBOX_VERSION_MAJOR $(VBOX_VERSION_MAJOR)"
    2611         $(QUIET)$(APPEND) [email protected] "#define VBOX_VERSION_MINOR $(VBOX_VERSION_MINOR)"
    2612         $(QUIET)$(APPEND) [email protected] "#define VBOX_VERSION_BUILD $(VBOX_VERSION_BUILD)"
     2615        $(QUIET)$(APPEND) [email protected] '#ifndef ___version_generated_h___'
     2616        $(QUIET)$(APPEND) [email protected] '#define ___version_generated_h___'
     2617        $(QUIET)$(APPEND) [email protected] ''
     2618        $(QUIET)$(APPEND) [email protected] '#define VBOX_VERSION_MAJOR $(VBOX_VERSION_MAJOR)'
     2619        $(QUIET)$(APPEND) [email protected] '#define VBOX_VERSION_MINOR $(VBOX_VERSION_MINOR)'
     2620        $(QUIET)$(APPEND) [email protected] '#define VBOX_VERSION_BUILD $(VBOX_VERSION_BUILD)'
    26132621        $(QUIET)$(APPEND) [email protected] '#define VBOX_VERSION_STRING "$(VBOX_VERSION_STRING)"'
    2614         $(QUIET)$(APPEND) [email protected] ""
    2615         $(QUIET)$(APPEND) [email protected] "#endif"
     2622        $(QUIET)$(APPEND) [email protected] ''
     2623        $(QUIET)$(APPEND) [email protected] '#endif'
    26162624        $(QUIET)$(MV) -f [email protected] $@
    26172625
    … …  
    26232631        $(QUIET)$(RM) -f $@ [email protected]
    26242632        $(QUIET)$(MKDIR) -p $(@D)
    2625         $(QUIET)$(APPEND) [email protected] "VBOX_VERSION_MAJOR = $(VBOX_VERSION_MAJOR)"
    2626         $(QUIET)$(APPEND) [email protected] "VBOX_VERSION_MINOR = $(VBOX_VERSION_MINOR)"
    2627         $(QUIET)$(APPEND) [email protected] "VBOX_VERSION_BUILD = $(VBOX_VERSION_BUILD)"
    2628         $(QUIET)$(APPEND) [email protected] "VBOX_VERSION_STRING = $(VBOX_VERSION_STRING)"
     2633        $(QUIET)$(APPEND) [email protected] 'VBOX_VERSION_MAJOR = $(VBOX_VERSION_MAJOR)'
     2634        $(QUIET)$(APPEND) [email protected] 'VBOX_VERSION_MINOR = $(VBOX_VERSION_MINOR)'
     2635        $(QUIET)$(APPEND) [email protected] 'VBOX_VERSION_BUILD = $(VBOX_VERSION_BUILD)'
     2636        $(QUIET)$(APPEND) [email protected] 'VBOX_VERSION_STRING = $(VBOX_VERSION_STRING)'
    26292637        $(QUIET)$(MV) -f [email protected] $@
    26302638
    … …  
    26622670 VBOX_SVN_DEP          := $(wildcard $(PATH_ROOT)/.svn/entries)
    26632671 ifneq ($(USERNAME),bird) # Wastes nearly half a second on windows, very annoying. TODO: $(which ).
     2672  ## @todo with 0.1.2: ifeq ($(which (SVN)),)
    26642673  ifneq ($(shell $(SVN) --version > /dev/null 2>&1 || echo 'svn not installed'),)
    26652674   VBOX_SVN_DEP         :=
    … …  
    26792688        $(QUIET)$(MKDIR) -p $(@D)
    26802689 ifneq ($(VBOX_SVN_DEP),)
    2681 #       $(QUIET)$(APPEND) $@ "export VBOX_SVN_REV=$(shell LC_ALL=C $(SVN) info $(PATH_ROOT) | $(SED) -e '/^Last Changed Rev/!d'  -e "s/Last Changed Rev\: *//")"
    2682         $(QUIET)$(APPEND) $@ "export VBOX_SVN_REV=$(shell LC_ALL=C $(SVN) info $(PATH_ROOT) | $(SED) -e '/^Revision/!d'  -e "s/Revision\: *//")"
     2690#       $(QUIET)$(APPEND) $@ 'export VBOX_SVN_REV=$(shell LC_ALL=C $(SVN) info $(PATH_ROOT) | $(SED) -e '/^Last Changed Rev/!d'  -e "s/Last Changed Rev\: *//")'
     2691        $(QUIET)$(APPEND) $@ 'export VBOX_SVN_REV=$(shell LC_ALL=C $(SVN) info $(PATH_ROOT) | $(SED) -e '/^Revision/!d'  -e "s/Revision\: *//")'
    26832692 else
    2684         $(QUIET)$(APPEND) $@ "export VBOX_SVN_REV=$(VBOX_SVN_REV_FALLBACK)"
    2685  endif
     2693        $(QUIET)$(APPEND) $@ 'export VBOX_SVN_REV=$(VBOX_SVN_REV_FALLBACK)'
     2694 endif
     2695## @todo When --update is implemented, replace with: $(QUIET)$(CP) --update -fv $@ $(VBOX_SVN_REV_KMK)
    26862696        $(QUIET)if test ! -f $(VBOX_SVN_REV_KMK) \
    26872697        || test ! "`$(CAT_EXT) $@`" = "`$(CAT_EXT) $(VBOX_SVN_REV_KMK)`"; \
    … …  
    26932703                echo '* $(VBOX_SVN_REV_KMK) was not changed:'; \
    26942704        fi
    2695         $(QUIET)$(CAT_EXT) $(VBOX_SVN_REV_KMK)
     2705        $(QUIET)$(CAT) $(VBOX_SVN_REV_KMK)
    26962706
    26972707$(VBOX_SVN_REV_KMK): $(VBOX_SVN_REV_KMK).ts # remove when kBuild is updated.
    … …  
    27042714        $(QUIET)$(RM) -f $@
    27052715        $(QUIET)$(MKDIR) -p $(@D)
    2706         $(QUIET)$(APPEND) $@ "export VBOX_SVN_REV=$(VBOX_SVN_REV)"
     2716        $(QUIET)$(APPEND) $@ 'export VBOX_SVN_REV=$(VBOX_SVN_REV)'
    27072717        $(QUIET)echo '* $(VBOX_SVN_REV_KMK) was externally overwritten:'
    2708         $(QUIET)$(CAT_EXT) $(VBOX_SVN_REV_KMK)
     2718        $(QUIET)$(CAT) $(VBOX_SVN_REV_KMK)
    27092719endif
    27102720

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

    r5471 r5898  
    6767# 1. create vbetables.h
    6868$(PATH_TARGET)/vbetables.h: $(MAKEFILE_CURRENT)
     69ifdef KMK_USE_REDIRECT
     70        $(QUIET)$(REDIRECT) -wo $@ -- $(TARGET_vbetables-gen)
     71else
    6972        $(QUIET)$(TARGET_vbetables-gen) > $@
     73endif
    7074
    7175# 2. precompile
    7276$(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
    7377        $(call MSG_TOOL,cpp,VgaBiosBin,$<,$@)
     78ifdef KMK_USE_REDIRECT
     79        $(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 $@ $<
     80else
    7481        $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -DVBOX -DVBOX_VERSION_STRING=\"$(VBOX_VERSION_STRING)\" -E -P $< -DVBE -DVGABIOS_DATE="''" $(addprefix -D,$(DEFS) $(DEFS.$(BUILD_TYPE))) > $@
     82endif
    7583
    7684# 3. compile - tempfile clashes, so make sure it's built in solitude.
    … …  
    8391$(PATH_TARGET)/vgabios1.s: $(PATH_TARGET)/vgabios0.s
    8492        $(call MSG_TOOL,Adjusting BCC Assembly,VgaBiosBin,$<,$@)
     93ifdef KMK_NEW_SED
     94        $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' --output $@ $^
     95else
    8596        $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' $^ > $@
     97endif
    8698
    8799# 5. assemble
    88100$(PATH_TARGET)/vgabios.tmp $(PATH_TARGET)/vgabios.lst: $(PATH_TARGET)/vgabios1.s
    89101        $(call MSG_COMPILE,VgaBiosBin,$<,$@,AS)
     102ifdef KMK_USE_REDIRECT
     103        $(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(PATH_TARGET)/vgabios.tmp -u- -w- -g -0 -j -O -l $(PATH_TARGET)/vgabios.lst
     104else
    90105        $(QUIET)$(VBOX_AS86) -b $(PATH_TARGET)/vgabios.tmp -u- -w- -g -0 -j -O -l $(PATH_TARGET)/vgabios.lst < $^
     106endif
    91107
    92108# 6. checksums

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

    r4071 r5898  
    6363$(PATH_TARGET)/_rombios_.c: $(PATH_SUB_CURRENT)/rombios.c $(PATH_SUB_CURRENT)/logo.c $(PATH_SUB_CURRENT)/apmbios.S | $(call DIRDEP,$(TARGET_PATH))
    6464        $(call MSG_TOOL,cpp,PcBiosBin,$<,$@)
     65ifdef KMK_USE_REDIRECT
     66        $(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 $@ $<
     67else
    6568        $(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 $< > $@
     69endif
    6670
    6771# 2. compile to intermediate asm file - tempfile clashes, make sure it's built alone.
    … …  
    7478$(PATH_TARGET)/rombios1.s: $(PATH_TARGET)/rombios0.s
    7579        $(call MSG_TOOL,Adjusting BCC Assembly,PcBiosBin,$<,$@)
     80ifdef KMK_NEW_SED
     81        $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' --output $@ $^
     82else
    7683        $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' $^ > $@
     84endif
    7785
    7886# 4. assemble the intermediate asm file. (also creates a listing rombios.lst)
    7987$(PATH_TARGET)/pcbios.tmp $(PATH_TARGET)/pcbios.lst: $(PATH_TARGET)/rombios1.s
    8088        $(call MSG_COMPILE,PcBiosBin,$<,$@,AS)
    81         $(QUIET)$(VBOX_AS86) -b $(PATH_TARGET)/pcbios.tmp -u- -w- -g -0 -j -O -l $(PATH_TARGET)/pcbios.lst - < $^
     89ifdef KMK_USE_REDIRECT
     90        $(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(PATH_TARGET)/pcbios.tmp -u- -w- -g -0 -j -O -l $(PATH_TARGET)/pcbios.lst
     91else
     92        $(QUIET)$(VBOX_AS86) -b $(PATH_TARGET)/pcbios.tmp -u- -w- -g -0 -j -O -l $(PATH_TARGET)/pcbios.lst < $^
     93endif
    8294
    8395# 5. calculate checksums for the final BIOS image.
    … …  
    90102$(PATH_TARGET)/pcbios-syms.h: $(PATH_TARGET)/pcbios.lst $(MAKEFILE_CURRENT)
    91103        $(call MSG_GENERATE,PcBiosBin,$<,$@)
     104ifdef KMK_NEW_SED
     105        $(QUIET)$(SED) \
     106                -e  '/^[0-9][0-9][0-9][0-9][0-9]                       000[0-9A-F]*            [[:space:]]*[a-zA-Z0-9_]*:/!d' \
     107                -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"),/' \
     108                --output $@ \
     109                $(PATH_TARGET)/pcbios.lst
     110else
    92111        $(QUIET)$(SED) \
    93112                -e  '/^[0-9][0-9][0-9][0-9][0-9]                       000[0-9A-F]*            [[:space:]]*[a-zA-Z0-9_]*:/!d' \
    94113                -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"),/' \
    95114                $(PATH_TARGET)/pcbios.lst > $@
     115endif
    96116
    97117

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

    r5687 r5898  
    8787$(PATH_TARGET)/tstDeviceStructSizeGC.h: $$(INSTARGET_tstDeviceStructSizeGC)
    8888        $(call MSG_GENERATE,,$@)
     89ifdef KMK_USE_REDIRECT
     90        $(QUIET)$(REDIRECT) -wo $@ -- $(INSTARGET_tstDeviceStructSizeGC)
     91else
    8992        $(QUIET)$(INSTARGET_tstDeviceStructSizeGC) > $@
     93endif
    9094
    9195# 3. run it.

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

    r5878 r5898  
    329329        $(call MSG_GENERATE,VirtualBoxVM.app,$<,$@)
    330330        $(QUIET)$(RM) -f $@
     331ifdef KMK_NEW_SED
     332        $(QUIET)$(SED) \
     333                -e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
     334                -e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
     335                -e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
     336                -e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
     337                --output $@ $<
     338else
    331339        $(QUIET)$(SED) \
    332340                -e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
    … …  
    335343                -e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
    336344                $< > $@
     345endif
    337346
    338347#
    … …  
    532541
    533542$(PATH_VirtualBox)/ui/vbox_image_collection.txt: VBoxUI.pro $(VirtualBox_QT_IMAGES)
    534         @echo " \
    535         $(VirtualBox_QT_IMAGES) \
    536     " > $@
     543        $(RM) -f $@
     544        $(APPEND) $@ -v VirtualBox_QT_IMAGES
    537545
    538546$(PATH_VirtualBox)/ui/vbox_image_collection.cpp: $(PATH_VirtualBox)/ui/vbox_image_collection.txt

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

    r5458 r5898  
    229229ifndef DONT_USE_YASM
    230230        $(QUIET)$(TOOL_YASM_AS) $(MY_ASA_ASM_STUFF) -o [email protected] -l [email protected] $<
     231ifdef KMK_NEW_SED
     232        $(SED) -f $(VBOX_PATH_VMM_SRC)/testcase/tstAsmStructsAsm-lst.sed --output $@ [email protected]
     233else
    231234        $(SED) -f $(VBOX_PATH_VMM_SRC)/testcase/tstAsmStructsAsm-lst.sed [email protected] > $@
     235endif
    232236else
    233237        $(QUIET)$(TOOL_NASM_AS) -g $(MY_ASA_ASM_STUFF) -o [email protected] -l [email protected] $<
    … …  
    255259        $(call MSG_GENERATE,tstVMStructSize,$@,$<)
    256260        $(QUIET)$(RM) -f $@ [email protected] [email protected]
     261ifdef KMK_USE_REDIRECT
     262        $(QUIET)$(REDIRECT) -wo [email protected] -- $(VBOX_NM) $<
     263else
    257264        $(VBOX_NM) $< > [email protected]
     265endif
     266ifdef KMK_NEW_SED
     267        $(QUIET)$(SED) -e '/STAMPROFILEADV/d' \
     268               -e '/00[0-9a-fA-F]* [aA] [^_.]*\./!d'       -e 's/\(00[0-9a-fA-F]*\) [aA] \([^.]*\)\.\(.*$$\)/    CHECK_OFF(\2, 0x0\1, \3);/' \
     269               --output [email protected] [email protected]
     270        $(QUIET)$(SED) -e '/VM_size$$/d' \
     271               -e '/00[0-9a-fA-F]* [aA] [^_.]*_size$$/!d'  -e 's/\(00[0-9a-fA-F]*\) [aA] \([^_.]*\)_size/    CHECK_SIZE(\2, 0x0\1);/' \
     272               --append [email protected] [email protected]
     273else
    258274        $(QUIET)$(SED) -e '/STAMPROFILEADV/d' \
    259275               -e '/00[0-9a-fA-F]* [aA] [^_.]*\./!d'       -e 's/\(00[0-9a-fA-F]*\) [aA] \([^.]*\)\.\(.*$$\)/    CHECK_OFF(\2, 0x0\1, \3);/' \
    … …  
    262278               -e '/00[0-9a-fA-F]* [aA] [^_.]*_size$$/!d'  -e 's/\(00[0-9a-fA-F]*\) [aA] \([^_.]*\)_size/    CHECK_SIZE(\2, 0x0\1);/' \
    263279               [email protected] >> [email protected]
     280endif
    264281        $(QUIET)$(MV) -f [email protected] $@
    265282        $(QUIET)$(RM) -f [email protected]
    … …  
    268285$(PATH_TARGET)/tstAsmStructsGC.h: $(PATH_TARGET)/tstAsmStructsHC.h
    269286        $(call MSG_GENERATE,tstVMStructSize,$@,$<)
     287ifdef KMK_NEW_SED
     288        $(QUIET)$(SED) -e '/VMMSWITCHERDEF/d' --output $@ $^
     289else
    270290        $(QUIET)$(SED) -e '/VMMSWITCHERDEF/d' \
    271291                $^ > $@
     292endif
    272293
    273294## @todo make this default kBuild behaviour.
    … …  
    290311$(PATH_TARGET)/tstVMStructGC.h: $$(INSTARGET_tstVMStructGC)
    291312        $(call MSG_GENERATE,tstVMStructSize,$@)
     313ifdef KMK_USE_REDIRECT
     314        $(QUIET)$(REDIRECT) -wo $@ -- $(INSTARGET_tstVMStructGC)
     315else
    292316        $(QUIET)$(INSTARGET_tstVMStructGC) > $@
     317endif
    293318
    294319# 2. run it.
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette