pip 2.39

Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/146

.gitignore

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

.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,51 @@
-def build_docker(name) {
-    def image = "${name}-shstk"
-    echo "Build image ${image}"
+def build_docker(name, release_dir) {
+	def image_name = "${name}-shstk"
+	echo "Build image ${image_name}"
 	def pref = ""
-    if (env.DOCKER_PREFIX) {
-        pref = "--build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/"
+	if (env.DOCKER_PREFIX) {
+		pref = "--build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/"
 	}
 	def jobs = 4
-    if (env.JOBS_COUNT) {
-        jobs = "${env.JOBS_COUNT}"
+	if (env.JOBS_COUNT) {
+		jobs = "${env.JOBS_COUNT}"
 	}
 	def args = "${pref} --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER} --build-arg JOBS_COUNT=${jobs}"
-	dir ("docker/${image}") {
-	    sh "docker build ${args} --no-cache -t ${image} ."
-    }
-	return "\n - ${image}"
+	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}"
 }
 node {
 	stage("checkout") {
 		checkout scm
 	}
-    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}";
-    }
+	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:"
-    def platforms = ['debian', 'osx', 'windows', 'android', 'pi', 'ubuntu']
+	def platforms = ['debian', 'debian11', 'osx', 'windows', 'windows32', 'android', 'pi', 'ubuntu']
 	for (int i = 0; i < platforms.size(); ++i) {
-	    if (_envmap["BUILD_${platforms[i]}"] == "1") {
+		if (_envmap["BUILD_${platforms[i]}"] == "1") {
 			stage("${platforms[i]}-shstk") {
-				_msg += build_docker("${platforms[i]}")
-			}
-	    }
-	}
-	sh "docker system prune -f"
-	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'
+				_msg += build_docker("${platforms[i]}", rel_dir)
 			}
 		}
 	}
+	sh "docker system prune -f"
+	archiveArtifacts 'release/*'
+	echo "${_msg}"
 }

README.md

@@ -2,9 +2,25 @@
 
 ## Introduction
 
-This repo contains:
+SHS Toolkit is metaproject, that contains references to CMake, PIP, QAD, CD and QGLEngine.
+* CMake - many CMake helpers and wrappers
+* PIP - Platform-Independent Primitives, C++ libraries to solve many common tasks
+* QAD - Qt for Advanced Developers, many Qt-based widgets and helpers. Also provide Qt-Designer
+  plugins.
+* CD - Control/Debug toolkit, PIP-based client-server library to simplify using coefficients
+  and track some variables tasks. Also provide QAD-based pult.
+* QGLEngine - modern Qt/OpenGL-based 3D engine with PBR materials. Also provide GUI widgets
+  to edit scene and "libassimp"-based files importer.
 
-* PIP
+Each project provide Find*.cmake file with correct dependecies. So, if you call `find_package(CD)`
+then PIP and QAD will be found.
+
+Each of there projects can be built separately, but this project help you to build all at once.
+
+
+After successfully install, you can use next CMake imported targets:
+
+* PIP:
   * PIP - main library
   * PIP::USB - PIUSB (libusb)
   * PIP::Console - PIScreen
@@ -15,7 +31,7 @@ This repo contains:
   * PIP::IOUtils
   * PIP::Cloud - PIP cloud IODevices
   * PIP::Lua - PIP Lua bindings
-* QAD - Qt for Advanced Developers:
+* QAD:
   * QAD::Utils
   * QAD::Widgets - collection of extendent widgets
   * QAD::Application
@@ -26,21 +42,23 @@ This repo contains:
   * QAD::Doc - markdown helper for qt
   * QAD::PIQt - helpers to convert PIP <-> Qt types
   * QAD::PIQtUtils - Gui libraries and executables to edit PIConnection configs and watch PIIntrospection
-  * qglview - old Qt-base OpenGL engine
-* qglengine - new Qt-base OpenGL engine
+  * 
+* QGLEngine:
   * QGLEngine::Core - 3d engine
   * QGLEngine::Widgets - qt widgets for manage 3d obects and materials
-* CD
+* CD:
   * CD::Core - PIP-based client/server library for read, transmit and use custom structures of coefficients
   * CD::Qt - Qt bindings to CDUtils and "CD Pult" executable - full-featured CD client
