Changeset 99613 in vbox for trunk/doc/manual

Timestamp:

May 5, 2023 1:10:34 AM (21 months ago)

Author:

vboxsync

Message:

manual: Use the regular java found by /Config.kmk if it's new enough. bugref:10425

File:

• trunk/doc/manual/Makefile.kmk (modified) (1 diff)

trunk/doc/manual/Makefile.kmk

@@ -151 +151 @@
   VBOX_DITA_USING_LATEST  := 1
   ifeq ($(VBOX_JAVA17PLUS_HOME),)
-   VBOX_JAVA17PLUS_HOME   := $(firstfile \
-                $(rversortfiles $(qwildcard ,    $(KBUILD_DEVTOOLS_HST)/jdk/v1[789].*     $(KBUILD_DEVTOOLS_HST)/jdk/v[2-9][0-9].* )) \
-                $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST_ALT)/jdk/v1[789].* $(KBUILD_DEVTOOLS_HST_ALT)/jdk/v[2-9][0-9].* )) \
-                )
-   if "$(KBUILD_HOST)" == "darwin" && "$(VBOX_JAVA17PLUS_HOME)" != ""
-    VBOX_JAVA17PLUS_HOME := $(VBOX_JAVA17PLUS_HOME)/Contents/Home
+   if defined(VBOX_JAVA_VERSION) && $(VBOX_JAVA_VERSION) >= 170000 && "$(VBOX_JAVA_BIN_PATH)" != ""
+    VBOX_JAVA17PLUS_HOME   := $(qabspath ,$(VBOX_JAVA_BIN_PATH)/..)
+   else
+    VBOX_JAVA17PLUS_HOME   := $(firstfile \
+                $(rversortfiles $(qwildcard ,    $(KBUILD_DEVTOOLS_HST)/jdk/v1[789].*     $(KBUILD_DEVTOOLS_HST)/jdk/v[2-9][0-9].* )) \
+                $(rversortfiles $(qwildcard ,$(KBUILD_DEVTOOLS_HST_ALT)/jdk/v1[789].* $(KBUILD_DEVTOOLS_HST_ALT)/jdk/v[2-9][0-9].* )) \
+                )
+    if "$(KBUILD_HOST)" == "darwin" && "$(VBOX_JAVA17PLUS_HOME)" != ""
+     VBOX_JAVA17PLUS_HOME := $(VBOX_JAVA17PLUS_HOME)/Contents/Home
+    endif
    endif
   endif