Changeset 17725 in vbox

Timestamp:

Mar 12, 2009 10:05:15 AM (16 years ago)

Author:

vboxsync

Message:

Cbinding: Updated the sample program and placed
it in appropriate sample directory. Placed the
glue code in bin/sdk/bindings/xpcom/cbinding/
directory. Updated the sample make file to handle
tstXPCOMCGlue.c program.

Location:

trunk/src/VBox/Main/cbinding

Files:

• Makefile.kmk (modified) (3 diffs)
• makefile.tstLinuxC (modified) (3 diffs)
• tstXPCOMCGlue.c (modified) (2 diffs)

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

@@ -34 +34 @@
 XpComCSamples_SOURCES = \
         tstLinuxC.c \
+        tstXPCOMCGlue.c \
         makefile.tstLinuxC=>Makefile
+
+INSTALLS += XpComCGlue
+XpComCGlue_MODE = a+r,u+rw
+XpComCGlue_INST = \
+        $(INST_SDK)bindings/xpcom/cbinding/
+XpComCGlue_SOURCES = \
+        VBoxXPCOMCGlue.c \
+        VBoxXPCOMCGlue.h
 
 INSTALLS += XpComCHeaders
@@ -82 +91 @@
   tstXPCOMC_TEMPLATE = VBOXR3EXE
   tstXPCOMC_INCS = \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub
+        $(VBOX_PATH_SDK)/bindings/xpcom/include
   tstXPCOMC_INTERMEDIATES = \
         $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_CXPCOM.h
@@ -97 +105 @@
   tstXPCOMCGlue_TEMPLATE = VBOXR3EXE
   tstXPCOMCGlue_INCS = \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include \
-        $(VBOX_PATH_SDK)/bindings/xpcom/include/nsprpub
+        $(VBOX_PATH_SDK)/bindings/xpcom/include
   tstXPCOMCGlue_INTERMEDIATES = \
         $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_CXPCOM.h

trunk/src/VBox/Main/cbinding/makefile.tstLinuxC

@@ -21 +21 @@
 
 PATH_BIN      = /opt/VirtualBox
-INCS_XPCOM = -I../../include
+INCS_XPCOM    = -I../../include
+GLUE_DIR      = ..
+GLUE_INC      = -I..
 
 CC            = gcc
@@ -27 +29 @@
 
 .PHONY: all
-all: tstLinuxC
+all: tstLinuxC tstXPCOMCGlue
 
 .PHONY: clean
 clean:
-        rm -f tstLinuxC.o tstLinuxC
+        rm -f tstLinuxC.o tstLinuxC tstXPCOMCGlue.o tstXPCOMCGlue VBoxXPCOMCGlue.o
 
 tstLinuxC: tstLinuxC.o
@@ -38 +40 @@
 tstLinuxC.o: tstLinuxC.c
         $(CC) $(CFLAGS) $(INCS_XPCOM) -o $@ -c $<
+
+tstXPCOMCGlue: tstXPCOMCGlue.o VBoxXPCOMCGlue.o
+        $(CC) -o $@ $^ -ldl
+
+tstXPCOMCGlue.o: tstXPCOMCGlue.c
+        $(CC) $(CFLAGS) $(INCS_XPCOM) $(GLUE_INC) -o $@ -c $<
+
+VBoxXPCOMCGlue.o: $(GLUE_DIR)/VBoxXPCOMCGlue.c
+        $(CC) $(CFLAGS) $(INCS_XPCOM) $(GLUE_INC) -o $@ -c $<

trunk/src/VBox/Main/cbinding/tstXPCOMCGlue.c

@@ -29 +29 @@
 #include <string.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 
 static char *nsIDToString(nsID *guid);
@@ -309 +308 @@
     PRUnichar  *versionUtf16     = NULL;
     PRUnichar  *homefolderUtf16  = NULL;
-    struct stat stIgnored;
     nsresult    rc;     /* Result code of various function (method) calls. */