Changeset 29136 in vbox for trunk/src/libs/xpcom18a4/java

Timestamp:

May 6, 2010 11:36:00 AM (15 years ago)

Author:

vboxsync

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

61203

Message:

java bridge: linux, sdk

Location:

trunk/src/libs/xpcom18a4/java

Files:

• Makefile.kmk (modified) (6 diffs)
• src/nsJavaInterfaces.cpp (modified) (1 diff)

trunk/src/libs/xpcom18a4/java/Makefile.kmk

@@ -20 +20 @@
 
 VBOX_JXPCOM_SRC    := $(PATH_SUB_CURRENT)
+
+ifndef VBOX_ONLY_SDK
 
 ifeq ($(KBUILD_TARGET), darwin)
@@ -103 +105 @@
  TEMPLATE_XPCOMEXEBLD_DEFS              = VBOX_WITH_XPCOM
  TEMPLATE_XPCOMEXEBLD_LIBS              = $(VBoxXPCOM_LIBS) $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB)
+ # This is OK on Linux even with hardening
+ TEMPLATE_XPCOMEXEBLD_LIBS.linux        = $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
  TEMPLATE_XPCOMEXEBLD_INCS.darwin       = $(TEMPLATE_XPCOM_INCS.darwin)
- TEMPLATE_XPCOMEXEBLD_LDFLAGS.darwin    =   \
-                 -framework CoreServices   \
-                 -framework CoreFoundation \
-                 -framework Foundation     \
-                 -framework AppKit         \
-                  -framework Carbon
+ TEMPLATE_XPCOMEXEBLD_LDFLAGS.darwin    =  \
+                 -framework CoreServices   \
+                 -framework CoreFoundation \
+                 -framework Foundation     \
+                 -framework AppKit         \
+                 -framework Carbon
 
  ifeq ($(KBUILD_TARGET),darwin)
@@ -124 +128 @@
          src
  genjifaces_DEFS     =    \
-        EXPORT_XPTI_API  \
+         EXPORT_XPTI_API  \
          EXPORT_XPT_API
 
  genjifaces_SOURCES  =    \
-        ../xpcom/build/nsStringAPI.cpp \
+        ../xpcom/build/nsStringAPI.cpp  \
          ../xpcom/build/nsXPComInit.cpp \
          tools/genifaces/GenerateJavaInterfaces.cpp \
@@ -248 +252 @@
 
 ifndef VBOX_WITH_JAVA_SUPPORT_IN_XPIDL
+VBOX_TEMP_HOME=$(shell echo /tmp/vboxhome$$$$)
 $(VBOX_JXPCOM_GEN)/jxpcomgen.list: $(GENJIFACES_BIN) $(PATH_TARGET)/VBox-xpcom-xpt-files/VBoxXPCOMBase.xpt | $(VBOX_JXPCOM_GEN)/java
         $(QUIET)echo Generating Java interface files
         $(call preprocess_exebld,$(GENJIFACES_BIN))
-        $(GENJIFACES_BIN) -d $(VBOX_JXPCOM_GEN)/java
+        $(QUIET) $(MKDIR) -p $(VBOX_TEMP_HOME)
+        VBOX_USER_HOME=$(VBOX_TEMP_HOME) $(GENJIFACES_BIN) -d $(VBOX_JXPCOM_GEN)/java
+        $(QUIET) rm -rf $(VBOX_TEMP_HOME)
         $(QUIET)echo $$(ls $(VBOX_JXPCOM_GEN)/java/*.java) > $@
 else  # VBOX_WITH_JAVA_SUPPORT_IN_XPIDL
@@ -277 +284 @@
         $(VBOX_JAR) cf $@ -C $(VBOX_JXPCOM_TARGET)/jdest .
 
-
-ifdef VBOX_ONLY_SDK
+else # VBOX_ONLY_SDK
  #
  # Install sample code.
@@ -288 +294 @@
         tests/TestVBox.java=>samples/TestVBox.java \
         tests/Makefile=>samples/Makefiles
-endif
+endif # VBOX_ONLY_SDK
 
 include $(KBUILD_PATH)/subfooter.kmk

trunk/src/libs/xpcom18a4/java/src/nsJavaInterfaces.cpp

@@ -410 +410 @@
 #ifdef VBOX
       rv = 0;
+      lock = 0;
 #else
       rv = XRE_LockProfileDirectory(profileDir, &lock);