Changeset 48164 in vbox for trunk/src

Timestamp:

Aug 29, 2013 4:35:14 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

88547

Message:

Main: phase out the use of the XPCOM glue (wasn't ever used), and rename tstVBoxAPILinux to tstVBoxAPIXPCOM to match the content
libs/xpcom: strip down the standalone XPCOM glue code and disable building it as so far no one uses it

Location:

trunk/src

Files:

• VBox/Main/glue/initterm.cpp (modified) (3 diffs)
• VBox/Main/src-server/xpcom/server.cpp (modified) (2 diffs)
• VBox/Main/testcase/Makefile.kmk (modified) (3 diffs)
• VBox/Main/testcase/makefile.tstVBoxAPIXPCOM (moved) (moved from trunk/src/VBox/Main/testcase/makefile.tstVBoxAPILinux ) (3 diffs)
• VBox/Main/testcase/tstVBoxAPIXPCOM.cpp (moved) (moved from trunk/src/VBox/Main/testcase/tstVBoxAPILinux.cpp ) (3 diffs)
• libs/xpcom18a4/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Main/glue/initterm.cpp

@@ -24 +24 @@
 
 # include <stdlib.h>
-
-  /* XPCOM_GLUE is defined when the client uses the standalone glue
-   * (i.e. dynamically picks up the existing XPCOM shared library installation).
-   * This is not the case for VirtualBox XPCOM clients (they are always
-   * distributed with the self-built XPCOM library, and therefore have a binary
-   * dependency on it) but left here for clarity.
-   */
-# if defined(XPCOM_GLUE)
-#  include <nsXPCOMGlue.h>
-# endif
 
 # include <nsIComponentRegistrar.h>
@@ -355 +345 @@
     LogFlowFunc(("component registry  : \"%s\"\n", szCompReg));
     LogFlowFunc(("XPTI data file      : \"%s\"\n", szXptiDat));
-
-#if defined (XPCOM_GLUE)
-    XPCOMGlueStartup(nsnull);
-#endif
 
     static const char *kAppPathsToProbe[] =
@@ -584 +570 @@
                 Assert(wasInited == true);
                 NOREF(wasInited);
-
-# if defined (XPCOM_GLUE)
-                XPCOMGlueShutdown();
-# endif
             }
         }

trunk/src/VBox/Main/src-server/xpcom/server.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2004-2012 Oracle Corporation
+ * Copyright (C) 2004-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 
 #include <nsIComponentRegistrar.h>
-
-#ifdef XPCOM_GLUE
-# include <nsXPCOMGlue.h>
-#endif
 
 #include <nsEventQueueUtils.h>

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

@@ -28 +28 @@
         tstAPI \
         $(if $(VBOX_OSE),,tstOVF) \
-        $(if $(VBOX_WITH_XPCOM),tstVBoxAPILinux,tstVBoxAPIWin) \
+        $(if $(VBOX_WITH_XPCOM),tstVBoxAPIXPCOM,tstVBoxAPIWin) \
         $(if $(VBOX_WITH_RESOURCE_USAGE_API),tstCollector,) \
         $(if $(VBOX_WITH_GUEST_CONTROL),tstGuestCtrlParseBuffer,) \
@@ -55 +55 @@
 samplesXPCOM_MODE = a+r,u+w
 samplesXPCOM_INST = $(INST_SDK)bindings/xpcom/samples/
-samplesXPCOM_SOURCES = tstVBoxAPILinux.cpp makefile.tstVBoxAPILinux=>Makefile
+samplesXPCOM_SOURCES = tstVBoxAPIXPCOM.cpp makefile.tstVBoxAPIXPCOM=>Makefile
 
 
@@ -89 +89 @@
 
 #
-# tstVBoxAPILinux
+# tstVBoxAPIXPCOM
 #
 # We only build the testcase here to make sure it builds.
 # It comes with a custom makefile which should be tested as well!
 #
-tstVBoxAPILinux_TEMPLATE = VBOXMAINCLIENTTSTEXE
-tstVBoxAPILinux_SOURCES  = tstVBoxAPILinux.cpp
+tstVBoxAPIXPCOM_TEMPLATE = VBOXMAINCLIENTTSTEXE
+tstVBoxAPIXPCOM_SOURCES  = tstVBoxAPIXPCOM.cpp
 
 

trunk/src/VBox/Main/testcase/makefile.tstVBoxAPIXPCOM

@@ -1 +1 @@
 #
-# tstVBoxAPILinux makefile
+# tstVBoxAPIXPCOM makefile
 #
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2013 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -36 +36 @@
 # Link with the public XPCOM libraries
 #
-tstVBoxAPILinux: tstVBoxAPILinux.o
+tstVBoxAPIXPCOM: tstVBoxAPIXPCOM.o
         g++ -g -o $@ $^ \
                 $(PATH_BIN)/VBoxXPCOM.so \
@@ -42 +42 @@
                 -ldl -lpthread
 
-tstVBoxAPILinux.o: tstVBoxAPILinux.cpp
-        g++ -c -DRT_OS_LINUX -g -fshort-wchar $(addprefix -I, $(INCS_XPCOM)) $(addprefix -D, $(DEFS_XPCOM)) -o $@ tstVBoxAPILinux.cpp
+tstVBoxAPIXPCOM.o: tstVBoxAPIXPCOM.cpp
+        g++ -c -g -fshort-wchar $(addprefix -I, $(INCS_XPCOM)) $(addprefix -D, $(DEFS_XPCOM)) -o $@ tstVBoxAPIXPCOM.cpp
 
 clean:
