VirtualBox

Changeset 6124 in vbox for trunk/src/VBox/Main


Ignore:
Timestamp:
Dec 18, 2007 1:53:29 PM (17 years ago)
Author:
vboxsync
Message:

Removed VBoxXML (including CFGLDR), xerces and xalan.

Location:
trunk/src/VBox/Main
Files:
1 deleted
2 edited

Legend:

Unmodified
Added
Removed

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

    r6076 r6124  
    2828
    2929LIBRARIES        = VBoxCOM
    30 DLLS             = VBoxXML VBoxSettings VBoxC
     30DLLS             = VBoxSettings VBoxC
    3131PROGRAMS         = VBoxSVC
    3232ifneq ($(BUILD_TARGET),win)
    … …  
    4141endif
    4242
    43 
    44 #PROGRAMS         = tstCFGLdr
    4543
    4644ifeq ($(BUILD_TARGET),win)
    … …  
    7472
    7573
    76 
    7774#
    7875# The Main API documentation
    … …  
    10299
    103100VBoxSVC_TEMPLATE = VBOXMAINEXE
    104 VBoxSVC_DEFS = CFGLDR_HAVE_COM IN_CFGLDR_R3 VBOX_MAIN_SETTINGS_ADDONS
     101VBoxSVC_DEFS = VBOX_MAIN_SETTINGS_ADDONS
    105102ifdef VBOX_WITH_VRDP
    106103VBoxSVC_DEFS += VBOX_VRDP
    … …  
    151148 VBoxSVC_LIBS += \
    152149        $(PATH_LIB)/VBoxDDU$(VBOX_SUFF_LIB) \
    153         $(PATH_LIB)/VBoxXML$(VBOX_SUFF_LIB) \
    154150        $(PATH_LIB)/VBoxSettings$(VBOX_SUFF_LIB)
    155151else
    156152 VBoxSVC_LIBS += \
    157153        $(PATH_BIN)/VBoxDDU$(VBOX_SUFF_DLL) \
    158         $(PATH_BIN)/VBoxXML$(VBOX_SUFF_DLL) \
    159154        $(PATH_BIN)/VBoxSettings$(VBOX_SUFF_DLL)
    160155endif
    … …  
    252247VBoxSVCM_INST           = $(INST_BIN)components/
    253248endif
    254 VBoxSVCM_DEFS           = IN_RING3 IN_CFGLDR_R3
     249VBoxSVCM_DEFS           = IN_RING3
    255250VBoxSVCM_INCS           = \
    256251        include \
    … …  
    282277endif
    283278
    284 VBoxC_DEFS = IN_RING3 IN_CFGLDR_R3
     279VBoxC_DEFS = IN_RING3
    285280VBoxC_DEFS += VBOX_COM_INPROC
    286281
    … …  
    397392
    398393#
    399 # VBoxXML
    400 #
    401 
    402 VBoxXML_TEMPLATE   = VBOXMAINDLL
    403 VBoxXML_SDKS       = VBOX_XALAN VBOX_XERCES
    404 ## @todo Why do we need this? Why isn't it in the template?!?
    405 VBoxXML_CXXFLAGS.win = -EHsc
    406 VBoxXML_DEFS       = \
    407         CFGLDR_HAVE_COM IN_RING3 IN_CFGLDR_R3
    408 VBoxXML_INCS       = \
    409         include \
    410         $(PATH_TARGET)
    411 VBoxXML_SOURCES    = \
    412         xml/cfgldr.cpp
    413 VBoxXML_INCS.freebsd = \
    414         /usr/local/include ## @todo probably belongs in the template
    415 VBoxXML_LIBPATH.freebsd = \
    416         /usr/local/lib ## @todo probably belongs in the template
    417 VBoxXML_LDFLAGS.darwin = -install_name @executable_path/VBoxXML.dylib -Wl,-x # no debug info please.
    418 
    419 ## @todo (dmik): temporarily embed SettingsConverter.xsl into VBoxXML,
    420 #                later it should go to VBoxSVC as well
    421 xml/cfgldr.cpp_DEPS = $(PATH_TARGET)/SettingsConverter_xsl.h
    422 OTHER_CLEAN += $(PATH_TARGET)/SettingsConverter_xsl.h
    423 $(PATH_TARGET)/SettingsConverter_xsl.h: xml/SettingsConverter.xsl $(VBOX_BIN2C) | $(call DIRDEP,$(PATH_TARGET))
    424         $(call MSG_TOOL,bin2c,VBoxXML,$<,$@)
    425         $(QUIET)$(VBOX_BIN2C) SettingsConverter_xsl $< $@
    426 
    427 
    428 #
    429 # VBoxSettings (will supercede VBoxXML when done)
     394# VBoxSettings
    430395#
    431396
    … …  
    439404        xml/Settings.cpp
    440405VBoxSettings_LDFLAGS.darwin = -install_name @executable_path/VBoxSettings.dylib -Wl,-x # no debug info please.
    441 
    442 
    443 #
    444 # tstCFGLdr - broken.
    445 #
    446 
    447 tstCFGLdr_TEMPLATE = VBOXMAINCLIENTEXE
    448 tstCFGLdr_SDKS     = VBOX_XALAN VBOX_XERCES
    449 tstCFGLdr_DEFS     = IN_CFGLDR_R3 STANDALONE_TEST
    450 tstCFGLdr_SOURCES  = \
    451         xml/cfgldr.cpp \
    452         xml/cfgldrhlp.cpp
    453 tstCFGLdr_INCS     = \
    454         include \
    455         $(PATH_TARGET)
    456406
    457407
    … …  
    503453# Embed XML Schema files to VBoxSVC
    504454#
    505 VBOX_XML_ENTITIES        = $(PATH_TARGET)/VirtualBoxXMLUtil_entities.h
    506 VBOX_XML_ENTITIES_COMMON = $(PATH_TARGET)/VirtualBoxXMLUtil_common_entities.h
    507 
    508 VBOX_XML_SCHEMA_COMMON = xml/VirtualBox-settings-common.xsd
    509 VBOX_XML_SCHEMA.darwin = xml/VirtualBox-settings-macosx.xsd
    510 VBOX_XML_SCHEMA.linux  = xml/VirtualBox-settings-linux.xsd
    511 VBOX_XML_SCHEMA.freebsd  = xml/VirtualBox-settings-freebsd.xsd
    512 VBOX_XML_SCHEMA.win    = xml/VirtualBox-settings-windows.xsd
    513 VBOX_XML_SCHEMA.os2    = xml/VirtualBox-settings-os2.xsd
    514 VBOX_XML_SCHEMA.solaris= xml/VirtualBox-settings-solaris.xsd
    515 
    516 VirtualBoxImplExtra.cpp_DEPS = $(VBOX_XML_ENTITIES) $(VBOX_XML_ENTITIES_COMMON)
    517 
    518 $(VBOX_XML_ENTITIES_COMMON): $(VBOX_XML_SCHEMA_COMMON) $(VBOX_BIN2C)
     455
     456VBOX_XML_SCHEMA_H               = $(PATH_TARGET)/xml_VirtualBox_settings_xsd.h
     457VBOX_XML_SCHEMA_COMMON_H        = $(PATH_TARGET)/xml_VirtualBox_settings_common_xsd.h
     458VBOX_XML_CONVERTER_TEMPLATE_H   = $(PATH_TARGET)/xml_SettingsConverter_xsl.h
     459
     460VBOX_XML_SCHEMA_COMMON  = xml/VirtualBox-settings-common.xsd
     461VBOX_XML_SCHEMA.darwin  = xml/VirtualBox-settings-macosx.xsd
     462VBOX_XML_SCHEMA.linux   = xml/VirtualBox-settings-linux.xsd
     463VBOX_XML_SCHEMA.freebsd = xml/VirtualBox-settings-freebsd.xsd
     464VBOX_XML_SCHEMA.win     = xml/VirtualBox-settings-windows.xsd
     465VBOX_XML_SCHEMA.os2     = xml/VirtualBox-settings-os2.xsd
     466VBOX_XML_SCHEMA.solaris = xml/VirtualBox-settings-solaris.xsd
     467
     468VBOX_XML_CONVERTER_TEMPLATE = xml/SettingsConverter.xsl
     469
     470VirtualBoxImplExtra.cpp_DEPS = \
     471        $(VBOX_XML_SCHEMA_H) $(VBOX_XML_SCHEMA_COMMON_H) $(VBOX_XML_CONVERTER_TEMPLATE_H)
     472
     473$(VBOX_XML_SCHEMA_H): $(VBOX_XML_SCHEMA.$(BUILD_TARGET)) $(VBOX_BIN2C)
    519474        $(call MSG_TOOL,bin2c,VBoxSVC,$<,$@)
    520         $(QUIET)$(VBOX_BIN2C) VirtualBox_settings_common_xsd $< $@
    521 
    522 $(VBOX_XML_ENTITIES): $(VBOX_XML_SCHEMA.$(BUILD_TARGET)) $(VBOX_BIN2C)
     475        $(QUIET)$(VBOX_BIN2C) _xml_VirtualBox_settings_xsd $< $@
     476
     477$(VBOX_XML_SCHEMA_COMMON_H): $(VBOX_XML_SCHEMA_COMMON) $(VBOX_BIN2C)
    523478        $(call MSG_TOOL,bin2c,VBoxSVC,$<,$@)
    524         $(QUIET)$(VBOX_BIN2C) VirtualBox_settings_xsd $< $@
    525 
    526 OTHER_CLEAN     += $(VBOX_XML_ENTITIES) $(VBOX_XML_ENTITIES_COMMON)
     479        $(QUIET)$(VBOX_BIN2C) _xml_VirtualBox_settings_common_xsd $< $@
     480
     481$(VBOX_XML_CONVERTER_TEMPLATE_H): $(VBOX_XML_CONVERTER_TEMPLATE) $(VBOX_BIN2C)
     482        $(call MSG_TOOL,bin2c,VBoxSVC,$<,$@)
     483        $(QUIET)$(VBOX_BIN2C) _xml_SettingsConverter_xsl $< $@
     484
     485OTHER_CLEAN += \
     486        $(VBOX_XML_SCHEMA_H) $(VBOX_XML_SCHEMA_COMMON_H) $(VBOX_XML_CONVERTER_TEMPLATE_H)
    527487
    528488
    … …  
    546506
    547507
    548 
    549508#
    550509# Creates the symlinks necessary for making XPCOM work.
    551510#
    552511## @todo Figure out why Linux really needs this, darwin doesn't...
     512
    553513xpcom-components_INST = $(INST_BIN)components/
    554514ifeq ($(BUILD_TARGET),linux)

  • trunk/src/VBox/Main/VirtualBoxImplExtra.cpp

    r6076 r6124  
    2525
    2626/* embedded XML Schema documents for validating XML settings files */
    27 #include "VirtualBoxXMLUtil_entities.h"
    28 #include "VirtualBoxXMLUtil_common_entities.h"
     27#include "xml_VirtualBox_settings_xsd.h"
     28#include "xml_VirtualBox_settings_common_xsd.h"
     29
     30/* embedded settings converter template for updating settings files */
     31#include "xml_SettingsConverter_xsl.h"
    2932
    3033/**
    … …  
    4346    {
    4447        return new settings::
    45             MemoryBuf ((const char *) g_abVirtualBox_settings_common_xsd,
    46                        g_cbVirtualBox_settings_common_xsd, aURI);
     48            MemoryBuf ((const char *) g_ab_xml_VirtualBox_settings_common_xsd,
     49                       g_cb_xml_VirtualBox_settings_common_xsd, aURI);
    4750    }
    4851
    … …  
    5053    {
    5154        return new settings::
    52             MemoryBuf ((const char *) g_abVirtualBox_settings_xsd,
    53                        g_cbVirtualBox_settings_xsd, aURI);
     55            MemoryBuf ((const char *) g_ab_xml_VirtualBox_settings_xsd,
     56                       g_cb_xml_VirtualBox_settings_xsd, aURI);
    5457    }
    5558
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