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

Reviewed-on: #259

.clang-format

@@ -0,0 +1,224 @@
+---
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignArrayOfStructures: Left
+AlignConsecutiveAssignments:
+  Enabled:         true
+  AcrossEmptyLines: true
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveBitFields:
+  Enabled:         true
+  AcrossEmptyLines: false
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    true
+AlignConsecutiveDeclarations:
+  Enabled:         false
+  AcrossEmptyLines: false
+  AcrossComments:  false
+  AlignCompound:   false
+  PadOperators:    false
+AlignConsecutiveMacros:
+  Enabled:         true
+  AcrossEmptyLines: true
+  AcrossComments:  true
+  AlignCompound:   false
+  PadOperators:    true
+AlignEscapedNewlines: Left
+AlignOperands:   Align
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortEnumsOnASingleLine: false
+AllowShortBlocksOnASingleLine: Empty
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+AttributeMacros:
+  - __capability
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      false
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeConceptDeclarations: Always
+BreakBeforeBraces: Attach
+BreakInheritanceList: BeforeComma
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeComma
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     140
+CommentPragmas:  '^ IWYU pragma:'
+QualifierAlignment: Leave
+CompactNamespaces: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: false
+DerivePointerAlignment: false
+DisableFormat:   false
+EmptyLineAfterAccessModifier: Never
+EmptyLineBeforeAccessModifier: Always
+ExperimentalAutoDetectBinPacking: false
+PackConstructorInitializers: CurrentLine
+BasedOnStyle:    ''
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+AllowAllConstructorInitializersOnNextLine: true
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+  - piForeach
+  - piForeachC
+  - piForeachR
+  - piForeachRC
+  - piForeachCR
+IfMacros:
+  - KJ_IF_MAYBE
+IncludeBlocks:   Regroup
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+    CaseSensitive:   false
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+    CaseSensitive:   false
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentAccessModifiers: false
+IndentCaseLabels: false
+IndentCaseBlocks: false
+IndentGotoLabels: false
+IndentPPDirectives: AfterHash
+IndentExternBlock: NoIndent
+IndentRequiresClause: true
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+InsertBraces:    false
+InsertTrailingCommas: Wrapped
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+LambdaBodyIndentation: Signature
+MacroBlockBegin: "PRIVATE_DEFINITION_START|STATIC_INITIALIZER_BEGIN"
+MacroBlockEnd: "PRIVATE_DEFINITION_END|STATIC_INITIALIZER_END"
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakOpenParenthesis: 0
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyIndentedWhitespace: 0
+PointerAlignment: Middle
+PPIndentWidth:   2
+ReferenceAlignment: Middle
+ReflowComments:  true
+RemoveBracesLLVM: false
+RequiresClausePosition: OwnLine
+SeparateDefinitionBlocks: Leave
+ShortNamespaceLines: 1
+SortIncludes:    CaseSensitive
+SortJavaStaticImport: Before
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCaseColon: false
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: false
+SpaceBeforeInheritanceColon: false
+SpaceBeforeParens: ControlStatementsExceptControlMacros
+SpaceBeforeParensOptions:
+  AfterControlStatements: true
+  AfterForeachMacros: false
+  AfterFunctionDefinitionName: false
+  AfterFunctionDeclarationName: false
+  AfterIfMacros:   false
+  AfterOverloadedOperator: false
+  AfterRequiresInClause: false
+  AfterRequiresInExpression: false
+  BeforeNonEmptyParentheses: false
+SpaceAroundPointerQualifiers: Both
+SpaceBeforeRangeBasedForLoopColon: false
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  Never
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInLineCommentPrefix:
+  Minimum:         1
+  Maximum:         -1
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+BitFieldColonSpacing: After
+Standard:        c++11
+StatementAttributeLikeMacros:
+  - Q_EMIT
+  - PIMETA
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+  - PRIVATE_DECLARATION
+  - NO_COPY_CLASS
+  - FOREVER_WAIT
+  - WAIT_FOREVER
+TabWidth:        4
+UseCRLF:         false
+UseTab:          AlignWithSpaces
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
+  - NS_SWIFT_NAME
+  - CF_SWIFT_NAME
+  - PIMETA
+...
+

.editorconfig

@@ -0,0 +1,6 @@
+root = true
+
+[*.{h,c,cpp}]
+charset = utf-8
+indent_style = tab
+tab_width = 4

.gitignore

@@ -1,2 +1,5 @@
 /.svn
 CMakeLists.txt.user*
