Changeset 29023 in vbox for trunk/src/VBox

Timestamp:

May 4, 2010 2:05:50 PM (15 years ago)

Author:

vboxsync

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

61063

Message:

java bridge: simplified init, Makefile bugs, installer draft

Location:

trunk/src/VBox/Installer

Files:

• linux/Makefile.kmk (modified) (3 diffs)
• solaris/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -123 +123 @@
                 VBoxSharedCrOpenGL.so,) \
         $(if $(VBOX_WITH_PYTHON),$(notdir $(wildcard $(PATH_BIN)/VBoxPython*.so)),) \
+        $(if $(VBOX_WITH_JXPCOM),libvboxjxpcom.so,) \
         VBoxTunctl
 
@@ -211 +212 @@
         sdk/installer/vboxapi/__init__.py \
         sdk/installer/vboxapi/VirtualBox_constants.py
+endif
+
+# Java XPCOM bridge
+ifdef VBOX_WITH_JXPCOM
+  VBOX_LNX_NO_STRIP += \
+        sdk/bindings/xpcom/java/vboxjxpcom.jar
 endif
 
@@ -381 +388 @@
           archive/sdk/bindings/xpcom/python/xpcom/client \
           archive/sdk/bindings/xpcom/python/xpcom/server,) \
+        $(if $(VBOX_WITH_JXPCOM),\
+          archive/sdk/bindings/xpcom/java,) \
         archive/additions \
         install\

trunk/src/VBox/Installer/solaris/Makefile.kmk

@@ -334 +334 @@
 endif
 
+ifdef VBOX_WITH_JXPCOM
+   SOLARIS_COMMON += \
+         sdk/bindings/xpcom/java/vboxjxpcom.jar
+endif
+
 # VRDP
 ifdef VBOX_WITH_VRDP
@@ -453 +458 @@
          sdk/bindings/xpcom/python/xpcom/server \
          sdk/bindings/xpcom/python/xpcom/client,) \
+        $(if $(VBOX_WITH_JXPCOM), \
+         sdk/bindings/xpcom/java,) \
 ,$(SOLARIS_VBOXINST_DIR)/$(d)/)