Add new QNX package into matrix (#49)

* Add new QNX package into matrix

The new QNX package version 8.0.3 is added. Currently we do not
support this version constraint on platform side so the constraint
will still point 8.0.0.

* Resolve package identifier from original version fields

Use sdk_version/sdp_version instead of tc_identifier for the
VERSION_MATRIX lookup, since tc_identifier may be remapped for
platform constraint compatibility and differ from the real version.

---------

Co-authored-by: Lukasz Tekieli <lukasz.tekieli@bmw.de>

Author: nradakovic

examples/MODULE.bazel

@@ -116,7 +116,7 @@ gcc.toolchain(
 # *******************************************************************************
 gcc.toolchain(
     name = "score_qcc_toolchain",
-    sdp_version = "8.0.0",
+    sdp_version = "8.0.3",
     target_cpu = "x86_64",
     target_os = "qnx",
     use_default_package = True,

examples/MODULE.bazel.lock

@@ -215,10 +215,22 @@ def _create_and_link_sdp(toolchain_info):
     """
     pkg_name = "{}_pkg".format(toolchain_info["name"])
 
+    # Resolve package identifier from original version fields, not the
+    # constraint-remapped tc_identifier. tc_identifier may differ from
+    # the actual version (e.g., sdp 8.0.3 is remapped to 8.0.0 for
+    # platform constraint compatibility), but the version matrix uses
+    # the real version.
+    if toolchain_info["sdk_version"] != "":
+        pkg_identifier = "sdk_{}".format(toolchain_info["sdk_version"])
+    elif toolchain_info["sdp_version"] != "":
+        pkg_identifier = "sdp_{}".format(toolchain_info["sdp_version"])
+    else:
+        pkg_identifier = toolchain_info["tc_identifier"]
+
     matrix_key = "{cpu}-{os}{identifier}{runtime_es}".format(
         cpu = toolchain_info["tc_cpu"],
         os = toolchain_info["tc_os"],
-        identifier = "-{}".format(toolchain_info["tc_identifier"]) if toolchain_info["tc_identifier"] != "" else "",
+        identifier = "-{}".format(pkg_identifier) if pkg_identifier != "" else "",
         runtime_es = "-{}".format(toolchain_info["tc_runtime_ecosystem"]) if toolchain_info["tc_runtime_ecosystem"] != "" else "",
     )
     matrix = VERSION_MATRIX[matrix_key]
@@ -260,7 +272,7 @@ def _resolve_identifier(toolchain_info):
         version = toolchain_info["sdk_version"]
     elif toolchain_info["sdp_version"] != "":
         identifier = "sdp"
-        version = toolchain_info["sdp_version"]
+        version = "8.0.0" if toolchain_info["sdp_version"] == "8.0.3" else toolchain_info["sdp_version"]  # FIXME: currently we do not support constraint "8.0.3".
 
     return "{}_{}".format(identifier, version)
 

extensions/gcc.bzl

@@ -73,6 +73,13 @@ VERSION_MATRIX = {
         "url": "https://www.qnx.com/download/download/79858/installation.tgz",
         "gcc_version": "12.2.0",
     },
+    "aarch64-qnx-sdp_8.0.3": {
+        "build_file": "@score_bazel_cpp_toolchains//packages/qnx/aarch64/sdp/8.0.0:sdp.BUILD",
+        "sha256": "9039fd6a4a639f06ea977afb93963a6fe8f8c46db727066709370d999c7232e0",
+        "strip_prefix": "",
+        "url": "https://www.qnx.com/download/download/87174/installation_qnx_803_260305.tar.xz",
+        "gcc_version": "12.2.0",
+    },
     "x86_64-linux-gcc_12.2.0": {
         "build_file": "@score_bazel_cpp_toolchains//packages/linux/x86_64/gcc/12.2.0:gcc.BUILD",
         "sha256": "e9b9a7a63a5f8271b76d6e2057906b95c7a244e4931a8e10edeaa241e9f7c11e",
@@ -193,4 +200,11 @@ VERSION_MATRIX = {
         "url": "https://www.qnx.com/download/download/79858/installation.tgz",
         "gcc_version": "12.2.0",
     },
+    "x86_64-qnx-sdp_8.0.3": {
+        "build_file": "@score_bazel_cpp_toolchains//packages/qnx/x86_64/sdp/8.0.0:sdp.BUILD",
+        "sha256": "9039fd6a4a639f06ea977afb93963a6fe8f8c46db727066709370d999c7232e0",
+        "strip_prefix": "",
+        "url": "https://www.qnx.com/download/download/87174/installation_qnx_803_260305.tar.xz",
+        "gcc_version": "12.2.0",
+    },
 }

packages/version_matrix.bzl

@@ -180,7 +180,7 @@ def _impl(rctx):
             "%{license_info_value}": rctx.attr.license_info_value,
             "%{license_info_variable}": rctx.attr.license_info_variable,
             "%{license_path}": rctx.attr.license_path,
-            "%{sdp_version}": rctx.attr.sdp_version,
+            "%{sdp_version}": "8.0.0" if rctx.attr.sdp_version == "8.0.3" else rctx.attr.sdp_version,  # FIXME: currently we do not support constraint "8.0.3".
             "%{tc_cpu_cxx}": "aarch64le" if rctx.attr.tc_cpu == "aarch64" else rctx.attr.tc_cpu,
             "%{use_license_info}": "False" if rctx.attr.license_info_value == "" else "True",
         }