Merge pull request #25 from eclipse-score/lt_bump_deps

Bump external dependency versions

Author: ltekieli

MODULE.bazel

@@ -30,27 +30,9 @@ bazel_dep(name = "googletest", version = "1.17.0", dev_dependency = True)
 bazel_dep(name = "score_bazel_platforms", version = "0.1.2", dev_dependency = True)
 
 # QCC C++ cross-compiler toolchain
-bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.3.1", dev_dependency = True)
+bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.5.0", dev_dependency = True)
 
 gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True)
-gcc.sdp(
-    name = "sdp_x86_64_pkg",
-    build_file = "@score_bazel_cpp_toolchains//packages/qnx/x86_64/sdp/8.0.0:sdp.BUILD",
-    sha256 = "9039fd6a4a639f06ea977afb93963a6fe8f8c46db727066709370d999c7232e0",
-    url = "https://www.qnx.com/download/download/87174/installation_qnx_803_260305.tar.xz",
-)
-gcc.sdp(
-    name = "sdp_aarch64_pkg",
-    build_file = "@score_bazel_cpp_toolchains//packages/qnx/aarch64/sdp/8.0.0:sdp.BUILD",
-    sha256 = "9039fd6a4a639f06ea977afb93963a6fe8f8c46db727066709370d999c7232e0",
-    url = "https://www.qnx.com/download/download/87174/installation_qnx_803_260305.tar.xz",
-)
-use_repo(
-    gcc,
-    "sdp_aarch64_pkg",
-    "sdp_x86_64_pkg",
-)
-
 gcc.toolchain(
     name = "score_gcc_x86_64_toolchain",
     target_cpu = "x86_64",
@@ -60,53 +42,54 @@ gcc.toolchain(
 )
 gcc.toolchain(
     name = "score_qcc_x86_64_toolchain",
-    sdp_to_link = "sdp_x86_64_pkg",
-    sdp_version = "8.0.0",
+    sdp_version = "8.0.3",
     target_cpu = "x86_64",
     target_os = "qnx",
+    use_default_package = True,
     version = "12.2.0",
 )
 gcc.toolchain(
     name = "score_qcc_aarch64_toolchain",
-    sdp_to_link = "sdp_aarch64_pkg",
-    sdp_version = "8.0.0",
+    sdp_version = "8.0.3",
     target_cpu = "aarch64",
     target_os = "qnx",
+    use_default_package = True,
     version = "12.2.0",
 )
 use_repo(
     gcc,
     "score_gcc_x86_64_toolchain",
     "score_qcc_aarch64_toolchain",
+    "score_qcc_aarch64_toolchain_pkg",
     "score_qcc_x86_64_toolchain",
+    "score_qcc_x86_64_toolchain_pkg",
 )
 
 # QNX IFS (Image File System) toolchain for building boot images
-bazel_dep(name = "score_rules_imagefs", version = "0.0.2")
-git_override(
-    module_name = "score_rules_imagefs",
-    commit = "5c5d32eb5597ca6463e840deaf8a80523edba525",
-    remote = "https://github.com/eclipse-score/rules_imagefs.git",
-)
+bazel_dep(name = "score_rules_imagefs", version = "0.0.3")
 
 imagefs = use_extension("@score_rules_imagefs//extensions:imagefs.bzl", "imagefs", dev_dependency = True)
 imagefs.toolchain(
     name = "score_qnx_x86_64_ifs_toolchain",
-    sdp_to_import = "@sdp_x86_64_pkg",
+    sdp_to_import = "@score_qcc_x86_64_toolchain_pkg",
     sdp_version = "8.0.0",
     target_cpu = "x86_64",
     target_os = "qnx",
     type = "ifs",
 )
 imagefs.toolchain(
     name = "score_qnx_aarch64_ifs_toolchain",
-    sdp_to_import = "@sdp_aarch64_pkg",
+    sdp_to_import = "@score_qcc_aarch64_toolchain_pkg",
     sdp_version = "8.0.0",
     target_cpu = "aarch64",
     target_os = "qnx",
     type = "ifs",
 )
-use_repo(imagefs, "score_qnx_aarch64_ifs_toolchain", "score_qnx_x86_64_ifs_toolchain")
+use_repo(
+    imagefs,
+    "score_qnx_aarch64_ifs_toolchain",
+    "score_qnx_x86_64_ifs_toolchain",
+)
 
 # Score tooling (copyright checker, format checker, starpls)
 bazel_dep(name = "score_tooling", version = "1.1.2", dev_dependency = True)

examples/MODULE.bazel

@@ -36,27 +36,9 @@ bazel_dep(name = "googletest", version = "1.17.0")
 bazel_dep(name = "score_bazel_platforms", version = "0.1.2")
 
 # QCC C++ cross-compiler toolchain
-bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.3.1")
+bazel_dep(name = "score_bazel_cpp_toolchains", version = "0.5.0")
 
 gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc")
-gcc.sdp(
-    name = "sdp_x86_64_pkg",
-    build_file = "@score_bazel_cpp_toolchains//packages/qnx/x86_64/sdp/8.0.0:sdp.BUILD",
-    sha256 = "9039fd6a4a639f06ea977afb93963a6fe8f8c46db727066709370d999c7232e0",
-    url = "https://www.qnx.com/download/download/87174/installation_qnx_803_260305.tar.xz",
-)
-gcc.sdp(
-    name = "sdp_aarch64_pkg",
-    build_file = "@score_bazel_cpp_toolchains//packages/qnx/aarch64/sdp/8.0.0:sdp.BUILD",
-    sha256 = "9039fd6a4a639f06ea977afb93963a6fe8f8c46db727066709370d999c7232e0",
-    url = "https://www.qnx.com/download/download/87174/installation_qnx_803_260305.tar.xz",
-)
-use_repo(
-    gcc,
-    "sdp_aarch64_pkg",
-    "sdp_x86_64_pkg",
-)
-
 gcc.toolchain(
     name = "score_gcc_x86_64_toolchain",
     target_cpu = "x86_64",
@@ -66,53 +48,54 @@ gcc.toolchain(
 )
 gcc.toolchain(
     name = "score_qcc_x86_64_toolchain",
-    sdp_to_link = "sdp_x86_64_pkg",
-    sdp_version = "8.0.0",
+    sdp_version = "8.0.3",
     target_cpu = "x86_64",
     target_os = "qnx",
+    use_default_package = True,
     version = "12.2.0",
 )
 gcc.toolchain(
     name = "score_qcc_aarch64_toolchain",
-    sdp_to_link = "sdp_aarch64_pkg",
-    sdp_version = "8.0.0",
+    sdp_version = "8.0.3",
     target_cpu = "aarch64",
     target_os = "qnx",
+    use_default_package = True,
     version = "12.2.0",
 )
 use_repo(
     gcc,
     "score_gcc_x86_64_toolchain",
     "score_qcc_aarch64_toolchain",
+    "score_qcc_aarch64_toolchain_pkg",
     "score_qcc_x86_64_toolchain",
+    "score_qcc_x86_64_toolchain_pkg",
 )
 
 # QNX IFS (Image File System) toolchain for building boot images
-bazel_dep(name = "score_rules_imagefs", version = "0.0.2")
-git_override(
-    module_name = "score_rules_imagefs",
-    commit = "5c5d32eb5597ca6463e840deaf8a80523edba525",
-    remote = "https://github.com/eclipse-score/rules_imagefs.git",
-)
+bazel_dep(name = "score_rules_imagefs", version = "0.0.3")
 
 imagefs = use_extension("@score_rules_imagefs//extensions:imagefs.bzl", "imagefs")
 imagefs.toolchain(
     name = "score_qnx_x86_64_ifs_toolchain",
-    sdp_to_import = "@sdp_x86_64_pkg",
+    sdp_to_import = "@score_qcc_x86_64_toolchain_pkg",
     sdp_version = "8.0.0",
     target_cpu = "x86_64",
     target_os = "qnx",
     type = "ifs",
 )
 imagefs.toolchain(
     name = "score_qnx_aarch64_ifs_toolchain",
-    sdp_to_import = "@sdp_aarch64_pkg",
+    sdp_to_import = "@score_qcc_aarch64_toolchain_pkg",
     sdp_version = "8.0.0",
     target_cpu = "aarch64",
     target_os = "qnx",
     type = "ifs",
 )
-use_repo(imagefs, "score_qnx_aarch64_ifs_toolchain", "score_qnx_x86_64_ifs_toolchain")
+use_repo(
+    imagefs,
+    "score_qnx_aarch64_ifs_toolchain",
+    "score_qnx_x86_64_ifs_toolchain",
+)
 
 # Rust toolchain (Ferrocene, matching reference_integration setup)
 bazel_dep(name = "score_toolchains_rust", version = "0.4.0")

src/test_qnx.bzl

@@ -28,7 +28,7 @@ def _get_test_and_data_impl(ctx):
 
     # Rename binary to canonical name so the IFS image has the expected path.
     # The test runner script (run_test.sh) expects the binary at /opt/tests/cc_test_qnx.
-    src_binary = ctx.attr.src[DefaultInfo].files.to_list()[0]
+    src_binary = src_files[0]
     renamed_binary = ctx.actions.declare_file(ctx.attr.name + "_out/cc_test_qnx")
     ctx.actions.symlink(output = renamed_binary, target_file = src_binary)