-        rm -f tstVBoxAPILinux tstVBoxAPILinux.o
+        rm -f tstVBoxAPIXPCOM tstVBoxAPIXPCOM.o

trunk/src/VBox/Main/testcase/tstVBoxAPIXPCOM.cpp

@@ -67 +67 @@
  * Include the XPCOM headers
  */
-
-#if defined(XPCOM_GLUE)
-#include <nsXPCOMGlue.h>
-#endif
-
 #include <nsMemory.h>
 #include <nsString.h>
@@ -472 +467 @@
      * What we do is just follow the required steps to get an instance
      * of our main interface, which is IVirtualBox.
-     */
-#if defined(XPCOM_GLUE)
-    XPCOMGlueStartup(nsnull);
-#endif
-
-    /*
+     *
      * Note that we scope all nsCOMPtr variables in order to have all XPCOM
      * objects automatically released before we call NS_ShutdownXPCOM at the
@@ -578 +568 @@
      */
     NS_ShutdownXPCOM(nsnull);
-#if defined(XPCOM_GLUE)
-    XPCOMGlueShutdown();
-#endif
     RTPrintf("Done!\n");
     return 0;

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -88 +88 @@
         VBox-xpcom-proxy \
         VBoxXPCOMGlue_s \
-        VBoxXPCOMGlue \
+        $(if $(VBOX_WITH_XPCOM_GLUE_WHICH_IS_UNUSED),VBoxXPCOMGlue,) \
         VBox-xpcom-ipcutils \
         VBox-xpcom-ipcshared \
@@ -888 +888 @@
 # The VBoxXPCOM Glue static libraries.
 #
-# See http://developer.mozilla.org/en/docs/XPCOM_Glue for details about the
-# original XPCOM glue library purpose and usage.
-#
-# We don't really use the glue library in the described way because we don't
-# provide frozen APIs (yet), so all VBox XPCOM client applications are
-# dependent on the given version of both the VBox XPCOM runtime (binary
-# dependency) and VirtualBox component library (COM interface dependency). For
-# this reason, VBox client applications link to the VBox XPCOM shared library
-# directly (instead of linking to the standalone XPCOM glue library that would
-# dynamically search for and load the installed XPCOM runtime). For the same
-# reason, we link all parts of XPCOM into a single shared XPCOM library below
-# (as opposed to the original XPCOM where e.g. NSPR lives in a separate DLL).
+# This isn't the normal XPCOM glue (see the places in XPCOM where XPCOM_GLUE is
+# checked), VirtualBox has its own glue library and this means this isn't used
+# much (one reason is that we don't provide frozen APIs yet). All VBox XPCOM
+# client applications are dependent on the given version of both the VBox XPCOM
+# runtime (binary dependency) and VirtualBox component library (COM interface
+# dependency). For this reason, VBox client applications link to the VBox XPCOM
+# shared library directly (instead of linking to the standalone XPCOM glue
+# library that would dynamically search for and load the installed XPCOM
+# runtime). For the same reason, we link all parts of XPCOM into a single
+# shared XPCOM library below (as opposed to the original XPCOM where e.g. NSPR
+# lives in a separate DLL). Additionally there is VBox specific glue code to
+# make both the client and server side code build with both XPCOM and COM,
+# which should be made part of the SDK eventually, but this is a higher level
+# of abstraction than this XPCOM specific glue code.
 #
 VBoxXPCOMGlue_COMMON_SOURCES = \
@@ -917 +919 @@
 VBoxXPCOMGlue_s_SOURCES  = $(VBoxXPCOMGlue_COMMON_SOURCES)
 
-# standalone glue library which all third-party client apps (if any) will link with
-# (currently not used anywhere (see above) but still built to make sure
-# the code inside #ifdef XPCOM_GLUE compiles)
+# standalone glue library which all third-party client apps (if any) will
+# link with (currently completely unused and nit built, to be part of the SDK)
 VBoxXPCOMGlue_TEMPLATE = XPCOM
-VBoxXPCOMGlue_DEFS     = XPCOM_GLUE
-if defined(VBOX_WITH_HARDENING) && defined(VBOX_PATH_APP_PRIVATE_ARCH)
- VBoxXPCOMGlue_DEFS    += MOZ_DEFAULT_VBOX_XPCOM_HOME=\"$(VBOX_PATH_APP_PRIVATE_ARCH)\"
-endif
-VBoxXPCOMGlue_SOURCES  = $(VBoxXPCOMGlue_COMMON_SOURCES) \
-                         xpcom/glue/standalone/nsXPCOMGlue.cpp \
-                         xpcom/glue/standalone/nsGREDirServiceProvider.cpp
-VBoxXPCOMGlue_SOURCES += \
-        $(VBox-xpcom-string_1_TARGET)
+VBoxXPCOMGlue_SOURCES  = $(VBoxXPCOMGlue_COMMON_SOURCES)
 #VBoxXPCOMGlue_INST     = lib/ $(INST_SDK)lib/