Changeset 89793 in vbox

Timestamp:

Jun 19, 2021 8:03:51 PM (4 years ago)

Author:

vboxsync

Message:

/Config.kmk: Tweak the VBOX_JAVA_FIGURE_VERSION macro to try grok useless opensdk output. bugref:9890

File:

• trunk/Config.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -2961 +2961 @@
         $(VBOX_JAVA_HOME)/include/$(VBOX_MD_OS)
 endif # !darwin
+# The first transform the almost usless openjdk versions like "javac 9-Ubuntu" into something the 2nd expression groks.
 VBOX_JAVA_FIGURE_VERSION = $(shell $(1) -version 2>&1 \
-        | $(SED_EXT) -n -e 's|^[^ ]* *\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$(DOLLAR)|$$(expr \1 * 10000 + \2 * 100 + \3)|p' )
+        | $(SED_EXT) -n \
+        -e 's/ \([0-9][0-9]*\)\(-[[:alpha:]][[:alpha:]]\)$/ \1.0.0\2/' \
+        -e 's|^[^ ]* *\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$(DOLLAR)|$$(expr \1 * 10000 + \2 * 100 + \3)|p' )
 
 # Test C and C++ files.