updated location script to support gcc 15, clang 20, clang 21; updated show-tool-versions script to output JSON, fixed version detection of ltrace

Author: jakoch

.devcontainer/scripts/show-tool-locations.sh

@@ -29,10 +29,13 @@ show_tool_locations() {
   get_command_paths g++-12
   get_command_paths g++-13
   get_command_paths g++-14
+  get_command_paths g++-15
   get_command_paths clang++-16
   get_command_paths clang++-17
   get_command_paths clang++-18
   get_command_paths clang++-19
+  get_command_paths clang++-20
+  get_command_paths clang++-21
   get_command_paths cmake
   get_command_paths meson
   get_command_paths ninja

.devcontainer/scripts/show-tool-versions.sh

@@ -5,15 +5,38 @@
 # This file is part of https://github.com/jakoch/cpp-devbox
 
 # This info script shows the version of tools, compilers and libc.
-# Output format is markdown.
+# The supported output formats are markdown (default) and JSON.
+# You can change to JSON by passing "json" as the first argument.
 
-# Function to print a table row in Markdown format
+OUTPUT_FORMAT=${1:-markdown}
+
+# Function to call either print_row_markdown or print_row_json based on CLI arg
 print_row() {
+    if [ "$OUTPUT_FORMAT" = "json" ]; then
+        print_row_json "$@"
+    else
+        print_row_markdown "$@"
+    fi
+}
+
+# Function to print a table row in Markdown format
+print_row_markdown() {
     printf "| %-13s | %-19s |\n" "$1" "$2"
 }
 
+# Function to print a JSON row
+FIRST_ENTRY=true
+print_row_json() {
+    if [ "$FIRST_ENTRY" = true ]; then
+        FIRST_ENTRY=false
+    else
+        printf ",\n"
+    fi
+    printf '  [ "%s", "%s" ]' "$1" "$2"
+}
+
 # Function to check and print GCC versions if installed
-print_row_gcc() {
+print_rows_gcc() {
     for version in 12 13 14 15 16; do
         gcc_path="/usr/bin/g++-$version"
         if [ -x "$gcc_path" ]; then
@@ -23,9 +46,9 @@ print_row_gcc() {
     done
 }
 
-# Function to check and print GCC versions if installed
-print_row_clang() {
-    for version in 16 17 18 19 20 21; do
+# Function to check and print Clang versions if installed
+print_rows_clang() {
+    for version in 16 17 18 19 20 21 22; do
         clang_path="/usr/bin/clang++-$version"
         if [ -x "$clang_path" ]; then
             clang_version=$("$clang_path" --version | head -n1 | awk '{print $4}')
@@ -73,7 +96,7 @@ show_tool_versions() {
     gprof_version=$(gprof --version | head -n1 | awk '{print $7}')
     perf_version=$(perf --version | awk '{print $3}')
     strace_version=$(strace --version | head -n1 | awk '{print $4}')
-    ltrace_version=$(ltrace --version | head -n1 | awk '{print $2}')
+    ltrace_version=$(ltrace --version | head -n1 | awk '{print $3}' | sed 's/\.$//' )
     lcov=$(lcov --version | head -n1 | awk '{print $4}')
     gcov=$(gcov --version | head -n1 | awk '{print $3}' | cut -d'-' -f1)
     gcovr=$(gcovr --version | head -n1 | awk '{print $2}')
@@ -86,15 +109,19 @@ show_tool_versions() {
     mesa_version=$(dpkg -l | grep "mesa-vulkan-drivers" | awk '{print $3}')
     vulkan_version=$(echo $VULKAN_SDK | awk -F '/' '{print $4}')
 
-    printf "## Version Overview\n\n"
-
-    # Print table header in Markdown format
-    printf "| Tool          | Version             |\n"
-    printf "|:--------------|:--------------------|\n"
+    if [ "$OUTPUT_FORMAT" = "json" ]; then
+      # Open JSON array
+      printf "[\n"
+    else
+      # Print table header in Markdown format
+      printf "## Version Overview\n\n"
+      printf "| Tool          | Version             |\n"
+      printf "|:--------------|:--------------------|\n"
+    fi;
 
     # Print each row of the table in Markdown format
-    print_row_gcc
-    print_row_clang
+    print_rows_gcc
+    print_rows_clang
     print_row "CMake" "$cmake_version"
     print_row "Meson" "$meson_version"
     print_row "Ninja" "$ninja_version"
@@ -117,13 +144,22 @@ show_tool_versions() {
     print_row "sphinx" "$sphinx_version"
     print_row "git" "$git_version"
     print_row "gh cli" "$github_cli_version"
-    printf "|:--------------|:--------------------|\n"
+
+    if [ "$OUTPUT_FORMAT" = "markdown" ]; then
+      printf "|:--------------|:--------------------|\n"
+    fi
+
     if is_installed_mesa; then
         print_row "Mesa" "$mesa_version"
     fi
     if is_installed_vulkan_sdk; then
         print_row "Vulkan SDK" "$vulkan_version"
     fi
+
+    # Close JSON array
+    if [ "$OUTPUT_FORMAT" = "json" ]; then
+      printf "\n]"
+    fi
 }
 
 # Call the function to show the tool versions