VirtualBox

Changeset 22185 in vbox


Ignore:
Timestamp:
Aug 11, 2009 5:27:59 PM (15 years ago)
Author:
vboxsync
Message:

Main: remove VBoxSettings library and link settings code into VBoxSVC directly -- now that XML is in IPRT there's no need for it and it's to fragile on multiple platforms.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r22158 r22185  
    12021202 LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.dylib
    12031203 LIB_DDU         = $(PATH_BIN)/VBoxDDU.dylib
    1204  LIB_SETTINGS    = $(PATH_BIN)/VBoxSettings.dylib
    12051204endif
    12061205ifeq ($(KBUILD_TARGET),l4)
    … …  
    12131212 LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.s.so
    12141213 LIB_DDU         = $(PATH_BIN)/VBoxDDU.s.so
    1215  LIB_SETTINGS    = $(PATH_BIN)/VBoxSettings.s.so
    12161214endif
    12171215if1of ($(KBUILD_TARGET), linux freebsd netbsd openbsd solaris)
    … …  
    12241222 LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.so
    12251223 LIB_DDU         = $(PATH_BIN)/VBoxDDU.so
    1226  LIB_SETTINGS    = $(PATH_BIN)/VBoxSettings.so
    12271224endif
    12281225ifeq ($(KBUILD_TARGET),os2)
    … …  
    12351232 LIB_XPCOM       = $(PATH_BIN)/VBoxXCOM.dll
    12361233 LIB_DDU         = $(PATH_BIN)/VBoxDDU.dll
    1237  LIB_SETTINGS    = $(PATH_BIN)/VBoxSett.dll
    12381234 VBOX_OBJ_SYS0   = $(PATH_OBJ)/RuntimeR0/os2/sys0.obj
    12391235endif
    … …  
    12471243 LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.dll
    12481244 LIB_DDU         = $(PATH_LIB)/VBoxDDU.lib
    1249  LIB_SETTINGS    = $(PATH_LIB)/VBoxSettings.lib
    12501245endif
    12511246VBOX_LIB_SUPHARDENED    = $(PATH_LIB)/SUPR3HardenedStatic$(VBOX_SUFF_LIB)

  • trunk/include/VBox/settings.h

    r22183 r22185  
    5151#include <vector>
    5252
    53 // #ifdef IN_VBOXXML_R3
    54 // # define VBOXXML_CLASS DECLEXPORT_CLASS
    55 // #else
    56 // # define VBOXXML_CLASS DECLIMPORT_CLASS
    57 // #endif
    58 
    59 #define VBOXXML_CLASS
    60 
    6153namespace xml
    6254{
    … …  
    8476 * which contains some common logic for both.
    8577 */
    86 class VBOXXML_CLASS ConfigFileBase
     78class ConfigFileBase
    8779{
    8880public:
    … …  
    127119////////////////////////////////////////////////////////////////////////////////
    128120
    129 struct VBOXXML_CLASS USBDeviceFilter
     121struct USBDeviceFilter
    130122{
    131123    USBDeviceFilter()
    … …  
    149141};
    150142
    151 struct VBOXXML_CLASS Host
     143struct Host
    152144{
    153145    USBDeviceFiltersList    llUSBDeviceFilters;
    154146};
    155147
    156 struct VBOXXML_CLASS SystemProperties
     148struct SystemProperties
    157149{
    158150    SystemProperties()
    … …  
    173165typedef std::list<Medium> MediaList;
    174166
    175 struct VBOXXML_CLASS Medium
     167struct Medium
    176168{
    177169    com::Guid       uuid;
    … …  
    188180};
    189181
    190 struct VBOXXML_CLASS MachineRegistryEntry
     182struct MachineRegistryEntry
    191183{
    192184    com::Guid       uuid;
    … …  
    195187typedef std::list<MachineRegistryEntry> MachinesRegistry;
    196188
    197 struct VBOXXML_CLASS DHCPServer
     189struct DHCPServer
    198190{
    199191    com::Utf8Str    strNetworkName,
    … …  
    206198typedef std::list<DHCPServer> DHCPServersList;
    207199
    208 class VBOXXML_CLASS MainConfigFile : public ConfigFileBase
     200class MainConfigFile : public ConfigFileBase
    209201{
    210202public:
    … …  
    238230////////////////////////////////////////////////////////////////////////////////
    239231
    240 struct VBOXXML_CLASS VRDPSettings
     232struct VRDPSettings
    241233{
    242234    VRDPSettings()
    … …  
    258250};
    259251
    260 struct VBOXXML_CLASS BIOSSettings
     252struct BIOSSettings
    261253{
    262254    BIOSSettings()
    … …  
    282274};
    283275
    284 struct VBOXXML_CLASS DVDDrive
     276struct DVDDrive
    285277{
    286278    DVDDrive()
    … …  
    293285};
    294286
    295 struct VBOXXML_CLASS FloppyDrive
     287struct FloppyDrive
    296288{
    297289    FloppyDrive()
    … …  
    304296};
    305297
    306 struct VBOXXML_CLASS USBController
     298struct USBController
    307299{
    308300    USBController()
    … …  
    316308};
    317309
    318 struct VBOXXML_CLASS NetworkAdapter
     310struct NetworkAdapter
    319311{
    320312    NetworkAdapter()
    … …  
    345337typedef std::list<NetworkAdapter> NetworkAdaptersList;
    346338
    347 struct VBOXXML_CLASS SerialPort
     339struct SerialPort
    348340{
    349341    SerialPort()
    … …  
    366358typedef std::list<SerialPort> SerialPortsList;
    367359
    368 struct VBOXXML_CLASS ParallelPort
     360struct ParallelPort
    369361{
    370362    ParallelPort()
    … …  
    383375typedef std::list<ParallelPort> ParallelPortsList;
    384376
    385 struct VBOXXML_CLASS AudioAdapter
     377struct AudioAdapter
    386378{
    387379    AudioAdapter()
    … …  
    396388};
    397389
    398 struct VBOXXML_CLASS SharedFolder
     390struct SharedFolder
    399391{
    400392    SharedFolder()
    … …  
    408400typedef std::list<SharedFolder> SharedFoldersList;
    409401
    410 struct VBOXXML_CLASS GuestProperty
     402struct GuestProperty
    411403{
    412404    GuestProperty()
    … …  
    423415typedef std::map<uint32_t, DeviceType_T> BootOrderMap;
    424416
    425 struct VBOXXML_CLASS Hardware
     417struct Hardware
    426418{
    427419    Hardware()
    … …  
    488480};
    489481
    490 struct VBOXXML_CLASS AttachedDevice
     482struct AttachedDevice
    491483{
    492484    AttachedDevice()
    … …  
    503495typedef std::list<AttachedDevice> AttachedDevicesList;
    504496
    505 struct VBOXXML_CLASS StorageController
     497struct StorageController
    506498{
    507499    StorageController()
    … …  
    532524// wrap the list into an extra struct so we can use the struct without
    533525// having to define the typedef above in headers
    534 struct VBOXXML_CLASS Storage
     526struct Storage
    535527{
    536528    StorageControllersList  llStorageControllers;
    … …  
    540532typedef std::list<Snapshot> SnapshotsList;
    541533
    542 struct VBOXXML_CLASS Snapshot
     534struct Snapshot
    543535{
    544536    com::Guid       uuid;
    … …  
    556548
    557549
    558 class VBOXXML_CLASS MachineConfigFile : public ConfigFileBase
     550class MachineConfigFile : public ConfigFileBase
    559551{
    560552public:

  • trunk/src/VBox/Installer/linux/Makefile.kmk

    r21634 r22185  
    113113                VBoxNetAdpCtl \
    114114                VBoxSVC \
    115                 VBoxSettings.so \
    116115                VBoxXPCOM.so \
    117116                VBoxXPCOMC.so \

  • trunk/src/VBox/Installer/solaris/Makefile.kmk

    r22082 r22185  
    226226          VBoxOGLrenderspu.so \
    227227          VBoxSharedCrOpenGL.so) \
    228         VBoxSettings.so \
    229228        components/VBoxC.so \
    230229        components/VBoxSVCM.so \

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

    r21730 r22185  
    254254
    255255VBoxSVC_LIBS += \
    256         $(LIB_DDU) \
    257         $(LIB_SETTINGS)
     256        $(LIB_DDU)
    258257VBoxSVC_LIBS.darwin = \
    259258        $(LIB_VMM) \
    … …  
    316315        Version.cpp \
    317316        HostPower.cpp \
     317        xml/Settings.cpp \
    318318        $(if $(VBOX_WITH_VRDP),VRDPServerImpl.cpp,) \
    319319        $(if $(VBOX_WITH_XPCOM),xpcom/server.cpp,) \
    … …  
    514514
    515515endif # VBOX_WITH_XPCOM
    516 
    517 
    518 #
    519 # VBoxSettings
    520 #
    521 DLLS += VBoxSettings
    522 VBoxSettings_TEMPLATE   = VBOXMAINDLL
    523 VBoxSettings_NAME       = $(basename $(notdir $(LIB_SETTINGS)))
    524 VBoxSettings_SDKS       = VBOX_LIBXSLT VBOX_LIBXML2 VBOX_ZLIB VBOX_BOOST
    525 VBoxSettings_DEFS       = IN_VBOXXML_R3
    526 VBoxSettings_INCS       = \
    527         include
    528 VBoxSettings_SOURCES    = \
    529         xml/Settings.cpp
    530 VBoxSettings_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/$(notdir $(LIB_SETTINGS)) -Wl,-x # no debug info please.
    531 
    532516
    533517#
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