Changeset 29771 in vbox

Timestamp:

May 25, 2010 8:44:41 AM (15 years ago)

Author:

vboxsync

Message:

bits

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Main/Makefile.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -462 +462 @@
 VBOX_WITH_PYTHON ?= 1
 if1of ($(KBUILD_TARGET), )
- # Enable Java<->XPCOM bridge
+ # Enable Java<->XPCOM bridge + glue code
  VBOX_WITH_JXPCOM ?= 1
+endif
+if1of ($(KBUILD_TARGET), )
+ # Enable Java<->MSCOM glue, bridge is provided by an external lib (Jacob)
+ VBOX_WITH_JMSCOM ?= 1
 endif
 # Use XPIDL instead of genjifaces.
@@ -4305 +4309 @@
                 $(VBOX_JAVA_HOME)/include/$(VBOX_MD_OS)
 endif
+
+ifeq ($(KBUILD_TARGET), win)
+  VBOX_SEP=\;
+else
+  VBOX_SEP=:
+endif
 VBOX_JAVAC_OPTS = -source 1.5 -target 1.5
 

trunk/src/VBox/Main/Makefile.kmk

@@ -831 +831 @@
 
 ifdef VBOX_WITH_JMSCOM
- INSTALLS += VBoxJMscom-inst-jar
-endif
+INSTALLS += VBoxJMscom-inst-jar
 
 #
@@ -873 +872 @@
         $(QUIET)echo $(VBOX_JMSCOM_GEN)/java/*.java > $@
 
-CP_SEP=:
 $$(VBOX_JMSCOM_JAR): $(VBOX_JMSCOM_GEN)/jmscomglue.list | $$(dir $$@)
         $(call MSG_TOOL,javac,$(notdir $@),jmscomgen.list,)
@@ -881 +879 @@
         $(VBOX_JAVAC) $(VBOX_JAVAC_OPTS) \
                 @$(VBOX_JMSCOM_GEN)/jmscomglue.list \
-                -d $(VBOX_JMSCOM_JDEST) -classpath $(VBOX_JMSCOM_JDEST)$(CP_SEP)$(VBOX_JACOB_DIR)/jacob.jar
+                -d $(VBOX_JMSCOM_JDEST) -classpath $(VBOX_JMSCOM_JDEST)$(VBOX_SEP)$(VBOX_JACOB_DIR)/jacob.jar
         $(call MSG_LINK,$(notdir $@),$@)
         $(VBOX_JAR) cf $@ -C $(VBOX_JMSCOM_JDEST) .
+
+endif # VBOX_WITH_JMSCOM
 
 updatenls::