Changeset 6124

Timestamp:

12/18/07 14:53:29 (10 months ago)

Author:

vboxsync

Message:

Removed VBoxXML (including CFGLDR), xerces and xalan.

Files:

• trunk/Config.kmk (modified) (2 diffs)
• trunk/Makefile.kmk (modified) (1 diff)
• trunk/include/VBox/cdefs.h (modified) (1 diff)
• trunk/include/VBox/cfgldr.h (deleted)
• trunk/include/VBox/com/Guid.h (modified) (1 diff)
• trunk/src/VBox/Frontends/VBoxBFE/HostUSBImpl.h (modified) (1 diff)
• trunk/src/VBox/Installer/linux/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/Main/Makefile.kmk (modified) (11 diffs)
• trunk/src/VBox/Main/VirtualBoxImplExtra.cpp (modified) (3 diffs)
• trunk/src/VBox/Main/xml/cfgldr.cpp (deleted)
• trunk/src/libs/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -1142 +1142 @@
-# SDKs for external libraries.
-#
-SDK_VBOX_XERCES       = .
-SDK_VBOX_XERCES_INCS ?= $(PATH_ROOT)/src/libs/xerces-2.6.0/src
-SDK_VBOX_XERCES_LIBS ?= $(PATH_LIB)/VBox-xerces$(VBOX_SUFF_LIB)
-
-SDK_VBOX_XALAN        = .
-SDK_VBOX_XALAN_INCS  ?= $(PATH_ROOT)/src/libs/xalan-1.10.0
-SDK_VBOX_XALAN_LIBS  ?= $(PATH_LIB)/VBox-xalan$(VBOX_SUFF_LIB)
-
-SDK_VBOX_LIBXML2          = .
-#if1of ($(BUILD_TARGET),win os2 solaris)
@@ -2242 +2234 @@
-TEMPLATE_VBOXQTGUI = VBox Qt GUI Components
-TEMPLATE_VBOXQTGUI_EXTENDS = VBOXQTGUIEXE
- $(PATH_BIN)/VBoxXML$(VBOX_SUFF_DLL)
+
-ifeq ($(BUILD_TARGET),darwin)
- TEMPLATE_VBOXQTGUI_LDFLAGS = $(filter-out -framework Carbon -framework QuickTime -bind_at_load,$(TEMPLATE_VBOXQTGUIEXE_LDFLAGS))

trunk/Makefile.kmk

@@ -132 +132 @@
-  endif
- endif
-endif
-
-# The Xerces DLL
-ifneq ($(DLL_SDK_VBOX_XERCES_XERCES),)
- bin_SOURCES += $(DLL_SDK_VBOX_XERCES_XERCES)
-endif
-
-# The Xalan DLLs
-ifneq ($(DLL_SDK_VBOX_XALAN_XALAN),)
- bin_SOURCES += $(DLL_SDK_VBOX_XALAN_XALAN)
-endif
-ifneq ($(DLL_SDK_VBOX_XALAN_XALAN-MESSAGES),)
- bin_SOURCES += $(DLL_SDK_VBOX_XALAN_XALAN-MESSAGES)
-endif
-

trunk/include/VBox/cdefs.h

@@ -58 +58 @@
-# define VBOX_STRICT
-#endif
-#define IN_CFGLDR_R3
-#define IN_CFGM_GC
-#define IN_CFGM_R3

trunk/include/VBox/com/Guid.h

