移除 Docker 构建路线，改为 host 直装 Qt 5.14.2 + Qt Creator 4.11.0
学生主要用 Windows，Docker 方案不再需要：删掉 tools/docker/ 及 README/HANDOFF/ CMakeLists 里的相关引用（含一处已失效的 docker_run.sh 死链接）。 install_qt_host.sh 现在同时装期号匹配的 Qt Creator 4.11.0：官方 .run 安装器 强制要求 Qt 账号登录且无 Skip 选项，改用 tools/extract_qtcreator_payload.py 直接从 .run 里定位、解出内嵌的 7z payload，绕开账号登录。提取逻辑先解到 staging 目录再原子替换到位，避免中途失败留下部分安装但被判定为"已装"； 候选 7z 复用同一临时文件，不会在磁盘上堆多份安装包大小的临时拷贝。
This commit is contained in:
张宗平
@@ -1,34 +0,0 @@
|
||||
# ==============================================================================
|
||||
# Build-container image for the qt-course repo.
|
||||
#
|
||||
# Usage model (see docker_install_qt.sh / docker_build.sh / docker_run_qt.sh):
|
||||
# 1. Install isolated Qt 5.14.2 INTO THE REPO at .qt514/ (one-off, ~577MB).
|
||||
# The Qt files live on the host filesystem, mounted into the container.
|
||||
# 2. Build the Qt part from a container, writing into the mounted build/.
|
||||
# 3. RUN the compiled Qt apps on the HOST (no container needed) using
|
||||
# LD_LIBRARY_PATH=.qt514/.../lib — host & container share glibc 2.39,
|
||||
# so binaries built in the container run natively on the host. Isolation
|
||||
# from the system Qt 5.15 is by prefix + LD_LIBRARY_PATH, not by the
|
||||
# container boundary.
|
||||
#
|
||||
# This image only needs the build toolchain + aqtinstall. It is small and
|
||||
# stable (no multi-GB Qt layer baked in; Qt is downloaded into the mount).
|
||||
# ------------------------------------------------------------------------------
|
||||
FROM ubuntu:24.04
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
ENV TZ=Asia/Shanghai
|
||||
|
||||
# Build toolchain matching the host (gcc 13.3, cmake 3.28, ninja) + runtime
|
||||
# libs so the container can also run GUI examples with X11 forwarding if needed.
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
build-essential g++ gcc cmake ninja-build git \
|
||||
ca-certificates python3 python3-pip python3-venv \
|
||||
libgl1 libegl1 libxkbcommon0 libdbus-1-3 \
|
||||
libfontconfig1 libfreetype6 libxcb-cursor0 \
|
||||
fontconfig xauth x11-xserver-utils \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN pip3 install --break-system-packages aqtinstall
|
||||
|
||||
WORKDIR /workspace
|
||||
@@ -1,33 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# Build-container: run ONE build pass of the repo (CMake configure + compile),
|
||||
# mounting the repo so build artifacts land on the host filesystem.
|
||||
#
|
||||
# Usage: tools/docker/docker_build.sh [extra cmake args...]
|
||||
# It builds BOTH part1 (C/C++) and part3 (Qt) unless you pass args to restrict.
|
||||
# The Qt part is pointed at the isolated .qt514/ toolchain.
|
||||
#
|
||||
# After this, run compiled apps on the HOST with tools/run_qt.sh / tools/run.sh.
|
||||
set -euo pipefail
|
||||
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
||||
IMAGE_TAG="qt-course:builder"
|
||||
QT_ROOT="/workspace/.qt514/5.14.2/gcc_64"
|
||||
|
||||
if [ ! -x "$REPO_ROOT/.qt514/5.14.2/gcc_64/bin/qmake" ]; then
|
||||
echo ">> Isolated Qt not found at .qt514/. Run tools/docker/docker_install_qt.sh first." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
docker run --rm \
|
||||
-v "$REPO_ROOT:/workspace" \
|
||||
-w /workspace \
|
||||
"$IMAGE_TAG" \
|
||||
bash -lc "
|
||||
set -e
|
||||
cmake -S . -B build -G Ninja \
|
||||
-DBUILD_QT_PART=ON \
|
||||
-DCMAKE_PREFIX_PATH='${QT_ROOT}' \
|
||||
-DCMAKE_BUILD_TYPE=Debug \
|
||||
$*
|
||||
cmake --build build --parallel
|
||||
"
|
||||
echo ">> Build done. Run on host: tools/run.sh <target> (Qt targets: tools/run_qt.sh <target>)"
|
||||
@@ -1,9 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# Build the lightweight build-container image (toolchain + aqtinstall, no Qt baked in).
|
||||
# Usage: tools/docker/docker_build_image.sh
|
||||
set -euo pipefail
|
||||
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
||||
IMAGE_TAG="qt-course:builder"
|
||||
echo ">> Building image ${IMAGE_TAG} ..."
|
||||
docker build -t "$IMAGE_TAG" -f "$REPO_ROOT/tools/docker/Dockerfile" "$REPO_ROOT/tools/docker"
|
||||
echo ">> Done. Next: tools/docker/docker_install_qt.sh (downloads Qt 5.14.2 into .qt514/)"
|
||||
@@ -1,31 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# Install the ISOLATED Qt 5.14.2 toolchain into the repo at .qt514/ using the
|
||||
# build container (keeps the host free of aqtinstall deps; Qt files land on the
|
||||
# host filesystem via the mount so the host can build/run against them later).
|
||||
#
|
||||
# Usage: tools/docker/docker_install_qt.sh
|
||||
# Idempotent: re-running refreshes/repairs the install.
|
||||
set -euo pipefail
|
||||
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
||||
IMAGE_TAG="qt-course:builder"
|
||||
QT_DEST="/workspace/.qt514"
|
||||
QT_VERSION="5.14.2"
|
||||
|
||||
if ! docker image inspect "$IMAGE_TAG" >/dev/null 2>&1; then
|
||||
echo ">> image ${IMAGE_TAG} not found; building it first." >&2
|
||||
"$REPO_ROOT/tools/docker/docker_build_image.sh"
|
||||
fi
|
||||
|
||||
mkdir -p "$REPO_ROOT/.qt514"
|
||||
echo ">> Installing Qt ${QT_VERSION} gcc_64 into $REPO_ROOT/.qt514/ (via container)..."
|
||||
docker run --rm \
|
||||
-v "$REPO_ROOT:/workspace" \
|
||||
"$IMAGE_TAG" \
|
||||
aqt install-qt linux desktop "${QT_VERSION}" gcc_64 -O "${QT_DEST}"
|
||||
|
||||
# Verify on the host (no container needed for this read).
|
||||
QT_ROOT="$REPO_ROOT/.qt514/${QT_VERSION}/gcc_64"
|
||||
echo ">> Verify (host):"
|
||||
"$QT_ROOT/bin/qmake" -query QT_VERSION
|
||||
echo ">> Qt installed at: $QT_ROOT"
|
||||
echo ">> Now build with: tools/docker/docker_build.sh (or host cmake, see README)"
|
||||
Executable
+81
@@ -0,0 +1,81 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Extract the Qt Creator payload from a QtIFW .run installer without running
|
||||
its GUI. The official .run for Qt Creator (this vintage) hard-gates the wizard
|
||||
behind a mandatory Qt account login with no Skip option, so the GUI/script
|
||||
automation route is a dead end. The installer binary is a self-extracting
|
||||
QtIFW archive: an ELF stub with one or more embedded 7z streams appended.
|
||||
The real payload (bin/, lib/, share/, libexec/) lives in one of those streams;
|
||||
this scans for the 7z magic, tries each occurrence, and keeps the one whose
|
||||
contents include bin/qtcreator.
|
||||
|
||||
Usage: extract_qtcreator_payload.py <installer.run> <dest_dir>
|
||||
"""
|
||||
import shutil
|
||||
import sys
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
|
||||
import py7zr
|
||||
|
||||
MAGIC = b"7z\xbc\xaf\x27\x1c"
|
||||
|
||||
|
||||
def find_offsets(data: bytes) -> list[int]:
|
||||
offsets = []
|
||||
start = 0
|
||||
while True:
|
||||
i = data.find(MAGIC, start)
|
||||
if i == -1:
|
||||
break
|
||||
offsets.append(i)
|
||||
start = i + 1
|
||||
return offsets
|
||||
|
||||
|
||||
def main() -> int:
|
||||
if len(sys.argv) != 3:
|
||||
print(__doc__)
|
||||
return 2
|
||||
run_path = Path(sys.argv[1])
|
||||
dest_dir = Path(sys.argv[2])
|
||||
|
||||
data = run_path.read_bytes()
|
||||
offsets = find_offsets(data)
|
||||
if not offsets:
|
||||
print("no 7z signature found in installer", file=sys.stderr)
|
||||
return 1
|
||||
|
||||
with tempfile.TemporaryDirectory() as tmp:
|
||||
candidate = Path(tmp) / "candidate.7z"
|
||||
staging = Path(tmp) / "staging"
|
||||
for off in offsets:
|
||||
# Overwrite the same candidate file each iteration so failed
|
||||
# attempts don't accumulate on disk (offsets can be ~installer-size apart).
|
||||
candidate.write_bytes(data[off:])
|
||||
try:
|
||||
with py7zr.SevenZipFile(candidate, mode="r") as z:
|
||||
names = z.getnames()
|
||||
except Exception:
|
||||
continue
|
||||
if "bin/qtcreator" not in names:
|
||||
continue
|
||||
print(f">> payload found at offset {off} ({len(names)} entries)")
|
||||
# Extract into a staging dir first and only move it into dest_dir
|
||||
# once extraction fully succeeds, so a crash/disk-full mid-extract
|
||||
# never leaves a partially-populated dest_dir that later runs
|
||||
# would mistake for a complete install.
|
||||
with py7zr.SevenZipFile(candidate, mode="r") as z:
|
||||
z.extractall(path=staging)
|
||||
if dest_dir.exists():
|
||||
shutil.rmtree(dest_dir)
|
||||
dest_dir.parent.mkdir(parents=True, exist_ok=True)
|
||||
shutil.move(str(staging), str(dest_dir))
|
||||
print(f">> extracted to {dest_dir}")
|
||||
return 0
|
||||
|
||||
print("no offset yielded a payload containing bin/qtcreator", file=sys.stderr)
|
||||
return 1
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
# * 资源依赖（:/images/*.png 等）用脚本生成的纯色占位 png + .qrc 提供，qt5_add_resources。
|
||||
# * Qt 代码修正（笔误/平台/过时 API）每处 record_erratum 进 docs/ERRATA.md（透明可审计）。
|
||||
#
|
||||
# 验证：Docker 容器或宿主机用隔离 Qt 5.14.2 构建 →
|
||||
# 验证：宿主机用隔离 Qt 5.14.2 构建 →
|
||||
# QT_QPA_PLATFORM=offscreen tools/run_qt.sh <target> 自动退出验证。
|
||||
# ------------------------------------------------------------------------------
|
||||
import json, os, re, sys
|
||||
|
||||
@@ -1,22 +1,26 @@
|
||||
#!/usr/bin/env bash
|
||||
# Install the ISOLATED Qt 5.14.2 toolchain into .qt514/ DIRECTLY ON THE HOST
|
||||
# (no Docker), using a local venv for aqtinstall. The host already has the right
|
||||
# toolchain (gcc 13.3, cmake 3.28); this just fetches Qt files into the repo.
|
||||
# Install the ISOLATED Qt 5.14.2 toolchain + matching Qt Creator into .qt514/
|
||||
# directly on the host, using a local venv for aqtinstall. The host already
|
||||
# has the right toolchain (gcc 13.3, cmake 3.28); this just fetches files
|
||||
# into the repo. No container involved (students are mostly on Windows).
|
||||
#
|
||||
# Usage: tools/install_qt_host.sh
|
||||
# Prefer this over docker_install_qt.sh when you don't need a container.
|
||||
# Verified: a binary built against .qt514/ links ONLY to .qt514/ (ldd shows 0
|
||||
# system-Qt refs) and runs on the host with tools/run_qt.sh.
|
||||
set -euo pipefail
|
||||
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
VENV="$REPO_ROOT/.venv-aqt"
|
||||
QT_VERSION="5.14.2"
|
||||
CREATOR_VERSION="4.11.0"
|
||||
CREATOR_DIR="$REPO_ROOT/.qt514/Tools/QtCreator"
|
||||
CREATOR_URL="https://download.qt.io/archive/qtcreator/${CREATOR_VERSION%.*}/${CREATOR_VERSION}/qt-creator-opensource-linux-x86_64-${CREATOR_VERSION}.run"
|
||||
|
||||
if [ ! -x "$VENV/bin/aqt" ]; then
|
||||
echo ">> Creating local venv with aqtinstall at $VENV ..."
|
||||
python3 -m venv "$VENV" --system-site-packages
|
||||
"$VENV/bin/pip" install --quiet aqtinstall
|
||||
fi
|
||||
"$VENV/bin/pip" show py7zr >/dev/null 2>&1 || "$VENV/bin/pip" install --quiet py7zr
|
||||
|
||||
echo ">> Installing Qt ${QT_VERSION} gcc_64 into $REPO_ROOT/.qt514/ ..."
|
||||
"$VENV/bin/aqt" install-qt linux desktop "${QT_VERSION}" gcc_64 -O "$REPO_ROOT/.qt514"
|
||||
@@ -25,5 +29,26 @@ QT_ROOT="$REPO_ROOT/.qt514/${QT_VERSION}/gcc_64"
|
||||
echo ">> Verify:"
|
||||
"$QT_ROOT/bin/qmake" -query QT_VERSION
|
||||
echo ">> Qt installed at: $QT_ROOT"
|
||||
echo ">> Build on host: cmake -S . -B build -G Ninja -DBUILD_QT_PART=ON -DCMAKE_PREFIX_PATH='$QT_ROOT' && cmake --build build"
|
||||
echo ">> Run Qt targets: tools/run_qt.sh <target>"
|
||||
|
||||
# Qt Creator ${CREATOR_VERSION} (period-matched to Qt ${QT_VERSION}). The official
|
||||
# .run installer for this vintage hard-gates its wizard behind a mandatory Qt
|
||||
# account login with no Skip option, so we pull the .run and lift its embedded
|
||||
# payload directly instead of driving the GUI. See tools/extract_qtcreator_payload.py.
|
||||
if [ -x "$CREATOR_DIR/bin/qtcreator" ]; then
|
||||
echo ">> Qt Creator already installed at $CREATOR_DIR, skipping."
|
||||
else
|
||||
echo ">> Downloading Qt Creator ${CREATOR_VERSION} .run installer ..."
|
||||
CREATOR_RUN="$(mktemp -t qtcreator-XXXXXX.run)"
|
||||
trap 'rm -f "$CREATOR_RUN"' EXIT
|
||||
curl -sL -o "$CREATOR_RUN" "$CREATOR_URL"
|
||||
echo ">> Extracting Qt Creator payload (bypassing account-gated GUI) ..."
|
||||
"$VENV/bin/python3" "$REPO_ROOT/tools/extract_qtcreator_payload.py" "$CREATOR_RUN" "$CREATOR_DIR"
|
||||
rm -f "$CREATOR_RUN"
|
||||
trap - EXIT
|
||||
fi
|
||||
echo ">> Qt Creator installed at: $CREATOR_DIR"
|
||||
"$CREATOR_DIR/bin/qtcreator" -version 2>&1 | grep "^Qt Creator" || true
|
||||
|
||||
echo ">> Build on host: cmake -S . -B build -G Ninja -DBUILD_QT_PART=ON -DCMAKE_PREFIX_PATH='$QT_ROOT' && cmake --build build"
|
||||
echo ">> Run Qt targets: tools/run_qt.sh <target>"
|
||||
echo ">> Open Qt Creator: tools/run_qtcreator.sh"
|
||||
|
||||
Executable
+13
@@ -0,0 +1,13 @@
|
||||
#!/usr/bin/env bash
|
||||
# Launch the ISOLATED Qt Creator 4.11.0 installed into .qt514/Tools/QtCreator
|
||||
# (period-matched to the isolated Qt 5.14.2 SDK), wired to open this repo's
|
||||
# CMakeLists.txt against .qt514/ by default.
|
||||
# Usage: tools/run_qtcreator.sh [args...]
|
||||
# -settingspath keeps this Creator's config separate from any system/other
|
||||
# Qt Creator install on the host (avoids config-format crashes across versions).
|
||||
set -euo pipefail
|
||||
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
|
||||
QT_ROOT="$REPO_ROOT/.qt514/5.14.2/gcc_64"
|
||||
CREATOR_BIN="$REPO_ROOT/.qt514/Tools/QtCreator/bin/qtcreator"
|
||||
export CMAKE_PREFIX_PATH="$QT_ROOT${CMAKE_PREFIX_PATH:+:$CMAKE_PREFIX_PATH}"
|
||||
exec "$CREATOR_BIN" -settingspath "$REPO_ROOT/.qt514/qtcreator-settings" "$@"
|
||||
Reference in New Issue
Block a user