Changeset 960 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Feb 17, 2007 9:12:10 AM (18 years ago)

Author:

vboxsync

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

18727

Message:

Darwin hacking.

Location:

trunk/src/libs/xpcom18a4

Files:

• Makefile.kmk (modified) (9 diffs)
• xpcom/glue/standalone/nsXPCOMGlue.cpp (modified) (5 diffs)

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -77 +77 @@
                                      ipc/ipcd/extensions/dconnect/src \
                                      ipc/ipcd/extensions/transmngr/common \
-                                     $(PATH_BIN)/sdk/include \
-                                     $(PATH_BIN)/sdk/include/xpcom \
-                                     $(PATH_BIN)/sdk/include/xpcom/nsprpub \
-                                     $(PATH_BIN)/sdk/include/xpcom/string \
-                                     $(PATH_BIN)/sdk/include/xpcom/xpcom \
-                                     $(PATH_BIN)/sdk/include/xpcom/ipcd
+                                     $(VBOX_PATH_SDK)/include \
+                                     $(VBOX_PATH_SDK)/include/xpcom \
+                                     $(VBOX_PATH_SDK)/include/xpcom/nsprpub \
+                                     $(VBOX_PATH_SDK)/include/xpcom/string \
+                                     $(VBOX_PATH_SDK)/include/xpcom/xpcom \
+                                     $(VBOX_PATH_SDK)/include/xpcom/ipcd
 TEMPLATE_XPCOM_INCS.darwin         = /Developer/SDKs/MacOSX10.4u.sdk/Developer/Headers/FlatCarbon
 TEMPLATE_XPCOM_INCS.l4             = $(L4_INCDIR) $(VBOX_L4_GCC3_INCS)
@@ -99 +99 @@
 TEMPLATE_XPCOMEXE_EXTENDS          = XPCOM
 ## @todo undo -fPIC.
-TEMPLATE_XPCOMEXE_INCS             = $(PATH_TARGET) ipc/ipcd/shared/src \
-                                     $(PATH_BIN)/sdk/include \
-                                     $(PATH_BIN)/sdk/include/xpcom \
-                                     $(PATH_BIN)/sdk/include/xpcom/nsprpub \
-                                     $(PATH_BIN)/sdk/include/xpcom/string \
-                                     $(PATH_BIN)/sdk/include/xpcom/xpcom \
-                                     $(PATH_BIN)/sdk/include/xpcom/ipcd
+TEMPLATE_XPCOMEXE_INCS             = $(PATH_TARGET) \
+                                     ipc/ipcd/shared/src \
+                                     $(VBOX_PATH_SDK)/include \
+                                     $(VBOX_PATH_SDK)/include/xpcom \
+                                     $(VBOX_PATH_SDK)/include/xpcom/nsprpub \
+                                     $(VBOX_PATH_SDK)/include/xpcom/string \
+                                     $(VBOX_PATH_SDK)/include/xpcom/xpcom \
+                                     $(VBOX_PATH_SDK)/include/xpcom/ipcd
 TEMPLATE_XPCOMEXE_LIBS             = \
         $(TARGET_VBox-xpcom-ipcshared) \
@@ -138 +139 @@
 TEMPLATE_XPCOMBLDPROG_CFLAGS.release    = -O
 TEMPLATE_XPCOMBLDPROG_CFLAGS.profile    = -O
-TEMPLATE_XPCOMBLDPROG_INCS              = $(PATH_BIN)/sdk/include \
-                                          $(PATH_BIN)/sdk/include/xpcom \
-                                          $(PATH_BIN)/sdk/include/xpcom/nsprpub \
-                                          $(PATH_BIN)/sdk/include/xpcom/string \
-                                          $(PATH_BIN)/sdk/include/xpcom/xpcom \
-                                          $(PATH_BIN)/sdk/include/xpcom/ipcd
+TEMPLATE_XPCOMBLDPROG_INCS              = $(VBOX_PATH_SDK)/include \
+                                          $(VBOX_PATH_SDK)/include/xpcom \
+                                          $(VBOX_PATH_SDK)/include/xpcom/nsprpub \
+                                          $(VBOX_PATH_SDK)/include/xpcom/string \
+                                          $(VBOX_PATH_SDK)/include/xpcom/xpcom \
+                                          $(VBOX_PATH_SDK)/include/xpcom/ipcd
 TEMPLATE_XPCOMBLDPROG_ORDERDEPS         = $(foreach hdrinst, $(filter %-HEADERS, $(INSTALLS)), $(TARGET_$(hdrinst)))
 
@@ -507 +508 @@
 xpidl_DEFS = EXPORT_XPT_API
 ## @todo This assumes HOST == TARGET.
-xpidl_INST = bin/ $(INST_SDK)/bin/
+xpidl_INST = $(INST_SDK)/bin/
 xpidl_SOURCES = \
         xpcom/typelib/xpidl/xpidl.c \
@@ -953 +954 @@
 #VBoxXPCOM_LIBS += $(LIB_RUNTIME_EF)
 #VBoxXPCOM_LDFLAGS = -Wl,--whole-archive $(VBoxXPCOM_LIBS) -Wl,--no-whole-archive $(LIB_RUNTIME)
+VBoxXPCOM_LDFLAGS.darwin = -install_name @executable_path/VBoxXPCOM.dylib
 
 ifdef VBOX_IPC_RELEASE_LOG
@@ -1021 +1023 @@
         ipc/ipcd/client/src/ipcConnectionUnix.cpp \
         ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp
