Adds modules ./Z and ./Lts/Proxies production ready
This commit is contained in:
5 files changed
+669
-82
No files matched your search
@@ -314,9 +314,24 @@ ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
RUN apt-get update -qq && \
|
||||
apt-get install -y -qq \
|
||||
${APT_PACKAGES_STRING} && \
|
||||
${APT_PACKAGES_STRING} \
|
||||
libqt6svg6-dev \
|
||||
libgtest-dev \
|
||||
libgmock-dev \
|
||||
python3-pip && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install Qt6 packages via aqtinstall
|
||||
# Note: QtWebKit is deprecated in Qt6, use QtWebEngine instead
|
||||
# KDReports is installed via aqtinstall or built from source if needed
|
||||
# Note: qtsvg is NOT available via aqtinstall - it's provided by libqt6svg6-dev apt package
|
||||
RUN pip3 install --break-system-packages --quiet aqtinstall && \
|
||||
aqt install-qt linux desktop ${QT_VERSION} ${QT_ARCH} \
|
||||
-m qtmultimedia qtserialport qtimageformats qtwebsockets qtwebengine \
|
||||
qtpdf qtwebview qt5compat qtwebchannel qtpositioning qtlocation qtsensors \
|
||||
--outputdir ${QT_BASE_DIR} && \
|
||||
rm -rf /root/.cache/Aqt
|
||||
|
||||
CMD ["/bin/bash"]
|
||||
EOF
|
||||
|
||||
@@ -325,6 +340,27 @@ EOF
|
||||
log_info "Prebuilt Docker image created successfully: ${image_name}"
|
||||
}
|
||||
|
||||
install_qt6_packages() {
|
||||
log_info "Installing Qt6 packages via aqtinstall"
|
||||
|
||||
# Install aqtinstall if not available
|
||||
if ! command -v aqt &> /dev/null; then
|
||||
log_info "Installing aqtinstall via pip3"
|
||||
pip3 install --quiet aqtinstall
|
||||
fi
|
||||
|
||||
# Install Qt6 modules (same as app/Dockerfile)
|
||||
# Modules: qtmultimedia, qtserialport, qtimageformats, qtwebsockets, qtwebengine,
|
||||
# qtpdf, qtwebview, qt5compat, qtwebchannel, qtpositioning, qtlocation, qtsensors
|
||||
# Note: qtsvg is NOT available via aqtinstall - it's provided by libqt6svg6-dev apt package
|
||||
aqt install-qt linux desktop "${QT_VERSION:-6.10.2}" "${QT_ARCH:-linux_gcc_64}" \
|
||||
-m qtmultimedia qtserialport qtimageformats qtwebsockets qtwebengine \
|
||||
qtpdf qtwebview qt5compat qtwebchannel qtpositioning qtlocation qtsensors \
|
||||
--outputdir "${QT_BASE_DIR:-/opt/Qt}"
|
||||
|
||||
log_info "Qt6 packages installed successfully"
|
||||
}
|
||||
|
||||
require_command docker
|
||||
|
||||
if [[ ! -f ".envrc" ]]; then
|
||||
@@ -348,6 +384,11 @@ USE_PREBUILT_IMAGE="${USE_PREBUILT_IMAGE:-OFF}"
|
||||
BUILD_PREBUILT_IMAGE="${BUILD_PREBUILT_IMAGE:-OFF}"
|
||||
DELETE_PREBUILT_IMAGE="${DELETE_PREBUILT_IMAGE:-OFF}"
|
||||
DOCKER_IMAGE="${DOCKER_IMAGE:-qt-migration-builder:latest}"
|
||||
export QT_VERSION="${QT_VERSION:-6.10.2}"
|
||||
export QT_ARCH="${QT_ARCH:-linux_gcc_64}"
|
||||
# aqtinstall uses 'linux_gcc_64' but creates directory 'gcc_64'
|
||||
export QT_ARCH_DIR="${QT_ARCH_DIR:-gcc_64}"
|
||||
export QT_BASE_DIR="${QT_BASE_DIR:-/opt/Qt}"
|
||||
|
||||
if [[ $# -gt 0 ]]; then
|
||||
case "$1" in
|
||||
@@ -552,12 +593,15 @@ run_build_group() {
|
||||
}
|
||||
|
||||
if [[ "${USE_PREBUILT_IMAGE}" == "ON" ]]; then
|
||||
log_info "Using prebuilt Docker image - skipping apt-get install"
|
||||
log_info "Using prebuilt Docker image - skipping apt-get install and Qt6 package installation"
|
||||
else
|
||||
log_info "Using base image - installing apt packages"
|
||||
apt-get update -qq
|
||||
# shellcheck disable=SC2086
|
||||
apt-get install -y -qq ${APT_PACKAGES_STRING} > /dev/null 2>&1
|
||||
|
||||
# Install Qt6 packages via aqtinstall for non-prebuilt-image builds
|
||||
install_qt6_packages
|
||||
fi
|
||||
|
||||
export RTI_LICENSE_FILE=/workspace/rti_license.dat
|
||||
@@ -573,7 +617,8 @@ cmake .. \
|
||||
-DBUILD_RTI="${BUILD_RTI}" \
|
||||
-DBUILD_ARCGIS=OFF \
|
||||
-DCMAKE_CXX_STANDARD=17 \
|
||||
-DCMAKE_BUILD_TYPE=Release
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_PREFIX_PATH="${QT_BASE_DIR}/${QT_VERSION}/${QT_ARCH_DIR}"
|
||||
|
||||
read -r -a GROUP1_ARRAY <<< "${GROUP1_TARGETS}"
|
||||
read -r -a GROUP2_ARRAY <<< "${GROUP2_TARGETS}"
|
||||
@@ -617,6 +662,10 @@ docker run --rm \
|
||||
-e TESTS_ONLY \
|
||||
-e INTEGRATION_TEST \
|
||||
-e USE_PREBUILT_IMAGE \
|
||||
-e QT_VERSION \
|
||||
-e QT_ARCH \
|
||||
-e QT_ARCH_DIR \
|
||||
-e QT_BASE_DIR \
|
||||
-e APT_PACKAGES_STRING="${APT_PACKAGES_STRING}" \
|
||||
-e GROUP1_TARGETS="${GROUP1_TARGETS_STRING}" \
|
||||
-e GROUP2_TARGETS="${GROUP2_TARGETS_STRING}" \
|
||||
|
||||
Reference in new issue
Block a user