VirtualBox

Changeset 6553 in vbox


Ignore:
Timestamp:
Jan 29, 2008 2:19:25 AM (17 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
27584
Message:

r=bird: Don't create more RuntimeLnx32* legacy. No VBox in IPRT, so check for RT_MINI instead of VBOX_SHARED_RUNTIME. Call it mini iprt instead of abigious 'shared'. Added todo for correcting template usage. Crossing fingers this works - I'm on windows atm.

Location:
trunk/src/VBox
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/x11/xgraphics/Makefile.kmk

    r6539 r6553  
    2929VBOX_LIB_VBGL_R3 := $(PATH_LIB)/VBoxGuestR3LibLinux.a
    3030VBOX_LIB_VBGL_R3_XFREE86 := $(PATH_LIB)/VBoxGuestR3LibLinuxXFree86.a
    31 VBOX_LIB_IPRT_GUEST_R3 := $(PATH_LIB)/RuntimeLnx32GuestR3Shared.a
    3231
    3332vboxvideo_drv_TEMPLATE = VBOXLNX32GUESTR3EXE
    … …  
    127126vboxvideo_drv_70_LIBS = \
    128127        $(VBOX_LIB_VBGL_R3) \
    129         $(VBOX_LIB_IPRT_GUEST_R3) \
     128        $(VBOX_LIB_IPRT_GUEST_MINI_R3) \
    130129        $(VBOX_LIB_VBGL_R3)
    131130
    … …  
    143142vboxvideo_drv_71_LIBS = \
    144143        $(VBOX_LIB_VBGL_R3) \
    145         $(VBOX_LIB_IPRT_GUEST_R3) \
     144        $(VBOX_LIB_IPRT_GUEST_MINI_R3) \
    146145        $(VBOX_LIB_VBGL_R3)
    147146
    … …  
    159158vboxvideo_drv_13_LIBS = \
    160159        $(VBOX_LIB_VBGL_R3) \
    161         $(VBOX_LIB_IPRT_GUEST_R3) \
     160        $(VBOX_LIB_IPRT_GUEST_MINI_R3) \
    162161        $(VBOX_LIB_VBGL_R3)
    163162
    … …  
    177176vboxvideo_drv_14_LIBS = \
    178177        $(VBOX_LIB_VBGL_R3) \
    179         $(VBOX_LIB_IPRT_GUEST_R3) \
     178        $(VBOX_LIB_IPRT_GUEST_MINI_R3) \
    180179        $(VBOX_LIB_VBGL_R3)
    181180endif
    … …  
    199198        $(VBOX_LIB_IPRT_GUEST_R3) \
    200199        $(VBOX_LIB_VBGL_R3)
     200## @todo Use VBOX_LIB_IPRT_GUEST_MINI_R3 instead of VBOX_LIB_IPRT_GUEST_R3?
    201201endif
    202202

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

    r6536 r6553  
    3434 #
    3535 ifeq ($(BUILD_TARGET),linux)
    36   LIBRARIES  = RuntimeLnx32GuestR0 RuntimeLnx32GuestR3 RuntimeLnx32GuestR3Shared
     36  LIBRARIES  = RuntimeLnx32GuestR0 RuntimeLnx32GuestR3 RuntimeGuestR3Mini
    3737 else ifeq ($(BUILD_TARGET),os2)
    3838  LIBRARIES  = RuntimeOS2GuestR0 RuntimeOS2GuestR3 #RuntimeOS2Warp3GuestR0
    … …  
    4040  LIBRARIES = RuntimeW32GuestR0 RuntimeW32GuestR3 RuntimeW32NT4GuestR0
    4141 else
    42   LIBRARIES = RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Shared
     42  LIBRARIES = RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini
    4343  #LIBRARIES.os2 = RuntimeOS2Warp3GuestR0
    4444  #LIBRARIES.win = RuntimeW32NT4GuestR0
    … …  
    4949 #
    5050else ifdef VBOX_ADDITIONS_LINUX_ONLY
    51  LIBRARIES  = RuntimeLnx32GuestR0 RuntimeLnx32GuestR3 RuntimeLnx32GuestR3Shared
     51 LIBRARIES  = RuntimeLnx32GuestR0 RuntimeLnx32GuestR3 RuntimeGuestR3Mini
    5252else ifdef VBOX_ADDITIONS_WIN32_ONLY
    5353 LIBRARIES = RuntimeW32GuestR0 RuntimeW32GuestR3 RuntimeW32NT4GuestR0
    … …  
    6868   endif
    6969   ifdef VBOX_WITH_LINUX_ADDITIONS
    70     LIBRARIES += RuntimeLnx32GuestR3 RuntimeLnx32GuestR3Shared
     70    LIBRARIES += RuntimeLnx32GuestR3 RuntimeGuestR3Mini
    7171    ifdef VBOX_WITH_LINUX_ADDITIONS_32BIT_R0
    7272     LIBRARIES += RuntimeLnx32GuestR0
    … …  
    7878   endif
    7979  else
    80    LIBRARIES += RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Shared
     80   LIBRARIES += RuntimeGuestR0 RuntimeGuestR3 RuntimeGuestR3Mini
    8181  endif
    8282  #LIBRARIES.os2 = RuntimeOS2Warp3GuestR0
    … …  
    456456## PORTME: Porters add their selection of platform specific files for Ring-3 here.
    457457
    458 RuntimeR3Shared_SOURCES       = \
    459         common/err/errmsg.cpp \
    460         common/err/RTErrConvertFromErrno.cpp \
    461         common/log/logformat.cpp \
    462         common/misc/assert.cpp \
    463         common/misc/sanity-c.c \
    464         common/misc/sanity-cpp.cpp \
    465         common/string/strformat.cpp \
    466         common/string/strformatrt.cpp \
    467         common/string/string.cpp \
    468         common/string/strprintf.cpp \
    469         common/string/unidata.cpp \
    470         common/string/utf-8.cpp \
    471         common/string/utf-16.cpp \
    472         generic/pathhost-generic.cpp \
    473         generic/RTAssertDoBreakpoint-generic.cpp \
    474         r3/alloc.cpp \
    475         r3/fileio.cpp \
    476         r3/fs.cpp \
    477         r3/path.cpp
    478 
    479 # VBox specific stuff.
    480 RuntimeR3Shared_SOURCES += \
    481         VBox/strformat-vbox.cpp
    482 
    483 RuntimeR3Shared_SOURCES.linux = \
    484         r3/posix/fileio-posix.cpp \
    485         r3/posix/path-posix.cpp \
    486         r3/posix/utf8-posix.cpp
    487 
    488 
    489 RuntimeR3Shared_SOURCES.solaris = \
    490         r3/posix/fileio-posix.cpp \
    491         r3/posix/path-posix.cpp \
    492         r3/posix/utf8-posix.cpp
    493 
    494458
    495459#
    … …  
    559523
    560524#
    561 # RuntimeGuestR3Shared - Guest Additions Runtime (static) which does not require initialisation.
    562 #
    563 RuntimeGuestR3Shared_TEMPLATE             := VBOXGUESTR3LIB
    564 RuntimeGuestR3Shared_SDKS.win             := $(RuntimeR3_SDKS.win)
    565 RuntimeGuestR3Shared_DEFS                 := $(filter-out RTCRITSECT_STRICT, $(RuntimeR3_DEFS)) \
    566                                              VBOX_SHARED_RUNTIME
    567 RuntimeGuestR3Shared_DEFS.$(BUILD_TARGET) := $(RuntimeR3_DEFS.$(BUILD_TARGET))
    568 RuntimeGuestR3Shared_INCS                 := $(RuntimeR3_INCS)
    569 RuntimeGuestR3Shared_INCS.$(BUILD_TARGET) := $(RuntimeR3_INCS.$(BUILD_TARGET))
    570 RuntimeGuestR3Shared_SOURCES              := $(filter-out \
    571         generic/RTLogWriteUser-generic.cpp \
    572         , $(RuntimeR3Shared_SOURCES))
    573 RuntimeGuestR3Shared_SOURCES              += \
     525# RuntimeGuestR3Mini - Minimal Guest Additions Runtime which does not require
     526#                      initialization and can be linked into an .so. Intended
     527#                      for X11 drivers.
     528#
     529ifeq ($(BUILD_TARGET),linux) ## @todo elimiate this by fixing VBOXGUESTR3LIB/DLL/EXE. What about NOCPP like the x11 bits?
     530RuntimeGuestR3Mini_TEMPLATE             := VBOXLNX32GUESTR3LIB
     531else ## @todo this should be VBOXGUESTR3DLL I think if PIC code is required.
     532RuntimeGuestR3Mini_TEMPLATE             := VBOXGUESTR3LIB
     533endif
     534RuntimeGuestR3Mini_SDKS.win             := $(RuntimeR3_SDKS.win)
     535RuntimeGuestR3Mini_DEFS                 := $(filter-out RTCRITSECT_STRICT, $(RuntimeR3_DEFS)) \
     536                                           RT_MINI
     537RuntimeGuestR3Mini_DEFS.$(BUILD_TARGET) := $(RuntimeR3_DEFS.$(BUILD_TARGET))
     538RuntimeGuestR3Mini_INCS                 := $(RuntimeR3_INCS)
     539RuntimeGuestR3Mini_INCS.$(BUILD_TARGET) := $(RuntimeR3_INCS.$(BUILD_TARGET))
     540RuntimeGuestR3Mini_SOURCES               = \
     541        common/err/errmsg.cpp \
     542        common/err/RTErrConvertFromErrno.cpp \
     543        common/log/logformat.cpp \
     544        common/misc/assert.cpp \
     545        common/misc/sanity-c.c \
     546        common/misc/sanity-cpp.cpp \
     547        common/string/strformat.cpp \
     548        common/string/strformatrt.cpp \
     549        common/string/string.cpp \
     550        common/string/strprintf.cpp \
     551        common/string/unidata.cpp \
     552        common/string/utf-8.cpp \
     553        common/string/utf-16.cpp \
     554        generic/pathhost-generic.cpp \
     555        generic/RTAssertDoBreakpoint-generic.cpp \
     556        r3/alloc.cpp \
     557        r3/fileio.cpp \
     558        r3/fs.cpp \
     559        r3/path.cpp
     560RuntimeGuestR3Mini_SOURCES.linux         = \
     561        r3/posix/fileio-posix.cpp \
     562        r3/posix/path-posix.cpp \
     563        r3/posix/utf8-posix.cpp
     564RuntimeGuestR3Mini_SOURCES.solaris       = \
     565        r3/posix/fileio-posix.cpp \
     566        r3/posix/path-posix.cpp \
     567        r3/posix/utf8-posix.cpp
     568# VBox specific stuff.
     569RuntimeGuestR3Mini_SOURCES              += \
    574570        VBox/logbackdoor.cpp \
    575         VBox/logbackdoor-redirect.cpp
    576 RuntimeGuestR3Shared_SOURCES.$(BUILD_TARGET) := $(RuntimeR3Shared_SOURCES.$(BUILD_TARGET))
    577 RuntimeGuestR3Shared_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH) := $(RuntimeR3Shared_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
     571        VBox/logbackdoor-redirect.cpp \
     572        VBox/strformat-vbox.cpp
    578573
    579574
    … …  
    602597RuntimeLnx32GuestR3_SOURCES   += VBox/logbackdoor.cpp
    603598RuntimeLnx32GuestR3_INCS       = $(RuntimeR3_INCS.linux)    $(RuntimeR3_INCS)
    604 
    605 
    606 #
    607 # RuntimeLnx32GuestR3Shared - 32-bit Linux guest program runtime which does not require
    608 # initialisation.
    609 #
    610 RuntimeLnx32GuestR3Shared_TEMPLATE   = VBOXLNX32GUESTR3LIB
    611 RuntimeLnx32GuestR3Shared_DEFS       = IN_RT_R3 IN_SUP_R3 LDR_WITH_NATIVE LDR_WITH_ELF32 \
    612                                        LDR_WITH_PE RT_WITH_VBOX VBOX_SHARED_RUNTIME
    613 ifdef IPRT_WITH_KSTUFF
    614  RuntimeLnx32GuestR3Shared_DEFS     += LDR_WITH_KLDR
    615 endif
    616 RuntimeLnx32GuestR3Shared_SOURCES    = $(RuntimeR3Shared_SOURCES.linux) $(RuntimeR3Shared_SOURCES)
    617 RuntimeLnx32GuestR3Shared_SOURCES   += \
    618         VBox/logbackdoor.cpp \
    619         VBox/logbackdoor-redirect.cpp
    620 RuntimeLnx32GuestR3Shared_INCS       = $(RuntimeR3_INCS.linux)    $(RuntimeR3_INCS)
    621599
    622600

  • trunk/src/VBox/Runtime/VBox/strformat-vbox.cpp

    r6536 r6553  
    139139             */
    140140            case 't':
    141 #if defined(IN_RING3) && !defined(VBOX_SHARED_RUNTIME)  /* we don't want this anywhere else yet. */
     141#if defined(IN_RING3) && !defined(RT_MINI)  /* we don't want this anywhere else yet. */
    142142                return RTStrFormat(pfnOutput, pvArgOutput, NULL, 0, "%#x\n", RTThreadSelf());
    143 #else /* !IN_RING3 */
     143#else /* !IN_RING3 || RT_MINI */
    144144                return pfnOutput(pvArgOutput, "0xffffffff", sizeof("0xffffffff") - 1);
    145 #endif /* !IN_RING3 */
     145#endif /* !IN_RING3 || RT_MINI */
    146146
    147147            case 'h':

  • trunk/src/VBox/Runtime/r3/path.cpp

    r6536 r6553  
    553553}
    554554
    555 #ifndef VBOX_SHARED_RUNTIME
     555
     556#ifndef RT_MINI
    556557
    557558/**
    … …  
    687688}
    688689
    689 #endif /* !VBOX_SHARED_RUNTIME */
     690#endif /* !RT_MINI */
     691

  • trunk/src/VBox/Runtime/r3/posix/path-posix.cpp

    r6536 r6553  
    401401
    402402
    403 #ifndef VBOX_SHARED_RUNTIME
    404 
     403#ifndef RT_MINI
    405404RTDECL(int) RTPathProgram(char *pszPath, unsigned cchPath)
    406405{
    … …  
    488487    return VERR_BUFFER_OVERFLOW;
    489488}
    490 
    491 #endif /* !VBOX_SHARED_RUNTIME */
     489#endif /* !RT_MINI */
     490
    492491
    493492#ifndef RT_OS_L4
Note: See TracChangeset for help on using the changeset viewer.

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