+VBoxXPCOMIPCC_LDFLAGS.darwin = -install_name @executable_path/VBoxXPCOMIPCC.dylib
 VBoxXPCOMIPCC_LIBS = \
         $(TARGET_VBox-xpcom-ipcutils) \
@@ -1195 +1198 @@
 OTHER_CLEAN += \
         $(PATH_VBox-xpcom-string)/idl_ts \
-        $(addprefix $(PATH_BIN)/sdk/include/,$(notdir $(subst .idl,.h,$(IDLFILES)))) \
-        $(addprefix $(PATH_BIN)/sdk/include/,$(notdir $(subst .idl,.xpt,$(IDLFILES)))) \
-        $(addprefix $(PATH_BIN)/sdk/idl/,$(notdir $(IDLFILES)))
+        $(addprefix $(VBOX_PATH_SDK)/include/,$(notdir $(subst .idl,.h,$(IDLFILES)))) \
+        $(addprefix $(VBOX_PATH_SDK)/include/,$(notdir $(subst .idl,.xpt,$(IDLFILES)))) \
+        $(addprefix $(VBOX_PATH_SDK)/idl/,$(notdir $(IDLFILES)))
 
 
@@ -1313 +1316 @@
 XPIDL_INCS = -I xpcom/base/ -I xpcom/ds/ -I xpcom/components/ -I xpcom/io/ -I xpcom/threads/ -I xpcom/reflect/xptinfo/public/
 define def_IDL
-$(addprefix $(PATH_BIN)/sdk/include/,$(notdir $(subst .idl,.h,$(idl)))) \
+$(addprefix $(VBOX_PATH_SDK)/include/,$(notdir $(subst .idl,.h,$(idl)))) \
             $(PATH_TARGET)/$(notdir $(subst .idl,.xpt,$(idl))): $(idl) | $(TARGET_xpidl)
         $$(call MSG_L1,xpidl $$<)
-        $$(QUIET)$(MKDIR) -p $(PATH_BIN)/sdk/include $(PATH_BIN)/sdk/idl
+        $$(QUIET)$(MKDIR) -p $(VBOX_PATH_SDK)/include $(VBOX_PATH_SDK)/idl
         $$(QUIET)$$(TARGET_xpidl) -m header $(XPIDL_INCS) -e $$@ $$<
         $$(QUIET)$$(TARGET_xpidl) -m typelib $(XPIDL_INCS) -e $(addprefix $(PATH_TARGET)/,$(notdir $(subst .idl,.xpt,$(idl)))) $$<
-        $$(QUIET)$(CP) $$< $$(PATH_BIN)/sdk/idl
+        $$(QUIET)$(CP) $$< $$(VBOX_PATH_SDK)/idl
 endef
 
@@ -1325 +1328 @@
 
 # dummy target.
-$(PATH_VBox-xpcom-string)/idl_ts: $(addprefix $(PATH_BIN)/sdk/include/,$(notdir $(subst .idl,.h,$(IDLFILES))))
+$(PATH_VBox-xpcom-string)/idl_ts: $(addprefix $(VBOX_PATH_SDK)/include/,$(notdir $(subst .idl,.h,$(IDLFILES))))
         $(call MSG_L1,IDL processing completed.)
         $(QUIET)$(MKDIR) -p $(dir $@)

trunk/src/libs/xpcom18a4/xpcom/glue/standalone/nsXPCOMGlue.cpp

@@ -111 +111 @@
 
         xpcomLib = PR_LoadLibraryWithFlags(libSpec, PR_LD_LAZY|PR_LD_GLOBAL);
+#ifdef __DARWIN__
+        /* works around bundle problem. */
+        if (!xpcomLib) {
+            const char *home = PR_GetEnv("VBOX_XPCOM_HOME");
+            if (home) {
+                char path[PATH_MAX];
+                snprintf(path, sizeof(path), "%s/%s", home, libSpec.value.pathname);
+                libSpec.value.pathname = path;
+                xpcomLib = PR_LoadLibraryWithFlags(libSpec, PR_LD_LAZY|PR_LD_GLOBAL);
+            }
+        }
+#endif
         if (!xpcomLib)
             return NS_ERROR_FAILURE;
@@ -162 +174 @@
         xpcomLib = nsnull;
     }
-    
+
     memset(&xpcomFunctions, 0, sizeof(xpcomFunctions));
     return NS_OK;
@@ -170 +182 @@
 #ifndef XPCOM_GLUE_NO_DYNAMIC_LOADING
 extern "C" NS_COM nsresult
-NS_InitXPCOM2(nsIServiceManager* *result, 
+NS_InitXPCOM2(nsIServiceManager* *result,
               nsIFile* binDirectory,
               nsIDirectoryServiceProvider* appFileLocationProvider)
@@ -442 +454 @@
       }
   }
-                 
+
 #if XP_WIN32
-  // On windows, the current directory is searched before the 
-  // PATH environment variable.  This is a very bad thing 
+  // On windows, the current directory is searched before the
+  // PATH environment variable.  This is a very bad thing
   // since libraries in the cwd will be picked up before
   // any that are in either the application or GRE directory.
@@ -465 +477 @@
     // Startup the XPCOM Glue that links us up with XPCOM.
     nsresult rv = XPCOMGlueStartup(xpcomLocation);
-    
+
     if (NS_FAILED(rv)) {
         NS_WARNING("gre: XPCOMGlueStartup failed");