pip 2.39

2022-08-08 10:36:38 +03:00
23 changed files with 107 additions and 394 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -1,224 +0,0 @@
---
-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
-...
-
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +0,0 @@
-root = true
-
-[*.{h,c,cpp}]
-charset = utf-8
-indent_style = tab
-tab_width = 4
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,3 @@
 CMakeLists.txt.user*
 /release
 /build
-/*_build_*
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,20 +1,20 @@
 [submodule "cmake"]
 	path = cmake
-	url = ../cmake.git
+	url = https://git.shs.tools/SHS/cmake.git
 	branch = master
 [submodule "qad"]
 	path = qad
-	url = ../qad.git
+	url = https://git.shs.tools/SHS/qad.git
 	branch = master
 [submodule "qglengine"]
 	path = qglengine
-	url = ../qglengine.git
+	url = https://git.shs.tools/SHS/qglengine.git
 	branch = master
 [submodule "pip"]
 	path = pip
-	url = ../pip.git
+	url = https://git.shs.tools/SHS/pip.git
 	branch = master
 [submodule "cd"]
 	path = cd
-	url = ../cd.git
+	url = https://git.shs.tools/SHS/cd.git
 	branch = master
--- a/81
+++ b/81
@@ -1,64 +1,51 @@
-@Library('SHS.Platforms') _
-def build_docker(dist, release_dir, is_testing) {
-	def image_name = "${dist.docker_image}-shstk"
-	if (is_testing) {
-		image_name += "-test"
-	}
-
+def build_docker(name, release_dir) {
+	def image_name = "${name}-shstk"
 	echo "Build image ${image_name}"
-	def args = ""
-	for (arg in dist.docker_build_options) {
-		args += " --build-arg ${arg.key}=\"${arg.value}\""
-	}
+	def pref = ""
 	if (env.DOCKER_PREFIX) {
-		args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/"
+		pref = "--build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/"
 	}
-	if (env.BRANCH_NAME) {
-		args += " --build-arg BRANCH=${env.BRANCH_NAME}"
+	def jobs = 4
+	if (env.JOBS_COUNT) {
+		jobs = "${env.JOBS_COUNT}"
 	}
-	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'
+	def args = "${pref} --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER} --build-arg JOBS_COUNT=${jobs}"
+	dir ("docker/${image_name}") {
+		sh "docker build ${args} --no-cache -t ${image_name} ."
+		def diargs = "-v " + release_dir + ":/soft/release"
+		docker.image(image_name).inside(diargs) {
+			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("Download SRC") {
+	stage("checkout") {
 		checkout scm
 	}
-		
-	def currentBranch = "${env.BRANCH_NAME}"
-	def is_testing = currentBranch.toLowerCase().contains("test")
-
-	def pl = new org.SHS.Platforms(this)
-	pl.get()
-	
-	def local_release_dir = 'release'
-	if (is_testing) {
-		local_release_dir += '-test'
-	}
-	def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/' + local_release_dir
+	def rel_dir = sh(script: "pwd", returnStdout: true).trim() + '/release'
 	echo "Release to ${rel_dir}"
+	def _envmap = [:]
+	def _env = sh(script: "env", returnStdout: true).trim().split("\n")
+	_env.each{ l -> 
+		def _ind = l.indexOf('=');
+		def _n = l.substring(0, _ind);
+		def _v = l.substring(_ind + 1);
+		_envmap["${_n}"] = "${_v}";
+	}
+	sh "mkdir -p ${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"
+	def platforms = ['debian', 'debian11', 'osx', 'windows', 'windows32', 'android', 'pi', 'ubuntu']
+	for (int i = 0; i < platforms.size(); ++i) {
+		if (_envmap["BUILD_${platforms[i]}"] == "1") {
+			stage("${platforms[i]}-shstk") {
+				_msg += build_docker("${platforms[i]}", rel_dir)
+			}
+		}
 	}
-
-	archiveArtifacts "${local_release_dir}/*"
+	sh "docker system prune -f"
+	archiveArtifacts 'release/*'
 	echo "${_msg}"
 }
-
--- a/README.md
+++ b/README.md
@@ -30,7 +30,6 @@ 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
@@ -38,11 +37,9 @@ 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
  * 
@@ -61,7 +58,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
@@ -74,11 +71,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 path to cmake directory
-	  set `SDK_CMAKE_DIR=C:\cmake` or `C:\Program Files\CMake`
+	  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`
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/docker/android-shstk/Dockerfile
+++ b/docker/android-shstk/Dockerfile
@@ -1,7 +1,6 @@
 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 
@@ -11,7 +10,7 @@ ENV ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake
 ENV NDK_PLATFORM="android-21"

 WORKDIR /soft
-RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
+RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git

 WORKDIR /soft/shstk_build_host
 RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
--- a/docker/astra1.7-shstk/Dockerfile
+++ b/docker/astra1.7-shstk/Dockerfile
@@ -1,21 +0,0 @@
-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
--- a/docker/astra1.8-shstk/Dockerfile
+++ b/docker/astra1.8-shstk/Dockerfile
@@ -1,21 +0,0 @@
-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
--- a/docker/debian-shstk/Dockerfile
+++ b/docker/debian-shstk/Dockerfile
@@ -0,0 +1,18 @@
+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 -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
+ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
+ && rm -rf * \
+ && ldconfig
+ 
+WORKDIR /soft/src
--- a/docker/debian11-shstk/Dockerfile
+++ b/docker/debian11-shstk/Dockerfile
@@ -0,0 +1,18 @@
+ARG DOCKER_PREFIX=wapmobil/
+FROM ${DOCKER_PREFIX}debian11
+
+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 -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
+ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
+ && rm -rf * \
+ && ldconfig
+ 
+WORKDIR /soft/src
--- a/docker/linux_cross-shstk/Dockerfile
+++ b/docker/linux_cross-shstk/Dockerfile
@@ -1,26 +0,0 @@
-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
--- a/docker/linux_desktop-shstk/Dockerfile
+++ b/docker/linux_desktop-shstk/Dockerfile
@@ -1,21 +0,0 @@
-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
--- a/docker/osx-shstk/Dockerfile
+++ b/docker/osx-shstk/Dockerfile
@@ -1,13 +1,12 @@
 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 ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
+RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git

 WORKDIR /soft/shstk_build_host
 RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
--- a/docker/pi-shstk/Dockerfile
+++ b/docker/pi-shstk/Dockerfile
@@ -1,13 +1,12 @@
 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 ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
+RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git

 WORKDIR /soft/shstk_build_host
 RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
--- a/docker/ubuntu-shstk/Dockerfile
+++ b/docker/ubuntu-shstk/Dockerfile
@@ -0,0 +1,18 @@
+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 -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
+ && cmake --build ./ --target deploy -j${JOBS_COUNT} \
+ && rm -rf * \
+ && ldconfig
+ 
+WORKDIR /soft/src
--- a/docker/windows-shstk/Dockerfile
+++ b/docker/windows-shstk/Dockerfile
@@ -1,13 +1,12 @@
 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 ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git
+RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git

 WORKDIR /soft/shstk_build_host
 RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
--- a/docker/windows32-shstk/Dockerfile
+++ b/docker/windows32-shstk/Dockerfile
@@ -1,13 +1,12 @@
 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
+RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git

 WORKDIR /soft/shstk_build_host
 RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2