Merge branch 'main' into feature/embedded-devcontainer-cpp/update-vscode-extensions-devcontainer-metadata.json

Author: gabrielfrasantos

.devcontainer/base/Dockerfile

@@ -1,10 +1,37 @@
 # syntax=docker/dockerfile:1
-
-FROM ubuntu:26.04@sha256:f3d28607ddd78734bb7f71f117f3c6706c666b8b76cbff7c9ff6e5718d46ff64 AS extractor
+# hadolint global ignore=DL3006
 
 ARG BATS_CORE_VERSION=1.13.0
 ARG BATS_SUPPORT_VERSION=0.3.0
 ARG BATS_ASSERT_VERSION=2.2.4
+ARG XWIN_VERSION=0.8.0
+
+# Downloader stage for AMD64 architecture
+FROM scratch AS downloader-amd64
+
+ARG XWIN_VERSION
+
+ADD --checksum=sha256:8a354e12475dd154d0a2d3084eefd2c105f872ec8062965baaa7e9f2f76fe611 \
+ https://github.com/Jake-Shadle/xwin/releases/download/${XWIN_VERSION}/xwin-${XWIN_VERSION}-x86_64-unknown-linux-musl.tar.gz /xwin.tar.gz
+
+# Downloader stage for ARM64 architecture
+FROM scratch AS downloader-arm64
+
+ARG XWIN_VERSION
+
+ADD --checksum=sha256:fe106caefbb316664d73fd03166c28c09e580bb2a3ad65b4d50c51c67368aeab \
+ https://github.com/Jake-Shadle/xwin/releases/download/${XWIN_VERSION}/xwin-${XWIN_VERSION}-aarch64-unknown-linux-musl.tar.gz /xwin.tar.gz
+
+# Select downloader stage based on target architecture.
+# trivy:ignore:AVD-DS-0001
+FROM downloader-${TARGETARCH} AS downloader
+
+FROM ubuntu:26.04@sha256:f3d28607ddd78734bb7f71f117f3c6706c666b8b76cbff7c9ff6e5718d46ff64 AS extractor
+
+ARG BATS_CORE_VERSION
+ARG BATS_SUPPORT_VERSION
+ARG BATS_ASSERT_VERSION
+ARG XWIN_VERSION
 
 ADD --checksum=sha256:a122d4080a26c1da986bd0e7202b1630eb661a624915ef244f496fdd306e85fb \
  https://www.cisco.com/security/pki/certs/ciscoumbrellaroot.pem /cisco-umbrella-root.crt
@@ -16,9 +43,11 @@ ADD --checksum=sha256:7815237aafeb42ddcc1b8c698fc5808026d33317d8701d5ec2396e9634
 ADD --checksum=sha256:e305df20c4c36cba4570e10f1cd824efb1ae71d88b5ef474550781ebee04192f \
  https://github.com/bats-core/bats-assert/archive/refs/tags/v${BATS_ASSERT_VERSION}.tar.gz /bats-assert.tar.gz
 
-RUN tar xzf /bats-core.tar.gz && mv bats-core-*/ bats-core \
+RUN --mount=from=downloader,target=/dl \
+    tar xzf /bats-core.tar.gz && mv bats-core-*/ bats-core \
  && tar xzf /bats-support.tar.gz && mv bats-support-*/ bats-support \
- && tar xzf /bats-assert.tar.gz && mv bats-assert-*/ bats-assert
+ && tar xzf /bats-assert.tar.gz && mv bats-assert-*/ bats-assert \
+ && tar xzf /dl/xwin.tar.gz --strip-components=1 "xwin-${XWIN_VERSION}-$(uname -m)-unknown-linux-musl/xwin"
 
 FROM ubuntu:26.04@sha256:f3d28607ddd78734bb7f71f117f3c6706c666b8b76cbff7c9ff6e5718d46ff64
 
@@ -51,10 +80,23 @@ RUN --mount=type=bind,source=.devcontainer/base/apt-requirements.json,target=/tm
    cp -r /src/bats-support /usr/local/bats-support
    cp -r /src/bats-assert /usr/local/bats-assert
 
