Changeset 89791 in vbox

Timestamp:

Jun 19, 2021 2:45:06 PM (3 years ago)

Author:

vboxsync

Message:

/Config.kmk,Makefile.kmk: Define VBOX_JAVA_BIN_PATH so we can more easily add the directory with 'java' to the path for doxygen/plantuml.jar. bugref:9890

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• Makefile.kmk (modified) (1 diff)
• include/VBox/vmm/pdmaudioifs.h (modified) (1 diff)

trunk/Config.kmk

@@ -2891 +2891 @@
 # Java stuff.
 ifeq ($(KBUILD_TARGET), darwin)
- VBOX_JAVA_COMMANDS = $(firstword $(wildcard \
+ VBOX_JAVA_BIN_PATH = $(firstword $(wildcard \
         /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Commands \
         /System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Commands \
@@ -2897 +2897 @@
         $(if-expr $(VBOX_XCODE_VERSION_MAJOR) >= 10,/Library/Java/JavaVirtualMachines/jdk1.8.*.jdk/Contents/Home/bin,) \
         ) /usr/bin)
- VBOX_JAVA      = $(VBOX_JAVA_COMMANDS)/java
- VBOX_JAVAC     = $(VBOX_JAVA_COMMANDS)/javac
- VBOX_JAVAH     = $(VBOX_JAVA_COMMANDS)/javah
- VBOX_JAR       = $(VBOX_JAVA_COMMANDS)/jar
- VBOX_JAVADOC   = $(VBOX_JAVA_COMMANDS)/javadoc
- VBOX_WSIMPORT  = $(VBOX_JAVA_COMMANDS)/wsimport
+ VBOX_JAVA      = $(VBOX_JAVA_BIN_PATH)/java
+ VBOX_JAVAC     = $(VBOX_JAVA_BIN_PATH)/javac
+ VBOX_JAVAH     = $(VBOX_JAVA_BIN_PATH)/javah
+ VBOX_JAR       = $(VBOX_JAVA_BIN_PATH)/jar
+ VBOX_JAVADOC   = $(VBOX_JAVA_BIN_PATH)/javadoc
+ VBOX_WSIMPORT  = $(VBOX_JAVA_BIN_PATH)/wsimport
  if $(VBOX_XCODE_VERSION_MAJOR) >= 4 # Lion (4.1-preview 5) has a broken CurrentJDK link.  Blindly applying it to 4.0.
   VBOX_JAVA_INC = $(firstword $(wildcard \
@@ -2947 +2947 @@
  endif
 
- VBOX_JAVA     ?= "$(VBOX_JAVA_HOME)/bin/java$(HOSTSUFF_EXE)"
- VBOX_JAVAC     = "$(VBOX_JAVA_HOME)/bin/javac$(HOSTSUFF_EXE)"
- VBOX_JAVAH     = "$(VBOX_JAVA_HOME)/bin/javah$(HOSTSUFF_EXE)"
- VBOX_JAR       = "$(VBOX_JAVA_HOME)/bin/jar$(HOSTSUFF_EXE)"
- VBOX_JAVADOC   = "$(VBOX_JAVA_HOME)/bin/javadoc$(HOSTSUFF_EXE)"
+ VBOX_JAVA_BIN_PATH ?= $(VBOX_JAVA_HOME)/bin
+ VBOX_JAVA          ?= "$(VBOX_JAVA_BIN_PATH)/java$(HOSTSUFF_EXE)"
+ VBOX_JAVAC          = "$(VBOX_JAVA_BIN_PATH)/javac$(HOSTSUFF_EXE)"
+ VBOX_JAVAH          = "$(VBOX_JAVA_BIN_PATH)/javah$(HOSTSUFF_EXE)"
+ VBOX_JAR            = "$(VBOX_JAVA_BIN_PATH)/jar$(HOSTSUFF_EXE)"
+ VBOX_JAVADOC        = "$(VBOX_JAVA_BIN_PATH)/javadoc$(HOSTSUFF_EXE)"
  # With Java 11 wsimport was removed, usually part of a separate install now.
- VBOX_WSIMPORT  = $(firstword $(wildcard $(VBOX_JAVA_HOME)/bin/wsimport$(HOSTSUFF_EXE)) wsimport$(HOSTSUFF_EXE))
+ VBOX_WSIMPORT       = $(firstword $(wildcard $(VBOX_JAVA_BIN_PATH)/wsimport$(HOSTSUFF_EXE)) wsimport$(HOSTSUFF_EXE))
  # correct for targets we care about
- VBOX_MD_OS     = $(KBUILD_TARGET)
- VBOX_JAVA_INC  = \
+ VBOX_MD_OS          = $(KBUILD_TARGET)
+ VBOX_JAVA_INC       = \
         $(VBOX_JAVA_HOME)/include \
         $(VBOX_JAVA_HOME)/include/$(VBOX_MD_OS)

trunk/Makefile.kmk

@@ -941 +941 @@
 
 # Do the actual job.
+# Note! We must add the VBOX_JAVA dir to the path so doxygen can run plantuml.jar.
 $(VBOX_CORE_DOXYFILE_OUTPUT)/docs.Core: $(VBOX_CORE_DOXYFILE_OUTPUT)/Doxyfile.Core $$(VBOX_CORE_DOXYFILE_INPUT) \
                 | $(VBOX_CORE_DOXYFILE_OUTPUT)/
         $(QUIET)$(RM) -f $@
         $(QUIET)$(RM) -Rf $(VBOX_CORE_DOXYFILE_OUTPUT)/html/
-        doxygen $(VBOX_CORE_DOXYFILE_OUTPUT)/Doxyfile.Core
+       $(REDIRECT) -E "PATH=$(VBOX_JAVA_BIN_PATH)$(HOST_PATH_SEP)$(PATH)" -- doxygen $(VBOX_CORE_DOXYFILE_OUTPUT)/Doxyfile.Core
         $(SED) -n \
                -e ':nextwarning' \

trunk/include/VBox/vmm/pdmaudioifs.h

@@ -25 +25 @@
 
 /** @page pg_pdm_audio  PDM Audio
+ *
+ * PDM provides audio device emulations and their driver chains with the
+ * interfaces they need to communicate with each other.
+ *
  *
  * @section sec_pdm_audio_overview  Overview