+/release
+/build
+/*_build_*

.gitmodules

@@ -1,20 +1,20 @@
 [submodule "cmake"]
 	path = cmake
-	url = https://git.shs.tools/SHS/cmake.git
+	url = ../cmake.git
 	branch = master
 [submodule "qad"]
 	path = qad
-	url = https://git.shs.tools/SHS/qad.git
+	url = ../qad.git
 	branch = master
 [submodule "qglengine"]
 	path = qglengine
-	url = https://git.shs.tools/SHS/qglengine.git
+	url = ../qglengine.git
 	branch = master
 [submodule "pip"]
 	path = pip
-	url = https://git.shs.tools/SHS/pip.git
+	url = ../pip.git
 	branch = master
 [submodule "cd"]
 	path = cd
-	url = https://git.shs.tools/SHS/cd.git
+	url = ../cd.git
 	branch = master

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+    "files.associations": {
+        "*.qs": "javascript",
+        "*.tcc": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp"
+    }
+}

CMakeLists.txt

@@ -15,6 +15,7 @@ set(CMAKE_MODULE_PATH
 	"${CMAKE_CURRENT_SOURCE_DIR}/cd_utils/cmake"
 	)
 set(ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
+set(SHSTKPROJECT 1)
 
 include(QtWraps)
 include(SHSTKMacros)
@@ -42,7 +43,7 @@ find_package(PIP REQUIRED)
 
 if (NOT CROSSTOOLS)
 
-	find_qt(Core QUIET)
+	qad_find_qt(Core QUIET)
 	if (SOME_QT_FOUND)
 
 		add_subdirectory(qad)
@@ -60,6 +61,6 @@ endif()
 
 if(WIN32 AND SOME_QT_FOUND)
 	foreach(_l ${PIP_MODULES} ${CD_MODULES})
-		qt_install(TARGETS ${_l} RUNTIME DESTINATION QtBin)
+		qad_install(TARGETS ${_l} RUNTIME DESTINATION QtBin)
 	endforeach()
 endif()

Jenkinsfile

@@ -1,62 +1,64 @@
-def build_docker(name) {
+@Library('SHS.Platforms') _
-    def image = "${name}-shstk"
+def build_docker(dist, release_dir, is_testing) {
-    echo "Build image ${image}"
+	def image_name = "${dist.docker_image}-shstk"
-	def pref = ""
+	if (is_testing) {
-    if (env.DOCKER_PREFIX) {
+		image_name += "-test"
-        pref = "--build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/"
 	}
-	def jobs = 4
+
-    if (env.JOBS_COUNT) {
+	echo "Build image ${image_name}"
-        jobs = "${env.JOBS_COUNT}"
+	def args = ""
+	for (arg in dist.docker_build_options) {
+		args += " --build-arg ${arg.key}=\"${arg.value}\""
 	}
-	def args = "${pref} --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER} --build-arg JOBS_COUNT=${jobs}"
+	if (env.DOCKER_PREFIX) {
-	dir ("docker/${image}") {
+		args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/"
-	    sh "docker build ${args} --no-cache -t ${image} ."
+	}
-    }
+	if (env.BRANCH_NAME) {
-	return "\n - ${image}"
+		args += " --build-arg BRANCH=${env.BRANCH_NAME}"
+	}
+	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_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([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '', artifactNumToKeepStr: '10', daysToKeepStr: '', numToKeepStr: '2000']], copyArtifactPermission('*')]);
 node {
-	stage("checkout") {
+	stage("Download SRC") {
 		checkout scm
 	}
-    def _envmap = [:]
+		
-    def _env = sh(script: "env", returnStdout: true).trim().split("\n")
+	def currentBranch = "${env.BRANCH_NAME}"
-    _env.each{ l -> 
+	def is_testing = currentBranch.toLowerCase().contains("test")
-        def _ind = l.indexOf('=');
+
-        def _n = l.substring(0, _ind);
+	def pl = new org.SHS.Platforms(this)
-        def _v = l.substring(_ind + 1);
+	pl.get()
-        _envmap["${_n}"] = "${_v}";
+	
-    }
+	def local_release_dir = 'release'
-	def _msg = "Built images:"
+	if (is_testing) {
-    def platforms = ['debian', 'osx', 'windows', 'android', 'pi', 'ubuntu']
+		local_release_dir += '-test'
-	for (int i = 0; i < platforms.size(); ++i) {
-	    if (_envmap["BUILD_${platforms[i]}"] == "1") {
-			stage("${platforms[i]}-shstk") {
-				_msg += build_docker("${platforms[i]}")
-			}
-	    }
 	}
-	sh "docker system prune -f"
+	def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/' + local_release_dir
+	echo "Release to ${rel_dir}"
+	sh "rm -rvf ${rel_dir}"
+	sh "mkdir -p ${rel_dir}"
+
+	def _msg = "Built images:"
+	pl.forEach ({ dist ->
+			_msg += build_docker(dist, rel_dir, is_testing)
+		},
+		stageSuffix: "-shstk",
+		ondemand: true
+	)
+
+	stage("Clean") {
+		sh "docker system prune -f"
+	}
+
+	archiveArtifacts "${local_release_dir}/*"
 	echo "${_msg}"
 }
-pipeline {
+
-	agent {
-		label 'master'
-	}
-    stages {
-		stage("PIP doc") {
-			steps {
-				checkout scm
-				sh "rm -rf share"
-				sh "rm -vf *.zip"
-				sh "mkdir -p build"
-				sh "cd build && cmake -DLOCAL=1 -DCMAKE_INSTALL_PREFIX=`pwd` ../"
-				sh "cd build && make doc"
-				sh "cd share/doc && zip -r ../../pip_doc.zip pip"
-				sh "cp share/doc/pip/html/pip.qch ./"
-				archiveArtifacts 'pip_doc.zip'
-				archiveArtifacts 'pip.qch'
-			}
-		}
-	}
-}

README.md

@@ -30,6 +30,7 @@ After successfully install, you can use next CMake imported targets:
   * PIP::OpenCL - PIP OpenCL bindings
   * PIP::IOUtils
   * PIP::Cloud - PIP cloud IODevices
+  * PIP::ClientServer - TCP Client-Server
   * PIP::Lua - PIP Lua bindings
 * QAD:
   * QAD::Utils
@@ -37,9 +38,11 @@ After successfully install, you can use next CMake imported targets:
   * QAD::Application
   * QAD::Blockview
   * QAD::Graphic - widget for realtime visualization and publication quality 1D/2D plots
+  * QAD::SQL - wrapper around QtSqlQuery for code amount reduce
   * QAD::SQLTable - widget for display and edit data based on SQL tables with relations
   * QAD::TouchWidgets - collection of widgets for touch screen interface
   * QAD::Doc - markdown helper for qt
+  * QAD::Map - OpenStreetMap map viewer and set of items
   * QAD::PIQt - helpers to convert PIP <-> Qt types
   * QAD::PIQtUtils - Gui libraries and executables to edit PIConnection configs and watch PIIntrospection
   * 
@@ -58,7 +61,7 @@ This repo can be compiled with GCC/MinGW/Clang, for Qt 4/5.
 If there is no Qt found, builds only PIP and CD.
 
 CMake options:
-* **LOCAL** - if 0 then install to system directories: MinGW on Windows, /usr/local on Linux/MacOS, ${ANDROID_SYSTEM_LIBRARY_PATH} on Android. If 1 then install to ${CMAKE_INSTALL_PREFIX}. Disabled by default
+* **LOCAL** - if 0 then install to system directories: MinGW on Windows, /usr/local on Linux/MacOS, ANDROID_SYSTEM_LIBRARY_PATH on Android. If 1 then install to CMAKE_INSTALL_PREFIX. Disabled by default
 * **UTILS** - build or not executable utilites, enabled by default
 * **DESIGNER_PLUGINS** - build or not Qt Designer plugins, enabled by default
 * **QGLVIEW** - build or not QGLView, disabled by default
@@ -71,10 +74,11 @@ Build steps:
 3. Download and install cmake from https://cmake.org/download/
 4. Prepare environment for x86 or amd64 architecture:
 	- set prefix for mingw e.g.: for C:\mingw\8_1_x32\ or C:\mingw\8_1_x64\
-	  set SDK_MINGW_DIR=C:\mingw\8_1_x
+	  set `SDK_MINGW_DIR=C:\mingw\8_1_x`
 	- set prefix for Qt5 e.g.: for C:\qt\qt5150_win32\ or C:\qt\qt5150_win64\
-	  set SDK_QT5_DIR=C:\qt\qt5150_win
+	  set `SDK_QT5_DIR=C:\qt\qt5150_win`
-	- set SDK_CMAKE_DIR=C:\cmake or C:\Program Files\CMake
+	- set path to cmake directory
+	  set `SDK_CMAKE_DIR=C:\cmake` or `C:\Program Files\CMake`
 5. Run `make_shstk32.bat` or `make_shstk64.bat`
 
 Build steps for both architectures: follow previous steps, but on '5' state run `make_shstk_all.bat`
@@ -87,7 +91,9 @@ This repo provide several Dockerfiles, so you can exec `docker build -t windows-
 and make docker image "windows-shstk" with installed SHS Toolkit for Windows. Similar for other platforms.
 Dockerfile provides for next platforms:
 * Debian 10 (debian-shstk)
+* Debian 11 (debian11-shstk)
 * Ubuntu 20.04 (ubuntu-shstk)
+* Windows x32 (windows32-shstk)
 * Windows x64 (windows-shstk)
 * MacOS (osx-shstk)
 * Raspberry Pi Raspbian (pi-shstk)

docker/android-shstk/Dockerfile

@@ -1,6 +1,7 @@
 ARG DOCKER_PREFIX=wapmobil/
 FROM ${DOCKER_PREFIX}android
 
+ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999
 ARG JOBS_COUNT=4
 ENV PATH=/opt/cmake/bin:$PATH 
@@ -10,11 +11,11 @@ ENV ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake
 ENV NDK_PLATFORM="android-21"
 
 WORKDIR /soft
-RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
+RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
 
 WORKDIR /soft/shstk_build_host
-RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
  && rm -rf * \
  && ldconfig
 
@@ -22,22 +23,24 @@ 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 -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/ \
- && make install -j${JOBS_COUNT} && rm -rf *
+ && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
 
 ENV _CUR_ABI=arm64-v8a
 WORKDIR /soft/shstk_build_android_${_CUR_ABI}
-RUN cmake -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/ \
- && make install -j${JOBS_COUNT} && rm -rf *
+ && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
 
 ENV _CUR_ABI=x86
 WORKDIR /soft/shstk_build_android_${_CUR_ABI}
-RUN cmake -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/ \
- && make install -j${JOBS_COUNT} && rm -rf *
+ && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
 
 ENV _CUR_ABI=x86_64
 WORKDIR /soft/shstk_build_android_${_CUR_ABI}
-RUN cmake -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/ \
- && make install -j${JOBS_COUNT} && rm -rf *
+ && cmake --build ./ --target install -j${JOBS_COUNT} && rm -rf *
+
+RUN mkdir -p /soft/shstk/release
 
 WORKDIR /soft/src

docker/astra1.7-shstk/Dockerfile

@@ -0,0 +1,21 @@
+ARG DOCKER_PREFIX=wapmobil/
+ARG IMAGE_FROM
+FROM ${DOCKER_PREFIX}${IMAGE_FROM}
+
+ARG BRANCH=release
+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 ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
+
+WORKDIR /soft/shstk_build_linux
+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} \
+ && rm -rf *
+ 
+WORKDIR /soft/src

docker/astra1.8-shstk/Dockerfile

@@ -0,0 +1,21 @@
+ARG DOCKER_PREFIX=wapmobil/
+ARG IMAGE_FROM
+FROM ${DOCKER_PREFIX}${IMAGE_FROM}
+
+ARG BRANCH=release
+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 ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
+
+WORKDIR /soft/shstk_build_linux
+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} \
+ && rm -rf *
+ 
+WORKDIR /soft/src

docker/debian-shstk/Dockerfile

@@ -1,17 +0,0 @@
-ARG DOCKER_PREFIX=wapmobil/
-FROM ${DOCKER_PREFIX}debian
-
-ARG LIBS_BUILD_NUMBER=9999
-ARG JOBS_COUNT=4
-ENV PATH=/opt/cmake/bin:$PATH 
-
-WORKDIR /soft
-RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
-
-WORKDIR /soft/shstk_build_debian
-RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
- && rm -rf * \
- && ldconfig
- 
-WORKDIR /soft/src

docker/linux_cross-shstk/Dockerfile

@@ -0,0 +1,26 @@
+ARG DOCKER_PREFIX=wapmobil/
+ARG IMAGE_FROM
+FROM ${DOCKER_PREFIX}${IMAGE_FROM}
+
+ARG BRANCH=release
+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 ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
+
+WORKDIR /soft/shstk_build_host
+RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
+ && rm -rf * \
+ && ldconfig
+
+WORKDIR /soft/shstk_build
+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 *
+ 
+WORKDIR /soft/src

docker/linux_desktop-shstk/Dockerfile

@@ -0,0 +1,21 @@
+ARG DOCKER_PREFIX=wapmobil/
+ARG IMAGE_FROM
+FROM ${DOCKER_PREFIX}${IMAGE_FROM}
+
+ARG BRANCH=release
+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 ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
+
+WORKDIR /soft/shstk_build_linux
+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} \
+ && rm -rf *
+ 
+WORKDIR /soft/src

docker/osx-shstk/Dockerfile

@@ -1,21 +1,24 @@
 ARG DOCKER_PREFIX=wapmobil/
 FROM ${DOCKER_PREFIX}osx
 
+ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999
 ARG JOBS_COUNT=4
 ENV PATH=/soft/osxcross/target/bin:/opt/cmake/bin:$PATH 
 
 WORKDIR /soft
-RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
+RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
 
 WORKDIR /soft/shstk_build_host
-RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
  && rm -rf * \
  && ldconfig
 
 WORKDIR /soft/shstk_build_osx
-RUN cmake -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/ \
- && make install -j${JOBS_COUNT} && rm -rf *
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
+ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
+ && rm -rf *
 
 WORKDIR /soft/src

docker/pi-shstk/Dockerfile

@@ -1,21 +1,24 @@
 ARG DOCKER_PREFIX=wapmobil/
 FROM ${DOCKER_PREFIX}pi
 
+ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999
 ARG JOBS_COUNT=4
 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
+RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
 
 WORKDIR /soft/shstk_build_host
-RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
  && rm -rf * \
  && ldconfig
 
 WORKDIR /soft/shstk_build_pi
-RUN cmake -DCMAKE_INSTALL_PREFIX=/soft/pi/usr -DICU=0 -DLOCAL=1 -DQGLENGINE=0 -DQGLVIEW=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/ \
- && make install -j${JOBS_COUNT} && rm -rf *
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
+ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
+ && rm -rf *
 
 WORKDIR /soft/src

docker/ubuntu-shstk/Dockerfile

@@ -1,17 +0,0 @@
-ARG DOCKER_PREFIX=wapmobil/
-FROM ${DOCKER_PREFIX}ubuntu
-
-ARG LIBS_BUILD_NUMBER=9999
-ARG JOBS_COUNT=4
-ENV PATH=/opt/cmake/bin:$PATH 
-
-WORKDIR /soft
-RUN git clone -b master --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
-
-WORKDIR /soft/shstk_build_ubuntu
-RUN cmake -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
- && rm -rf * \
- && ldconfig
- 
-WORKDIR /soft/src

docker/windows-shstk/Dockerfile

@@ -1,21 +1,24 @@
 ARG DOCKER_PREFIX=wapmobil/
 FROM ${DOCKER_PREFIX}windows
 
+ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999
 ARG JOBS_COUNT=4
 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
+RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
 
 WORKDIR /soft/shstk_build_host
-RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
  && rm -rf * \
  && ldconfig
 
 WORKDIR /soft/shstk_build_windows
-RUN cmake -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/ \
- && make install -j${JOBS_COUNT} && rm -rf *
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
+ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
+ && rm -rf *
  
 WORKDIR /soft/src

docker/windows32-shstk/Dockerfile

@@ -0,0 +1,24 @@
+ARG DOCKER_PREFIX=wapmobil/
+FROM ${DOCKER_PREFIX}windows32
+
+ARG BRANCH=release
+ARG LIBS_BUILD_NUMBER=9999
+ARG JOBS_COUNT=4
+ENV PATH=/opt/cmake/bin:$PATH 
+
+WORKDIR /soft
+RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
+
+WORKDIR /soft/shstk_build_host
+RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
+ && rm -rf * \
+ && ldconfig
+
+WORKDIR /soft/shstk_build_windows32
+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 *
+ 
+WORKDIR /soft/src

make_shstk.bat

@@ -5,11 +5,11 @@ if defined SDK_JOBS_COUNT (
 ) else (
 	set JOBS_COUNT=4
 ) 
-set PATH=%SDK_MINGW_DIR%%ARCH%\bin;%SDK_QT4_DIR%%ARCH%\bin;%SDK_CMAKE_DIR%\bin
+set PATH=%SDK_MINGW_DIR%%ARCH%\bin;%SDK_CMAKE_DIR%\bin
 if defined SDK_QT5_DIR set Qt5_DIR=%SDK_QT5_DIR%%ARCH%
 if not exist ..\shstk_build_win%ARCH% mkdir ..\shstk_build_win%ARCH%
 cd ..\shstk_build_win%ARCH% && ^
-cmake_mgw -DQGLVIEW=1 -DQGLENGINE=1 -DQT4=0 ../shstk && ^
+cmake -G "MinGW Makefiles" -DQGLVIEW=1 -DQGLENGINE=1 -DQT4=0 ../shstk && ^
 make install -j%JOBS_COUNT% && ^
 cd ..\shstk && ^
 pause

make_shstk.sh

@@ -2,5 +2,5 @@
 cd ..
 mkdir shstk_build_linux
 cd shstk_build_linux
-cmake ../shstk
+cmake -DQGLVIEW=1 -DQGLENGINE=1 -DQT4=0 ../shstk
 make install $@

submodules_revert.sh

@@ -0,0 +1,2 @@
+git submodule deinit --all -f
+git submodule update --recursive --init