Changeset 30971 in vbox

Timestamp:

Jul 21, 2010 3:57:34 PM (14 years ago)

Author:

vboxsync

Message:

Java glue: use XSLT to generate interfaces

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/libs/xpcom18a4/java/Makefile.kmk (modified) (2 diffs)
• src/libs/xpcom18a4/java/tools/genjifaces.xsl (added)

trunk/Config.kmk

@@ -467 +467 @@
  VBOX_WITH_JMSCOM ?= 1
 endif
-# Use XPIDL instead of genjifaces.
-VBOX_WITH_JAVA_SUPPORT_IN_XPIDL ?= 1
+# Use XPIDL instead of XSLT stylesheet
+VBOX_WITH_JAVA_SUPPORT_IN_XPIDL ?= 
 # Build against multiple Python versions present in the system
 VBOX_WITH_MULTIVERSION_PYTHON ?= 1

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

@@ -158 +158 @@
                 $(VBOX_JXPCOM_JDEST)/*/*/*/*/*/*.class \
         )
-VBoxJXpcom-inst-jar_BLDDIRS += $(VBOX_JXPCOM_GEN)/java $(VBOX_JXPCOM_GEN)/java/glue
+VBoxJXpcom-inst-jar_BLDDIRS += $(VBOX_JXPCOM_GEN)/java $(VBOX_JXPCOM_GEN)/java/glue $(VBOX_JXPCOM_GEN)/java/interfaces
 
 #
@@ -180 +180 @@
 ifndef VBOX_WITH_JAVA_SUPPORT_IN_XPIDL
 #
-# Generate .java interface files from XPCOM's typelib.
-#
-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/
+# Generate .java interface files from .xidl
+#
+
+$(VBOX_JXPCOM_GEN)/jxpcomgen.list: $(VBOX_XIDL_FILE) $(VBOX_JXPCOM_SRC)/tools/genjifaces.xsl | $(VBOX_JXPCOM_GEN)/java/interfaces/
         $(QUIET)echo Generating Java interface files
-        $(call preprocess_exebld,$(GENJIFACES_BIN))
-        $(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) > $@
+        $(QUIET)$(RM) -f $(wildcard $(VBOX_JXPCOM_GEN)/java/interfaces/*.java)
+        $(QUIET)$(VBOX_XSLTPROC)   \
+              -o $(VBOX_JXPCOM_GEN)/java/interfaces/merged.file $(VBOX_JXPCOM_SRC)/tools/genjifaces.xsl $<
+        $(QUIET)$(VBOX_FILESPLIT) $(VBOX_JXPCOM_GEN)/java/interfaces/merged.file $(VBOX_JXPCOM_GEN)/java/interfaces
+        $(QUIET)echo $(VBOX_JXPCOM_GEN)/java/interfaces/*.java > $@
 
 else  # VBOX_WITH_JAVA_SUPPORT_IN_XPIDL