@@ -104 +104 @@
-    operator const GUID &() const { return *(GUID *) &uuid; }
-
-CFGLDRQueryUUID(
+RTPrintf("%Vuuid"
-    PRTUUID ptr() { return &uuid; }
-

trunk/src/VBox/Frontends/VBoxBFE/HostUSBImpl.h

@@ -28 +28 @@
-
-/* We do not support loadable configurations here */
-cfgldr
+settings
-
-#include <list>

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

@@ -65 +65 @@
-        VBoxDDU.so \
-        VBoxVMM.so \
-        VBoxXML.so \
-        VBoxXPCOM.so \
-        VBoxXPCOMIPCD \

trunk/src/VBox/Main/Makefile.kmk

@@ -28 +28 @@
-
-LIBRARIES        = VBoxCOM
-XML VBox
+
-PROGRAMS         = VBoxSVC
-ifneq ($(BUILD_TARGET),win)
@@ -41 +41 @@
-endif
-
-
-#PROGRAMS         = tstCFGLdr
-
-ifeq ($(BUILD_TARGET),win)
@@ -74 +72 @@
-
-
-
-#
-# The Main API documentation
@@ -102 +99 @@
-
-VBoxSVC_TEMPLATE = VBOXMAINEXE
-CFGLDR_HAVE_COM IN_CFGLDR_R3 
+
-ifdef VBOX_WITH_VRDP
-VBoxSVC_DEFS += VBOX_VRDP
@@ -151 +148 @@
- VBoxSVC_LIBS += \
-        $(PATH_LIB)/VBoxDDU$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/VBoxXML$(VBOX_SUFF_LIB) \
-        $(PATH_LIB)/VBoxSettings$(VBOX_SUFF_LIB)
-else
- VBoxSVC_LIBS += \
-        $(PATH_BIN)/VBoxDDU$(VBOX_SUFF_DLL) \
-        $(PATH_BIN)/VBoxXML$(VBOX_SUFF_DLL) \
-        $(PATH_BIN)/VBoxSettings$(VBOX_SUFF_DLL)
-endif
@@ -252 +247 @@
-VBoxSVCM_INST           = $(INST_BIN)components/
-endif
- IN_CFGLDR_R3
+
-VBoxSVCM_INCS           = \
-        include \
@@ -282 +277 @@
-endif
-
- IN_CFGLDR_R3
+
-VBoxC_DEFS += VBOX_COM_INPROC
-
@@ -397 +392 @@
-
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-#
-
@@ -439 +404 @@
-        xml/Settings.cpp
-VBoxSettings_LDFLAGS.darwin = -install_name @executable_path/VBoxSettings.dylib -Wl,-x # no debug info please.
-
-
-#
-# tstCFGLdr - broken.
-#
-
-tstCFGLdr_TEMPLATE = VBOXMAINCLIENTEXE
-tstCFGLdr_SDKS     = VBOX_XALAN VBOX_XERCES
-tstCFGLdr_DEFS     = IN_CFGLDR_R3 STANDALONE_TEST
-tstCFGLdr_SOURCES  = \
-        xml/cfgldr.cpp \
-        xml/cfgldrhlp.cpp
-tstCFGLdr_INCS     = \
-        include \
-        $(PATH_TARGET)
-
-
@@ -503 +453 @@
-# Embed XML Schema files to VBoxSVC
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $(call MSG_TOOL,bin2c,VBoxSVC,$<,$@)
-VirtualBox_settings_common
-
-ENTITIES): $(VBOX_XML_SCHEMA.$(BUILD_TARGET)
+_xml_VirtualBox_settings
+
+SCHEMA_COMMON_H): $(VBOX_XML_SCHEMA_COMMON
-        $(call MSG_TOOL,bin2c,VBoxSVC,$<,$@)
-
-
-
+
+
+
+
+
+
+
+
-
-
@@ -546 +506 @@
-
-
-
-#
-# Creates the symlinks necessary for making XPCOM work.
-#
-## @todo Figure out why Linux really needs this, darwin doesn't...
+
-xpcom-components_INST = $(INST_BIN)components/
-ifeq ($(BUILD_TARGET),linux)

trunk/src/VBox/Main/VirtualBoxImplExtra.cpp

@@ -25 +25 @@
-
-/* embedded XML Schema documents for validating XML settings files */
-
-
+
+
+
+
+
-
-/** 
@@ -43 +46 @@
-    {
-        return new settings::
-
-
+_xml_
+_xml_
-    }
-
@@ -50 +53 @@
-    {
-        return new settings::
-
-
+_xml_
+_xml_
-    }
-

trunk/src/libs/Makefile.kmk

@@ -41 +41 @@
-  subdirs += xpcom18a4
- endif
- # Only build xerces if we don't use an external library.
- ifeq ($(SDK_VBOX_XERCES_INCS),$(PATH_ROOT)/src/libs/xerces-2.6.0/src)
-  subdirs += xerces-2.6.0
- endif
- # Only build xalan if we don't use an external library.
- ifeq ($(SDK_VBOX_XALAN_INCS),$(PATH_ROOT)/src/libs/xalan-1.10.0)
-  subdirs += xalan-1.10.0
- endif
- # Only build libxml2 if we don't use an external library.
- ifeq ($(SDK_VBOX_LIBXML2_INCS),$(PATH_ROOT)/src/libs/libxml2-2.6.30/include)