Changeset 108257 in vbox

Timestamp:

Feb 17, 2025 12:57:55 PM (3 weeks ago)

Author:

vboxsync

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

167579

Message:

Config.kmk,xpcom18a4: Remove unused code, bugref:10321

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/libs/xpcom18a4/Makefile.kmk (modified) (2 diffs)
• src/libs/xpcom18a4/java/Makefile.kmk (modified) (2 diffs)
• src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl.c (modified) (1 diff)
• src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl.h (modified) (1 diff)
• src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl_doc.c (deleted)
• src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl_idl.c (modified) (1 diff)
• src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl_java.c (deleted)

trunk/Config.kmk

@@ -897 +897 @@
  VBOX_WITH_JWS ?= 1
 endif
-# Use XPIDL instead of XSLT stylesheet
-VBOX_WITH_JAVA_SUPPORT_IN_XPIDL ?=
 # Build against multiple Python versions present in the system (only up to 3.2,
 # unless VBOX_WITH_ONLY_PYTHON_LIMITED_API is overridden).

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -305 +305 @@
 ## @todo This assumes HOST == TARGET.
 xpidl_INST = $(INST_BIN)
-## Obsolete hack: MacPorts is 32-bit on 10.5 and 64-bit on 10.6. Set your KBUILD_HOST_ARCH env.vars. accordingly.
-#if "$(KBUILD_HOST).$(KBUILD_HOST_ARCH)" == "darwin.amd64" && defined(VBOX_MACOS_10_5_WORKAROUND)
-# xpidl_BLD_TRG_ARCH = x86
-# ## @todo kBuild ticket 84 workarounds:
-# xpidl_DEFS.x86     = $(TEMPLATE_XPComBldProg_DEFS.x86)
-# xpidl_CFLAGS.x86   = $(TEMPLATE_XPComBldProg_CFLAGS.x86)
-# xpidl_CXXFLAGS.x86 = $(TEMPLATE_XPComBldProg_CXXFLAGS.x86)
-# xpidl_LDFLAGS.x86  = $(TEMPLATE_XPComBldProg_LDFLAGS.x86)
-#endif
-ifdef VBOX_WITH_JAVA_SUPPORT_IN_XPIDL
- xpidl_DEFS += VBOX_XPIDL_EMULATE_GENJIFACES VBOX_XPIDL_EMULATE_GENJIFACES_DIFF
-endif
 xpidl_SOURCES = \
         xpcom/typelib/xpidl/xpidl.c \
@@ -323 +311 @@
         xpcom/typelib/xpidl/xpidl_header.c \
         xpcom/typelib/xpidl/xpidl_typelib.c \
-        xpcom/typelib/xpidl/xpidl_doc.c \
-        xpcom/typelib/xpidl/xpidl_java.c \
         xpcom/typelib/xpt/src/xpt_arena.c \
         xpcom/typelib/xpt/src/xpt_struct.c \

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

@@ -92 +92 @@
 VBOX_JXPCOM_JAR     = $(VBoxJXpcom-inst-jar_0_OUTDIR)/vboxjxpcom.jar
 VBOX_JXPCOM_NSERROR = $(VBOX_JXPCOM_GEN)/java/XPCOMError.java
-ifndef VBOX_WITH_JAVA_SUPPORT_IN_XPIDL
- VBOX_JXPCOM_GEN    = $(VBOX_JXPCOM_TARGET)/jxpcomgen
-else
- VBOX_JXPCOM_GEN    = $(VBOX_JXPCOM_TARGET)/jxpcomgen-idl
-endif
+VBOX_JXPCOM_GEN     = $(VBOX_JXPCOM_TARGET)/jxpcomgen
 
 VBoxJXpcom-inst-jar_INST = $(INST_SDK)bindings/xpcom/java/
@@ -139 +135 @@
         $(QUIET)perl $(VBOX_JXPCOM_SRC)/tools/gen-nsError.pl < $< > $@
 
-ifndef VBOX_WITH_JAVA_SUPPORT_IN_XPIDL
- #
- # Generate .java interface files from .xidl
- #
-
- $(VBOX_JXPCOM_GEN)/jxpcomgen.list: \
-                $(VBOX_XIDL_FILE) \
-                $(VBOX_FILESPLIT) \
-                $(VBOX_JXPCOM_SRC)/tools/genjifaces.xsl \
-                | $(VBOX_JXPCOM_GEN)/java/interfaces/
+#
+# Generate .java interface files from .xidl
+#
+$(VBOX_JXPCOM_GEN)/jxpcomgen.list: \
+                $(VBOX_XIDL_FILE) \
+                $(VBOX_FILESPLIT) \
+                $(VBOX_JXPCOM_SRC)/tools/genjifaces.xsl \
+                | $(VBOX_JXPCOM_GEN)/java/interfaces/
         $(call MSG_L1,Generating Java interface files)
         $(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 $<
+             -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
- #
- # Generate .java interface files from the XPCOM and VirtualBox IDL files.
- #
- # Note! There is not a 1:1 relationship between input and output files here, unfortunately.
- # Note! VBOX_JXPCOM_NSERROR shares the output directory with us.
- #
- $(VBOX_JXPCOM_GEN)/jxpcomgen.list: \
-                $(VBOX_PATH_SDK)/bindings/xpcom/idl/VirtualBox_XPCOM.idl \
-                $$(addprefix $(VBOX_PATH_XPCOM_SRC)/,$$(XPCOM_IDLFILES)) \
-                $(VBOX_XPIDL) \
-                | $(VBOX_JXPCOM_GEN)/java/
-        $(call MSG_L1,Generating XPCOM Java interface files from IDL)
-        $(QUIET)$(RM) -f $(filter-out %/XPCOMError.java, $(wildcard $(VBOX_JXPCOM_GEN)/java/*.java))
-        $(foreach idl, $(VBOX_PATH_SDK)/bindings/xpcom/idl/VirtualBox_XPCOM.idl $(addprefix $(VBOX_PATH_XPCOM_SRC)/,$(XPCOM_IDLFILES))\
-                , $(NLTAB)$(QUIET)$(VBOX_XPIDL) -m java $(XPIDL_INCS) -e $(VBOX_JXPCOM_GEN)/java/$(basename $(notdir $(idl))).java $(idl) )
-        $(QUIET)echo $(VBOX_JXPCOM_GEN)/java/*.java > $@
-endif # VBOX_WITH_JAVA_SUPPORT_IN_XPIDL
 
 $(VBOX_JXPCOM_GEN)/jxpcomglue.list: \

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl.c

@@ -46 +46 @@
     {"header",  "Generate C++ header",         "h",    xpidl_header_dispatch},
     {"typelib", "Generate XPConnect typelib",  "xpt",  xpidl_typelib_dispatch},
-    {"doc",     "Generate HTML documentation", "html", xpidl_doc_dispatch},
-    {"java",    "Generate Java interface",     "java", xpidl_java_dispatch},
     {0,         0,                             0,      0}
 };

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl.h

@@ -117 +117 @@
     nodeHandler      *dispatch;
     void             *priv;     /* mode-private data */
-#ifdef VBOX_XPIDL_EMULATE_GENJIFACES
-    char             *real_outname;
-#endif
-
 };
 

trunk/src/libs/xpcom18a4/xpcom/typelib/xpidl/xpidl_idl.c

@@ -703 +703 @@
     }
     state.tree = top;
-#ifdef VBOX_XPIDL_EMULATE_GENJIFACES
-    state.real_outname = real_outname;
-#endif
 
     if (emitter->emit_prolog)