Merge pull request 'master' (#259 ) from master into test

Reviewed-on: #259
Merge pull request 'master' (#258 ) from master into test
2024-11-21 16:32:06 +03:00 · 2024-11-20 20:03:08 +03:00 · 2024-11-16 15:46:31 +03:00
17 changed files with 31 additions and 54 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -135,7 +135,7 @@ JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 LambdaBodyIndentation: Signature
 MacroBlockBegin: "PRIVATE_DEFINITION_START|STATIC_INITIALIZER_BEGIN"
-MacroBlockEnd: "PRIVATE_DEFINITION_END|PRIVATE_DEFINITION_END_NO_INITIALIZE|STATIC_INITIALIZER_END"
+MacroBlockEnd: "PRIVATE_DEFINITION_END|STATIC_INITIALIZER_END"
 MaxEmptyLinesToKeep: 2
 NamespaceIndentation: None
 ObjCBinPackProtocolList: Auto
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,9 +5,6 @@ cmake_policy(SET CMP0020 NEW) # Automatically link Qt executables to qtmain targ
 if (POLICY CMP0053)
 	cmake_policy(SET CMP0053 NEW) # simpler variable expansion and escape sequence evaluation rules
 endif()
-if (POLICY CMP0177)
-	cmake_policy(SET CMP0177 OLD)
-endif()
 project(shstk)
 set(CMAKE_MODULE_PATH
 	"${CMAKE_CURRENT_SOURCE_DIR}"
--- a/31
+++ b/31
@@ -1,44 +1,31 @@
@Library('SHS.Platforms') _
-def build_docker(dist, release_dir, is_testing, is_debug) {
-	def image_from = "${dist.docker.image_basename}"
-	def image_name = "${dist.docker.image_basename}-shstk"
+def build_docker(dist, release_dir, is_testing) {
+	def image_name = "${dist.docker_image}-shstk"
 	if (is_testing) {
 		image_name += "-test"
 	}
-	if (is_debug) {
-		image_from += "-debug"
-		image_name += "-debug"
-	}

 	echo "Build image ${image_name}"
 	def args = ""
-	for (arg in dist.docker.build_options) {
+	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}/"
 	}
 	if (env.BRANCH_NAME) {
-		if ("${env.BRANCH_NAME}" != "shstk") {
-			args += " --build-arg BRANCH=${env.BRANCH_NAME}"
-		}
+		args += " --build-arg BRANCH=${env.BRANCH_NAME}"
 	}
-	args += " --build-arg IMAGE_FROM=${image_from}"
+	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/${dist.docker.directory}-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'
 	}
 	return "\n - ${image_name}"
 }
-properties([
-	buildDiscarder(logRotator(numToKeepStr: "2000", artifactNumToKeepStr: "10")),
-	parameters([
-		booleanParam(name: 'Debug', defaultValue: false, description: 'Build debug version')
-	]),	
-	copyArtifactPermission('*')
-]);
+properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '2000']], copyArtifactPermission('*')]);
 node {
 	stage("Download SRC") {
 		checkout scm
@@ -46,7 +33,6 @@ node {
 		
 	def currentBranch = "${env.BRANCH_NAME}"
 	def is_testing = currentBranch.toLowerCase().contains("test")
-	def is_debug = Boolean.valueOf(Debug)

 	def pl = new org.SHS.Platforms(this)
 	pl.get()
@@ -55,7 +41,6 @@ node {
 	if (is_testing) {
 		local_release_dir += '-test'
 	}
-
 	def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/' + local_release_dir
 	echo "Release to ${rel_dir}"
 	sh "rm -rvf ${rel_dir}"
@@ -63,7 +48,7 @@ node {

 	def _msg = "Built images:"
 	pl.forEach ({ dist ->
-			_msg += build_docker(dist, rel_dir, is_testing, is_debug)
+			_msg += build_docker(dist, rel_dir, is_testing)
 		},
 		stageSuffix: "-shstk",
 		ondemand: true
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/docker/android-shstk/Dockerfile
+++ b/docker/android-shstk/Dockerfile
@@ -1,6 +1,5 @@
 ARG DOCKER_PREFIX=wapmobil/
-ARG IMAGE_FROM
-FROM ${DOCKER_PREFIX}${IMAGE_FROM}
+FROM ${DOCKER_PREFIX}android

 ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999
@@ -24,22 +23,22 @@ WORKDIR /soft/shstk_build_anroid
 ENV _ANDROID_TOOLCHAIN=/usr/lib/android-sdk/ndk-bundle/build/cmake/android.toolchain.cmake

 ENV _CUR_ABI=armeabi-v7a
-RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
 && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *

 ENV _CUR_ABI=arm64-v8a
 WORKDIR /soft/shstk_build_android_${_CUR_ABI}
-RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
 && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *

 ENV _CUR_ABI=x86
 WORKDIR /soft/shstk_build_android_${_CUR_ABI}
-RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
 && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *

 ENV _CUR_ABI=x86_64
 WORKDIR /soft/shstk_build_android_${_CUR_ABI}
-RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/android/${_CUR_ABI} -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=${_ANDROID_TOOLCHAIN} -DQt5_DIR=/soft/android/qt/lib/cmake/Qt5 -DANDROID_PLATFORM=${NDK_PLATFORM} -DANDROID_ABI=${_CUR_ABI} ../shstk/ \
 && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *

 RUN mkdir -p /soft/shstk/release
--- a/docker/astra1.7-shstk/Dockerfile
+++ b/docker/astra1.7-shstk/Dockerfile
@@ -12,7 +12,7 @@ WORKDIR /soft
 RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git

 WORKDIR /soft/shstk_build_linux
-RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
 && cmake --build ./ --target install -j${JOBS_COUNT} \
 && ldconfig \
 && cmake --build ./ --target deploy -j${JOBS_COUNT} \
--- a/docker/astra1.8-shstk/Dockerfile
+++ b/docker/astra1.8-shstk/Dockerfile
@@ -12,7 +12,7 @@ WORKDIR /soft
 RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git

 WORKDIR /soft/shstk_build_linux
-RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
 && cmake --build ./ --target install -j${JOBS_COUNT} \
 && ldconfig \
 && cmake --build ./ --target deploy -j${JOBS_COUNT} \
--- a/docker/linux_cross-shstk/Dockerfile
+++ b/docker/linux_cross-shstk/Dockerfile
@@ -18,7 +18,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
 && ldconfig

 WORKDIR /soft/shstk_build
-RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -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/ \
+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 *
--- a/docker/linux_desktop-shstk/Dockerfile
+++ b/docker/linux_desktop-shstk/Dockerfile
@@ -12,7 +12,7 @@ WORKDIR /soft
 RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git

 WORKDIR /soft/shstk_build_linux
-RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
 && cmake --build ./ --target install -j${JOBS_COUNT} \
 && ldconfig \
 && cmake --build ./ --target deploy -j${JOBS_COUNT} \
--- a/docker/osx-shstk/Dockerfile
+++ b/docker/osx-shstk/Dockerfile
@@ -1,6 +1,5 @@
 ARG DOCKER_PREFIX=wapmobil/
-ARG IMAGE_FROM
-FROM ${DOCKER_PREFIX}${IMAGE_FROM}
+FROM ${DOCKER_PREFIX}osx

 ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999
@@ -17,7 +16,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
 && ldconfig

 WORKDIR /soft/shstk_build_osx
-RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../shstk/ \
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/osx -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Darwin.cmake ../shstk/ \
 && cmake --build ./ --target install -j${JOBS_COUNT} \
 && cmake --build ./ --target deploy -j${JOBS_COUNT} \
 && rm -rf *
--- a/docker/pi-shstk/Dockerfile
+++ b/docker/pi-shstk/Dockerfile
@@ -1,6 +1,5 @@
 ARG DOCKER_PREFIX=wapmobil/
-ARG IMAGE_FROM
-FROM ${DOCKER_PREFIX}${IMAGE_FROM}
+FROM ${DOCKER_PREFIX}pi

 ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999
@@ -17,7 +16,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
 && ldconfig

 WORKDIR /soft/shstk_build_pi
-RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=0 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \
 && cmake --build ./ --target install -j${JOBS_COUNT} \
 && cmake --build ./ --target deploy -j${JOBS_COUNT} \
 && rm -rf *
--- a/docker/windows-shstk/Dockerfile
+++ b/docker/windows-shstk/Dockerfile
@@ -1,6 +1,5 @@
 ARG DOCKER_PREFIX=wapmobil/
-ARG IMAGE_FROM
-FROM ${DOCKER_PREFIX}${IMAGE_FROM}
+FROM ${DOCKER_PREFIX}windows

 ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999
@@ -17,7 +16,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
 && ldconfig

 WORKDIR /soft/shstk_build_windows
-RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../shstk/ \
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/windows -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows.cmake ../shstk/ \
 && cmake --build ./ --target install -j${JOBS_COUNT} \
 && cmake --build ./ --target deploy -j${JOBS_COUNT} \
 && rm -rf *
--- a/docker/windows32-shstk/Dockerfile
+++ b/docker/windows32-shstk/Dockerfile
@@ -1,6 +1,5 @@
 ARG DOCKER_PREFIX=wapmobil/
-ARG IMAGE_FROM
-FROM ${DOCKER_PREFIX}${IMAGE_FROM}
+FROM ${DOCKER_PREFIX}windows32

 ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999
@@ -17,7 +16,7 @@ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ..
 && ldconfig

 WORKDIR /soft/shstk_build_windows32
-RUN cmake -G Ninja -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=/soft/windows32 -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows32.cmake ../shstk/ \
+RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/soft/windows32 -DICU=0 -DLOCAL=1 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-Windows32.cmake ../shstk/ \
 && cmake --build ./ --target install -j${JOBS_COUNT} \
 && cmake --build ./ --target deploy -j${JOBS_COUNT} \
 && rm -rf *
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Пелипенко Иван	6e487035e2	Merge pull request 'master' (#259 ) from master into test All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #259	2024-11-21 16:32:06 +03:00
Пелипенко Иван	340fc5162c	Merge pull request 'master' (#258 ) from master into test All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #258	2024-11-20 20:03:08 +03:00
Пелипенко Иван	65a2df2feb	Merge pull request 'master' (#255 ) from master into test All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: #255	2024-11-16 15:46:31 +03:00