-  
-## Compile
-This repo can be compile with GCC/MinGW/Clang, for Qt 4/5.
 
-If there is no Qt found, builds only PIP and cd_utils.
+qglview - old Qt-base OpenGL engine, has no imported target, so you should link with "qglview4" or "qglview5"
+
+## Compile
+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:
-* **LIB** - if 1 then install to system directories: MinGW on Windows, /usr/local on Linux/MacOS, ${ANDROID_SYSTEM_LIBRARY_PATH} on Android. If 0 then install to ${CMAKE_INSTALL_PREFIX}. Enabled 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
@@ -48,31 +66,32 @@ CMake options:
 
 ## Windows scripts
 Build steps:
-1. unzip mingw.7z to C:\mingw
-2. unzip qt.7z to C:\qt
-3. download and install cmake from https://cmake.org/download/
+1. Unzip mingw.7z to C:\mingw
+2. Unzip qt.7z to C:\qt
+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\7_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_CMAKE_DIR=C:\cmake or C:\Program Files\CMake
-5. run make_shstk32.bat or make_shstk64.bat
+	  set SDK_QT5_DIR=C:\qt\qt5150_win
+	- 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 previos steps, but on '5' state run make_libs_all.bat
+Build steps for both architectures: follow previous steps, but on '5' state run `make_shstk_all.bat`
 
 ## Non-Windows scripts
-Script "make_shstk.sh" compile and install SDK for current environment, e.g.
-`./make_shstk.sh -j4`
+Script "make_shstk.sh" compile and install toolkit for current environment, e.g. `./make_shstk.sh -j4`
 
 ## Docker
-This repo provide Dockerfile, e.q. so you can exec `docker build -t windows-shstk docker\windows-shstk`
-and make docker image "windows-shstk" with installed SHS SDK for Windows. Similar for other platforms.
-Dockerfile provide for platforms:
+This repo provide several Dockerfiles, so you can exec `docker build -t windows-shstk docker\windows-shstk`
+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 raspbean (pi-shstk)
+* Raspberry Pi Raspbian (pi-shstk)
 * Android ndk 21 armeabi-v71, arm64-v8a, x86, x86_64 (android-shstk)

docker/android-shstk/Dockerfile

@@ -13,8 +13,8 @@ WORKDIR /soft
 RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
 
 WORKDIR /soft/shstk_build_host
-RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
+RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
+ && cmake --build ./ --target install -j${JOBS_COUNT} \
  && rm -rf * \
  && ldconfig
 
@@ -22,22 +22,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/ \
- && make install -j${JOBS_COUNT} && rm -rf *
+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 -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 *
+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 -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 *
+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 -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 *
+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
 
 WORKDIR /soft/src

docker/debian-shstk/Dockerfile

@@ -9,8 +9,9 @@ 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} \
+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
  

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

docker/osx-shstk/Dockerfile

@@ -9,13 +9,15 @@ WORKDIR /soft
 RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
 
 WORKDIR /soft/shstk_build_host
-RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
+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_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/ \
- && make install -j${JOBS_COUNT} && rm -rf *
+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 *
 
 WORKDIR /soft/src

docker/pi-shstk/Dockerfile

@@ -9,13 +9,15 @@ WORKDIR /soft
 RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
 
 WORKDIR /soft/shstk_build_host
-RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
+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_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/ \
- && make install -j${JOBS_COUNT} && rm -rf *
+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 *
 
 WORKDIR /soft/src

docker/ubuntu-shstk/Dockerfile

@@ -9,8 +9,9 @@ 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} \
+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
  

docker/windows-shstk/Dockerfile

@@ -9,13 +9,15 @@ WORKDIR /soft
 RUN git clone -b release --single-branch --depth 1 --recursive https://git.shs.tools/SHS/shstk.git
 
 WORKDIR /soft/shstk_build_host
-RUN cmake -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
+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_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/ \
- && make install -j${JOBS_COUNT} && rm -rf *
+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 *
  
 WORKDIR /soft/src

docker/windows32-shstk/Dockerfile

@@ -0,0 +1,23 @@
+ARG DOCKER_PREFIX=wapmobil/
+FROM ${DOCKER_PREFIX}windows32
+
+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
+
+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