VirtualBox

Changeset 49116 in vbox for trunk/src


Ignore:
Timestamp:
Oct 15, 2013 12:50:23 PM (11 years ago)
Author:
vboxsync
Message:

*.kmk: Some template cleanup, adding VBoxR3Tool for dev tools (bin/tools/).

Location:
trunk/src
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/EFI/Firmware/Config.kmk

    r48754 r49116  
    7171#
    7272TEMPLATE_VBoxEfiBldProg = EFI build program.
    73 TEMPLATE_VBoxEfiBldProg_EXTENDS = VBOXBLDPROG
     73TEMPLATE_VBoxEfiBldProg_EXTENDS = VBoxBldProg
    7474TEMPLATE_VBoxEfiBldProg_INST = EfiBldProgs/
    7575TEMPLATE_VBoxEfiBldProg_INSTTYPE = stage
    76 TEMPLATE_VBoxEfiBldProg_INCS = $(TEMPLATE_VBOXBLDPROG_INCS) \
     76TEMPLATE_VBoxEfiBldProg_INCS = $(TEMPLATE_VBoxBldProg_INCS) \
    7777        $(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/C/Include/IndustryStandard \
    7878        $(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/C/Common \
    … …  
    8080        $(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/C
    8181
    82 TEMPLATE_VBoxEfiBldProg_INCS.x86 = $(TEMPLATE_VBOXBLDPROG_INCS.x86) \
     82TEMPLATE_VBoxEfiBldProg_INCS.x86 = $(TEMPLATE_VBoxBldProg_INCS.x86) \
    8383        $(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/C/Include/IA32
    8484
    85 TEMPLATE_VBoxEfiBldProg_INCS.amd64 = $(TEMPLATE_VBOXBLDPROG_INCS.amd64) \
     85TEMPLATE_VBoxEfiBldProg_INCS.amd64 = $(TEMPLATE_VBoxBldProg_INCS.amd64) \
    8686        $(VBOX_PATH_EFI_FIRMWARE)/BaseTools/Source/C/Include/X64
    8787
    8888TEMPLATE_VBoxEfiBldProg_LIBS = \
    8989        $(VBOX_PATH_STAGE_EFI_BLDPROGS)/EfiBldCommonLib$(VBOX_SUFF_LIB) \
    90         $(TEMPLATE_VBOXBLDPROG_LIBS)
     90        $(TEMPLATE_VBoxBldProg_LIBS)
    9191ifn1of ($(KBUILD_HOST),win) # This stuff isn't up to our standard at all! :/
    92  TEMPLATE_VBoxEfiBldProg_CFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBOXBLDPROG_CFLAGS)) \
     92 TEMPLATE_VBoxEfiBldProg_CFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBoxBldProg_CFLAGS)) \
    9393        -Wno-sign-compare -Wno-missing-prototypes -Wno-strict-prototypes \
    9494        -Wno-implicit-function-declaration -Wno-missing-declarations -Wno-shadow -Wno-format -Wno-empty-body
    95  TEMPLATE_VBoxEfiBldProg_CXXFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBOXBLDPROG_CXXFLAGS)) \
     95 TEMPLATE_VBoxEfiBldProg_CXXFLAGS = $(filter-out -pedantic,$(TEMPLATE_VBoxBldProg_CXXFLAGS)) \
    9696        -Wno-all -Wno-shadow -Wno-empty-body
    9797endif

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

    r46952 r49116  
    116116#
    117117BLDPROGS += vbetables-gen
    118 vbetables-gen_TEMPLATE = VBOXBLDPROG
     118vbetables-gen_TEMPLATE = VBoxBldProg
    119119vbetables-gen_SOURCES  = vbetables-gen.c
    120120vbetables-gen_CLEAN    = $(vbetables-gen)

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

    r48346 r49116  
    354354 #
    355355 BLDPROGS += ipxezbin
    356  ipxezbin_TEMPLATE = VBOXBLDPROG
     356 ipxezbin_TEMPLATE = VBoxBldProg
    357357 ipxezbin_CFLAGS   = -Wno-format
    358358 ipxezbin_SOURCES  = src/util/zbin.c

  • trunk/src/VBox/Disassembler/Makefile.kmk

    r42076 r49116  
    3838
    3939LIBRARIES              += DisasmBldProg
    40 DisasmBldProg_TEMPLATE  = VBOXBLDPROG
     40DisasmBldProg_TEMPLATE  = VBoxBldProg
    4141DisasmBldProg_EXTENDS   = DisasmR3
    4242

  • trunk/src/VBox/Installer/win/StubBld/Makefile.kmk

    r42130 r49116  
    2121# This is only used in the 32-bit build (see ../Stub/Makefile.kmk).
    2222PROGRAMS.x86 += VBoxStubBld
    23 VBoxStubBld_TEMPLATE= VBOXBLDPROG
     23VBoxStubBld_TEMPLATE= VBoxBldProg
    2424VBoxStubBld_DEFS    = _WIN32_WINNT=0x0400 VBOX_SVN_REV=$(VBOX_SVN_REV) $(VBOX_SVN_REV_KMK)
    2525VBoxStubBld_SOURCES = VBoxStubBld.cpp

  • trunk/src/VBox/Main/webservice/Makefile.kmk

    r47392 r49116  
    229229 else
    230230  BLDPROGS += split-soapC
    231   split-soapC_TEMPLATE = VBOXBLDPROG
     231  split-soapC_TEMPLATE = VBoxBldProg
    232232  split-soapC_SOURCES = split-soapC.cpp
    233233

  • trunk/src/VBox/Runtime/Makefile.kmk

    r48990 r49116  
    160160# Unicode Specification reader used to regenerate unidata.cpp.
    161161#
    162 uniread_TEMPLATE = VBOXBLDPROG
     162uniread_TEMPLATE = VBoxBldProg
    163163uniread_SOURCES  = common/string/uniread.cpp
    164164uniread_INCS = include
    … …  
    14061406
    14071407DLLS += VBoxRTDummy
    1408 VBoxRTDummy_TEMPLATE = VBOXR3
     1408VBoxRTDummy_TEMPLATE = VBoxR3Dll
    14091409VBoxRTDummy_INSTTYPE = none
    14101410VBoxRTDummy_LIBS  = $(PATH_STAGE_BIN)/VBoxRT.so
    … …  
    15041504#
    15051505## @todo the *_alias.c stuff is busted, remove and use RT_WITH_NOCRT_ALIASES instead.
    1506 RuntimeR3NoCRTGCC_TEMPLATE = VBOXNOCRTGCC
     1506RuntimeR3NoCRTGCC_TEMPLATE = VBoxNoCrtGccLib
    15071507RuntimeR3NoCRTGCC_LIBSUFF = $(VBOX_SUFF_LIB)
    15081508ifn1of ($(KBUILD_TARGET_ARCH), amd64 x86)
    … …  
    15751575        common/math/gcc/xordi3.c
    15761576
    1577 
    1578 ## @todo stop using the old memcpy.c and memset.c code.
    15791577
    15801578#

  • trunk/src/VBox/Runtime/tools/Makefile.kmk

    r49044 r49116  
    3838 # RTManifest is a tool for creating and verifying manifest files.
    3939 PROGRAMS += RTRm
    40  RTRm_TEMPLATE = VBOXR3TSTEXE
     40 RTRm_TEMPLATE = VBoxR3Tool
    4141 RTRm_SOURCES = RTRm.cpp
    4242
    4343 # RTManifest is a tool for creating and verifying manifest files.
    4444 PROGRAMS += RTManifest
    45  RTManifest_TEMPLATE = VBOXR3TSTEXE
     45 RTManifest_TEMPLATE = VBoxR3Tool
    4646 RTManifest_SOURCES = RTManifest.cpp
    4747
    4848 # RTLdrFlt is similar to c++filt, except that it's for VMMR0.r0 stacks.
    4949 PROGRAMS += RTLdrFlt
    50  RTLdrFlt_TEMPLATE = VBOXR3TSTEXE
     50 RTLdrFlt_TEMPLATE = VBoxR3Tool
    5151 RTLdrFlt_SOURCES = RTLdrFlt.cpp
    5252
    5353 # RTGzip - our gzip clone (for testing the gzip/gunzip streaming code)
    5454 PROGRAMS += RTGzip
    55  RTGzip_TEMPLATE = VBOXR3TSTEXE
     55 RTGzip_TEMPLATE = VBoxR3Tool
    5656 RTGzip_SOURCES = RTGzip.cpp
    5757
    5858 # RTShutdown - similar (but not identical) to a typical unix shutdown command.
    5959 PROGRAMS += RTShutdown
    60  RTShutdown_TEMPLATE = VBOXR3TSTEXE
     60 RTShutdown_TEMPLATE = VBoxR3Tool
    6161 RTShutdown_SOURCES = RTShutdown.cpp
    6262
    6363 # RTTar - our tar clone (for testing the tar/gzip/gunzip streaming code)
    6464 PROGRAMS += RTTar
    65  RTTar_TEMPLATE = VBOXR3TSTEXE
     65 RTTar_TEMPLATE = VBoxR3Tool
    6666 RTTar_SOURCES = RTTar.cpp
    6767
    6868 # RTNtDbgHelp - our tar clone (for testing the tar/gzip/gunzip streaming code)
    6969 PROGRAMS.win += RTNtDbgHelp
    70  RTNtDbgHelp_TEMPLATE = VBOXR3TSTEXE
     70 RTNtDbgHelp_TEMPLATE = VBoxR3Tool
    7171 RTNtDbgHelp_SOURCES = RTNtDbgHelp.cpp
    7272
    7373 # RTDbgSymCache - Symbol cache manager.
    7474 PROGRAMS += RTDbgSymCache
    75  RTDbgSymCache_TEMPLATE = VBOXR3TSTEXE
     75 RTDbgSymCache_TEMPLATE = VBoxR3Tool
    7676 RTDbgSymCache_SOURCES = RTDbgSymCache.cpp
    7777

  • trunk/src/bldprogs/Makefile.kmk

    r46559 r49116  
    2121BLDPROGS += bin2c biossums filesplitter VBoxCmp
    2222
    23 bin2c_TEMPLATE = VBOXBLDPROG
     23bin2c_TEMPLATE = VBoxBldProg
    2424bin2c_SOURCES = bin2c.c
    2525
    26 biossums_TEMPLATE = VBOXBLDPROG
     26biossums_TEMPLATE = VBoxBldProg
    2727biossums_SOURCES = biossums.c
    2828
    29 filesplitter_TEMPLATE = VBOXBLDPROG
     29filesplitter_TEMPLATE = VBoxBldProg
    3030filesplitter_SOURCES = filesplitter.cpp
    3131
    32 VBoxCmp_TEMPLATE = VBOXBLDPROG
     32VBoxCmp_TEMPLATE = VBoxBldProg
    3333VBoxCmp_SOURCES = VBoxCmp.cpp
    3434
    … …  
    5959
    6060BLDPROGS.win += VBoxPeSetVersion
    61 VBoxPeSetVersion_TEMPLATE = VBOXBLDPROG
     61VBoxPeSetVersion_TEMPLATE = VBoxBldProg
    6262VBoxPeSetVersion_SOURCES  = VBoxPeSetVersion.cpp
    6363
    6464
    6565BLDPROGS += VBoxDef2LazyLoad
    66 VBoxDef2LazyLoad_TEMPLATE = VBOXBLDPROG
     66VBoxDef2LazyLoad_TEMPLATE = VBoxBldProg
    6767VBoxDef2LazyLoad_SOURCES  = VBoxDef2LazyLoad.cpp
    6868

  • trunk/src/libs/kStuff/Makefile.kmk

    r48282 r49116  
    8686
    8787LIBRARIES += VBox-kStuffStaticBldProg
    88 VBox-kStuffStaticBldProg_TEMPLATE = VBOXBLDPROG
     88VBox-kStuffStaticBldProg_TEMPLATE = VBoxBldProg
    8989VBox-kStuffStaticBldProg_EXTENDS = VBox-kStuff
    9090

  • trunk/src/libs/xpcom18a4/Config.kmk

    r48282 r49116  
    189189#
    190190TEMPLATE_XPCOMBLDPROG                     = XPCOM Build programs executables
    191 TEMPLATE_XPCOMBLDPROG_EXTENDS             = VBOXBLDPROG
     191TEMPLATE_XPCOMBLDPROG_EXTENDS             = VBoxBldProg
    192192## @todo Verify that this doesn't blow up because of template inheriance ordering. (we're assuming XPCOMEXE is expanded when this is being used.)
    193193TEMPLATE_XPCOMBLDPROG_DEFS                = \
    194         $(TEMPLATE_VBOXBLDPROG_DEFS) \
     194        $(TEMPLATE_VBoxBldProg_DEFS) \
    195195        $(filter-out VBOX_USE_IPRT_IN_XPCOM, $(TEMPLATE_XPCOMEXE_DEFS))
    196 TEMPLATE_XPCOMBLDPROG_DEFS.$(KBUILD_HOST) = $(TEMPLATE_VBOXBLDPROG_DEFS.$(KBUILD_HOST)) $(TEMPLATE_XPCOMEXE_DEFS.$(KBUILD_HOST))
    197 TEMPLATE_XPCOMBLDPROG_DEFS.x86            = $(TEMPLATE_VBOXBLDPROG_DEFS.x86)            $(TEMPLATE_XPCOMEXE_DEFS.x86)
    198 TEMPLATE_XPCOMBLDPROG_DEFS.amd64          = $(TEMPLATE_VBOXBLDPROG_DEFS.amd64)          $(TEMPLATE_XPCOMEXE_DEFS.amd64)
     196TEMPLATE_XPCOMBLDPROG_DEFS.$(KBUILD_HOST) = $(TEMPLATE_VBoxBldProg_DEFS.$(KBUILD_HOST)) $(TEMPLATE_XPCOMEXE_DEFS.$(KBUILD_HOST))
     197TEMPLATE_XPCOMBLDPROG_DEFS.x86            = $(TEMPLATE_VBoxBldProg_DEFS.x86)            $(TEMPLATE_XPCOMEXE_DEFS.x86)
     198TEMPLATE_XPCOMBLDPROG_DEFS.amd64          = $(TEMPLATE_VBoxBldProg_DEFS.amd64)          $(TEMPLATE_XPCOMEXE_DEFS.amd64)
    199199TEMPLATE_XPCOMBLDPROG_INCS                = \
    200200        $(VBOX_PATH_SDK)/bindings/xpcom/include \
    … …  
    204204        $(VBOX_PATH_SDK)/bindings/xpcom/include/ipcd
    205205TEMPLATE_XPCOMBLDPROG_CFLAGS             = $(filter-out -pedantic -Wshadow, $(TEMPLATE_VBOX_BLDPROG_CFLAGS)) $(VBOX_GCC_Wno-int-to-pointer-cast) $(VBOX_GCC_Wno-pointer-to-int-cast) -Wno-format
    206 TEMPLATE_XPCOMBLDPROG_CXXFLAGS.darwin    = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.darwin)     -fpascal-strings -fshort-wchar -fno-common -fno-rtti
    207 TEMPLATE_XPCOMBLDPROG_CXXFLAGS.solaris   = $(TEMPLATE_VBOXBLDPROG_CXXFLAGS.solaris)    -fno-omit-frame-pointer # for now anyway.
    208 TEMPLATE_XPCOMBLDPROG_LDFLAGS.darwin     = $(TEMPLATE_VBOXBLDPROG_LDFLAGS.darwin)      -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions
     206TEMPLATE_XPCOMBLDPROG_CXXFLAGS.darwin    = $(TEMPLATE_VBoxBldProg_CXXFLAGS.darwin)     -fpascal-strings -fshort-wchar -fno-common -fno-rtti
     207TEMPLATE_XPCOMBLDPROG_CXXFLAGS.solaris   = $(TEMPLATE_VBoxBldProg_CXXFLAGS.solaris)    -fno-omit-frame-pointer # for now anyway.
     208TEMPLATE_XPCOMBLDPROG_LDFLAGS.darwin     = $(TEMPLATE_VBoxBldProg_LDFLAGS.darwin)      -fpascal-strings -fshort-wchar -fno-rtti -fno-exceptions
    209209TEMPLATE_XPCOMBLDPROG_ORDERDEPS          = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $($(hdrinst)_1_TARGET))
    210210
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