From 5f72c4c6e6a272cad1d4a4e52508826bdf3dd99e Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 24 Sep 2023 15:16:51 +0300 Subject: [PATCH 1/2] qad, Jenkinsfile --- Jenkinsfile | 13 ++++++++----- qad | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a5fd3af..c78b1fa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,15 +1,18 @@ @Library('SHS.Platforms') _ -def build_docker(docker_image, docker_dir, release_dir) { - def image_name = "${docker_image}-shstk" +def build_docker(dist, release_dir) { + def image_name = "${dist.docker_image}-shstk" echo "Build image ${image_name}" def args = "" + for (arg in dist.docker_build_options) { + args += " --build-arg ${arg.key}=\"${arg.value}\"" + } if (env.DOCKER_PREFIX) { args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/" } - args += " --build-arg IMAGE_FROM=${docker_image}" + args += " --build-arg IMAGE_FROM=${dist.docker_image}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}" - def shstk_docker = docker.build("${image_name}", "./docker/${docker_dir}-shstk --no-cache ${args}") + def shstk_docker = docker.build("${image_name}", "./docker/${dist.docker_dir}-shstk --no-cache ${args}") shstk_docker.inside("-v " + release_dir + ":/soft/release") { sh 'cp -vf /soft/shstk/release/* /soft/release/ || true' } @@ -31,7 +34,7 @@ node { def _msg = "Built images:" pl.forEach ({ dist -> - _msg += build_docker(dist.docker_image, dist.docker_dir, rel_dir) + _msg += build_docker(dist, rel_dir) }, stageSuffix: "-shstk") stage("Clean") { diff --git a/qad b/qad index 1a2f5ce..5b5a374 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 1a2f5ceefcf73f10fbd0b098cd77031eb8ac52f6 +Subproject commit 5b5a3743500b1521a20c32a48d2e0aa392c8222b From 8caaf0f259df34415057e8e0300ffdf9bc321821 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sun, 24 Sep 2023 15:19:39 +0300 Subject: [PATCH 2/2] support_gl --- docker/linux_cross-shstk/Dockerfile | 3 ++- docker/linux_desktop-shstk/Dockerfile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker/linux_cross-shstk/Dockerfile b/docker/linux_cross-shstk/Dockerfile index 3bf0e1a..a3df0be 100644 --- a/docker/linux_cross-shstk/Dockerfile +++ b/docker/linux_cross-shstk/Dockerfile @@ -4,6 +4,7 @@ FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 +ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft @@ -16,7 +17,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} .. && ldconfig WORKDIR /soft/shstk_build -RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/target -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain.cmake ../shstk/ \ +RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/target -DICU=0 -DLOCAL=1 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain.cmake ../shstk/ \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \ && rm -rf * diff --git a/docker/linux_desktop-shstk/Dockerfile b/docker/linux_desktop-shstk/Dockerfile index f79a981..d6e5acb 100644 --- a/docker/linux_desktop-shstk/Dockerfile +++ b/docker/linux_desktop-shstk/Dockerfile @@ -4,13 +4,14 @@ FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 ARG JOBS_COUNT=4 +ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git WORKDIR /soft/shstk_build_linux -RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ +RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ && cmake --build ./ --target install -j${JOBS_COUNT} \ && ldconfig \ && cmake --build ./ --target deploy -j${JOBS_COUNT} \