Adds ktexttemplate as apt package to new_docker_build.sh and builds successfully
This commit is contained in:
39 files changed
+647
-208
No files matched your search
@@ -209,12 +209,22 @@ APT_PACKAGES=(
|
||||
git
|
||||
)
|
||||
|
||||
# INTERFACE libraries (header-only) are built automatically as dependencies
|
||||
# Only list actual buildable targets (SHARED/STATIC libraries, executables)
|
||||
GROUP1_TARGETS=(
|
||||
ddscore
|
||||
svcCoreClient
|
||||
ddsftccore
|
||||
ddsfts
|
||||
ddsgen
|
||||
ddsQoS
|
||||
ddsconnector
|
||||
ddsfts
|
||||
)
|
||||
|
||||
GROUP4_TARGETS=(
|
||||
ddsGenericDataTests
|
||||
ddsDataTopicTests
|
||||
ddsFunctionTopicTests
|
||||
)
|
||||
|
||||
GROUP2_TARGETS=(
|
||||
@@ -284,10 +294,15 @@ BUILD_GROUP2="${BUILD_GROUP2:-ON}"
|
||||
BUILD_GROUP3="${BUILD_GROUP3:-ON}"
|
||||
RUN_CTEST="${RUN_CTEST:-ON}"
|
||||
TESTS_ONLY="${TESTS_ONLY:-OFF}"
|
||||
INTEGRATION_TEST="${INTEGRATION_TEST:-OFF}"
|
||||
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}"
|
||||
if [[ "${USE_PREBUILT_IMAGE}" == "ON" ]]; then
|
||||
DOCKER_IMAGE="${DOCKER_IMAGE:-qt-migration-builder:latest}"
|
||||
else
|
||||
DOCKER_IMAGE="${DOCKER_IMAGE:-ubuntu:26.04}"
|
||||
fi
|
||||
|
||||
if [[ $# -gt 0 ]]; then
|
||||
case "$1" in
|
||||
@@ -423,6 +438,7 @@ fi
|
||||
GROUP1_TARGETS_STRING="$(join_by ' ' "${GROUP1_TARGETS[@]}")"
|
||||
GROUP2_TARGETS_STRING="$(join_by ' ' "${GROUP2_TARGETS[@]}")"
|
||||
GROUP3_TARGETS_STRING="$(join_by ' ' "${GROUP3_TARGETS[@]}")"
|
||||
GROUP4_TARGETS_STRING="$(join_by ' ' "${GROUP4_TARGETS[@]}")"
|
||||
|
||||
HOST_TEMP_DIR="$(mktemp -d)"
|
||||
CONTAINER_SCRIPT_HOST="${HOST_TEMP_DIR}/run-build-inside-container.sh"
|
||||
@@ -484,6 +500,7 @@ mkdir -p build4
|
||||
cd build4
|
||||
|
||||
cmake .. \
|
||||
-DBUILD_TESTING=ON \
|
||||
-DBUILD_RTI="${BUILD_RTI}" \
|
||||
-DBUILD_ARCGIS=OFF \
|
||||
-DCMAKE_CXX_STANDARD=17 \
|
||||
@@ -492,9 +509,11 @@ cmake .. \
|
||||
read -r -a GROUP1_ARRAY <<< "${GROUP1_TARGETS}"
|
||||
read -r -a GROUP2_ARRAY <<< "${GROUP2_TARGETS}"
|
||||
read -r -a GROUP3_ARRAY <<< "${GROUP3_TARGETS}"
|
||||
read -r -a GROUP4_ARRAY <<< "${GROUP4_TARGETS}"
|
||||
|
||||
if [[ "${TESTS_ONLY}" != "ON" ]]; then
|
||||
run_build_group "Group 1" "${BUILD_GROUP1}" "group1_build.log" "${GROUP1_ARRAY[@]}"
|
||||
run_build_group "Group 4 (DDS Tests)" "${BUILD_GROUP1}" "group4_build.log" "${GROUP4_ARRAY[@]}"
|
||||
run_build_group "Group 2" "${BUILD_GROUP2}" "group2_build.log" "${GROUP2_ARRAY[@]}"
|
||||
run_build_group "Group 3" "${BUILD_GROUP3}" "group3_build.log" "${GROUP3_ARRAY[@]}"
|
||||
else
|
||||
@@ -532,6 +551,7 @@ docker run --rm \
|
||||
-e GROUP1_TARGETS="${GROUP1_TARGETS_STRING}" \
|
||||
-e GROUP2_TARGETS="${GROUP2_TARGETS_STRING}" \
|
||||
-e GROUP3_TARGETS="${GROUP3_TARGETS_STRING}" \
|
||||
-e GROUP4_TARGETS="${GROUP4_TARGETS_STRING}" \
|
||||
-v "${WORKSPACE_ROOT_HOST}:/workspace" \
|
||||
-v "${RTI_LICENSE_FILE_HOST}:/workspace/rti_license.dat" \
|
||||
-v "${CONTAINER_SCRIPT_HOST}:/tmp/run-build-inside-container.sh:ro" \
|
||||
|
||||
Reference in new issue
Block a user