pip

# Conflicts:
#	pip

.clang-format

@@ -135,7 +135,7 @@ JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: false
 LambdaBodyIndentation: Signature
 MacroBlockBegin: "PRIVATE_DEFINITION_START|STATIC_INITIALIZER_BEGIN"
-MacroBlockEnd: "PRIVATE_DEFINITION_END|STATIC_INITIALIZER_END"
+MacroBlockEnd: "PRIVATE_DEFINITION_END|PRIVATE_DEFINITION_END_NO_INITIALIZE|STATIC_INITIALIZER_END"
 MaxEmptyLinesToKeep: 2
 NamespaceIndentation: None
 ObjCBinPackProtocolList: Auto

CMakeLists.txt

@@ -5,6 +5,9 @@ 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}"

Jenkinsfile

@@ -1,7 +1,7 @@
 @Library('SHS.Platforms') _
 def build_docker(dist, release_dir, is_testing, is_debug) {
-	def image_from = "${dist.docker_image}"
-	def image_name = "${dist.docker_image}-shstk"
+	def image_from = "${dist.docker.image_basename}"
+	def image_name = "${dist.docker.image_basename}-shstk"
 	if (is_testing) {
 		image_name += "-test"
 	}
@@ -12,7 +12,7 @@ def build_docker(dist, release_dir, is_testing, is_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) {
@@ -26,15 +26,17 @@ def build_docker(dist, release_dir, is_testing, is_debug) {
 	args += " --build-arg IMAGE_FROM=${image_from}"
 	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_dir}-shstk --no-cache ${args}")
+	def shstk_docker = docker.build("${image_name}", "./docker/${dist.docker.directory}-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([
-	[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '2000']],
-	booleanParam(name: 'Debug', defaultValue: false, description: 'Build debug version'),
+	buildDiscarder(logRotator(numToKeepStr: "2000", artifactNumToKeepStr: "10")),
+	parameters([
+		booleanParam(name: 'Debug', defaultValue: false, description: 'Build debug version')
+	]),	
 	copyArtifactPermission('*')
 ]);
 node {

docker/android-shstk/Dockerfile

@@ -1,5 +1,6 @@
 ARG DOCKER_PREFIX=wapmobil/
-FROM ${DOCKER_PREFIX}android
+ARG IMAGE_FROM
+FROM ${DOCKER_PREFIX}${IMAGE_FROM}
 
 ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999

docker/osx-shstk/Dockerfile

@@ -1,5 +1,6 @@
 ARG DOCKER_PREFIX=wapmobil/
-FROM ${DOCKER_PREFIX}osx
+ARG IMAGE_FROM
+FROM ${DOCKER_PREFIX}${IMAGE_FROM}
 
 ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999

docker/pi-shstk/Dockerfile

@@ -1,5 +1,6 @@
 ARG DOCKER_PREFIX=wapmobil/
-FROM ${DOCKER_PREFIX}pi
+ARG IMAGE_FROM
+FROM ${DOCKER_PREFIX}${IMAGE_FROM}
 
 ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999

docker/windows-shstk/Dockerfile

@@ -1,5 +1,6 @@
 ARG DOCKER_PREFIX=wapmobil/
-FROM ${DOCKER_PREFIX}windows
+ARG IMAGE_FROM
+FROM ${DOCKER_PREFIX}${IMAGE_FROM}
 
 ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999

docker/windows32-shstk/Dockerfile

@@ -1,5 +1,6 @@
 ARG DOCKER_PREFIX=wapmobil/
-FROM ${DOCKER_PREFIX}windows32
+ARG IMAGE_FROM
+FROM ${DOCKER_PREFIX}${IMAGE_FROM}
 
 ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999