+   # Install xwin
+   cp /src/xwin /usr/local/bin/xwin
+
    # Generate locale
    sed -i '/C.UTF-8/s/^# //' /etc/locale.gen
    locale-gen
 
    # Patch root's bashrc to include bash-completion
    cp /etc/skel/.bashrc /root/.bashrc
 EOF
+
+# Download Windows SDK headers and libraries for cross-compilation
+RUN xwin --accept-license splat --include-debug-libs --preserve-ms-arch-notation --output /winsdk \
+    && rm -rf /root/.xwin-cache
+
+# Install Qt6 for Windows cross-compilation via aqtinstall (in a temporary venv)
+RUN python3 -m venv /tmp/aqt-venv \
+    && /tmp/aqt-venv/bin/pip install --no-cache-dir aqtinstall==3.3.0 \
+    && /tmp/aqt-venv/bin/aqt install-qt windows desktop 6.4.2 win64_msvc2019_64 --outputdir /opt/qt6-windows \
+    && rm -rf /tmp/aqt-venv /tmp/aqt*

.devcontainer/base/apt-requirements.json

@@ -3,7 +3,15 @@
   "ca-certificates": "20260223",
   "git": "1:2.53.0-1ubuntu1",
   "gnupg2": "2.4.8-4ubuntu3",
+  "gnuplot-qt": "6.0.2+dfsg1-2ubuntu2",
+  "libgl1-mesa-dev": "26.0.3-1ubuntu1",
+  "libxcb-cursor0": "0.1.6-1",
+  "libxcb-xinerama0": "1.17.0-2ubuntu1",
+  "libxkbcommon-dev": "1.13.1-1",
+  "libxkbcommon-x11-0": "1.13.1-1",
   "locales": "2.43-2ubuntu2",
+  "python3-venv": "3.14.3-0ubuntu2",
+  "qt6-base-dev": "6.10.2+dfsg-7",
   "udev": "259.5-0ubuntu3",
   "wget": "1.25.0-2ubuntu4",
   "xz-utils": "5.8.3-1"

.devcontainer/cpp/Dockerfile

@@ -120,8 +120,8 @@ RUN --mount=type=bind,source=.devcontainer/cpp/apt-requirements-base.json,target
 
     # Install some tools via pip to get more recent versions, clean up afterwards
     python3 -m pip install --break-system-packages --require-hashes --no-cache-dir --no-compile -r /tmp/requirements.txt
-    find / -regex '^.*\(__pycache__\|\.py[co]\)$' -delete
-    rm -rf "$(pip cache dir)"
+    find / -xdev -regex '^.*\(__pycache__\|\.py[co]\)$' -delete 2>/dev/null || true
+    python3 -m pip cache purge 2>/dev/null || true
 
     # Install ccache and xwin
     cp /src/ccache /usr/local/bin/ccache

.devcontainer/cpp/requirements.txt

@@ -184,9 +184,9 @@ gcovr==8.6 \
     --hash=sha256:b2e7042abca9321cadbab8a06eb34d19f801b831557b28cdc30a029313de8b9e \
     --hash=sha256:dbf9d87c38042752ad6f530aa8210427e22b526611bb7b7bfed0e81977d1f1ef
     # via -r requirements.in
-idna==3.11 \
-    --hash=sha256:771a87f49d9defaf64091e6e6fe9c18d4833f140bd19464795bc32d966ca37ea \
-    --hash=sha256:795dafcc9c04ed0c1fb032c2aa73654d8e8c5023a7df64a53f39190ada629902
+idna==3.15 \
+    --hash=sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8 \
+    --hash=sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc
     # via requests
 jinja2==3.1.6 \
     --hash=sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d \

test/base/integration-tests.bats

@@ -12,3 +12,16 @@ setup() {
   assert_success
   assert_output --partial "OK"
 }
+
+@test "xwin is installed and runnable" {
+  assert [ -x /usr/local/bin/xwin ]
+}
+
+@test "windows sdk headers and libraries are present under /winsdk" {
+  assert [ -d /winsdk/crt ]
+  assert [ -d /winsdk/sdk ]
+}
+
+@test "qt6 for windows cross-compilation is present under /opt/qt6-windows" {
+  assert [ -d /opt/qt6-windows/6.4.2/msvc2019_64 ]
+}