Migration Scripts: Qt 6.10.2 und Submodule Support
- Dockerfile: Qt 6.10.2 Update - run_docker.sh: Submodule-aware paths - migrate_module.sh: Submodule Pfad-Anpassungen - run_final_migration.sh: BUILD_RTI support Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com> Entire-Checkpoint: 01M0JJZP1FJY4BWR3BRZW2HRN1
This commit is contained in:
4 files changed
+11
-11
No files matched your search
+5
-5
@@ -5,14 +5,14 @@ ENV DEBIAN_FRONTEND=noninteractive \
|
||||
PIP_NO_CACHE_DIR=1 \
|
||||
LANG=C.UTF-8 \
|
||||
LC_ALL=C.UTF-8 \
|
||||
QT_VERSION=6.8.3 \
|
||||
QT_VERSION=6.10.2 \
|
||||
QT_ARCH=linux_gcc_64 \
|
||||
QT_BASE_DIR=/opt/Qt \
|
||||
QT_ROOT=/opt/Qt/6.8.3/gcc_64 \
|
||||
Qt6_ROOT=/opt/Qt/6.8.3/gcc_64 \
|
||||
QT_ROOT=/opt/Qt/6.10.2/gcc_64 \
|
||||
Qt6_ROOT=/opt/Qt/6.10.2/gcc_64 \
|
||||
EXTERNAL_DIR=/repo/external \
|
||||
CMAKE_PREFIX_PATH=/usr/local:/opt/Qt/6.8.3/gcc_64:/repo/external \
|
||||
PATH=/opt/Qt/6.8.3/gcc_64/bin:$PATH
|
||||
CMAKE_PREFIX_PATH=/usr/local:/opt/Qt/6.10.2/gcc_64:/repo/external \
|
||||
PATH=/opt/Qt/6.10.2/gcc_64/bin:$PATH
|
||||
|
||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||
|
||||
|
||||
+2
-2
@@ -7,7 +7,7 @@ IMAGE_NAME="${IMAGE_NAME:-migration-pipeline:ubuntu26.04}"
|
||||
CONTAINER_USER="${CONTAINER_USER:-${USER:-runner}}"
|
||||
CONTAINER_GROUP="${CONTAINER_GROUP:-$CONTAINER_USER}"
|
||||
ENABLE_CONTAINER_SUDO="${ENABLE_CONTAINER_SUDO:-1}"
|
||||
QT_ROOT_DEFAULT="${QT_ROOT_DEFAULT:-/opt/Qt/6.8.3/gcc_64}"
|
||||
QT_ROOT_DEFAULT="${QT_ROOT_DEFAULT:-/opt/Qt/6.10.2/gcc_64}"
|
||||
|
||||
GIT_REPO_DIR=""
|
||||
WORKDIR_IN_CONTAINER=""
|
||||
@@ -38,7 +38,7 @@ Examples:
|
||||
./run_docker.sh /path/to/repo
|
||||
./run_docker.sh /path/to/repo -- bash
|
||||
./run_docker.sh --qt-smoke-test /path/to/repo
|
||||
./run_docker.sh --qt-path /opt/Qt/6.8.3/gcc_64 /path/to/repo -- bash
|
||||
./run_docker.sh --qt-path /opt/Qt/6.10.2/gcc_64 /path/to/repo -- bash
|
||||
EOF
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user