Changeset 8768 in vbox for trunk/src

Timestamp:

May 12, 2008 1:12:42 AM (17 years ago)

Author:

vboxsync

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

30753

Message:

while I'm at it - moving the non-linux stuff to xpcom.

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (5 diffs)
• xpcom/Makefile.kup (copied) (copied from trunk/src/VBox/Main/linux/Makefile.kup )
• xpcom/helpers.cpp (moved) (moved from trunk/src/VBox/Main/linux/helpers.cpp )
• xpcom/module.cpp (moved) (moved from trunk/src/VBox/Main/linux/module.cpp )
• xpcom/server.cpp (moved) (moved from trunk/src/VBox/Main/linux/server.cpp ) (1 diff)
• xpcom/server.h (moved) (moved from trunk/src/VBox/Main/linux/server.h )
• xpcom/server_module.cpp (moved) (moved from trunk/src/VBox/Main/linux/server_module.cpp ) (1 diff)

trunk/src/VBox/Main/Makefile.kmk

@@ -233 +233 @@
 ifdef VBOX_WITH_XPCOM
 VBoxSVC_SOURCES += \
-        linux/server.cpp
+        xpcom/server.cpp
 endif
 
@@ -277 +277 @@
         $(PATH_CURRENT)
 VBoxSVCM_SOURCES        = \
-        linux/server_module.cpp
+        xpcom/server_module.cpp
 ifdef VBOX_WITH_ORIGIN
 VBoxSVCM_LDFLAGS        = '$(VBOX_GCC_RPATH_OPT)$$(VBOX_ORIGIN)/..'
@@ -391 +391 @@
 ifdef VBOX_WITH_XPCOM
 VBoxC_SOURCES += \
-        linux/module.cpp
+        xpcom/module.cpp
 endif
 
@@ -458 +458 @@
         include
  VBoxCOM_SOURCES       += \
-        linux/helpers.cpp
+        xpcom/helpers.cpp
 endif
 
@@ -588 +588 @@
 ifneq ($(KBUILD_TARGET),win)
 
-linux/helpers.cpp: $(IDLTYPELIB)
+xpcom/helpers.cpp: $(IDLTYPELIB)
 
 $(IDLFILE): idl/xpidl.xsl $(XIDLFILE) | $(call DIRDEP,$(dir $(IDLFILE)))

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

@@ -32 +32 @@
 #include <nsGenericFactory.h>
 
-#include "linux/server.h"
+#include "xpcom/server.h"
 
 #include "Logging.h"

trunk/src/VBox/Main/xpcom/server_module.cpp

@@ -45 +45 @@
 #include <VirtualBox_XPCOM.h>
 
-#include "linux/server.h"
+#include "xpcom/server.h"
 #include "Logging.h"