Jenkinsfile

@@ -64,12 +64,14 @@ pipeline {
 				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 build && cmake -DLOCAL=1 -DCMAKE_INSTALL_PREFIX=`pwd` -DDOC_LANG=English -DDOC_DIR=en ../ && make doc"
+				sh "cd build && cmake -DLOCAL=1 -DCMAKE_INSTALL_PREFIX=`pwd` -DDOC_LANG=Russian -DDOC_DIR=ru ../ && make doc"
 				sh "cd share/doc && zip -r ../../pip_doc.zip pip"
-				sh "cp share/doc/pip/html/pip.qch ./"
+				sh "cp share/doc/pip/html/en/pip_en.qch ./"
+				sh "cp share/doc/pip/html/ru/pip_ru.qch ./"
 				archiveArtifacts 'pip_doc.zip'
-				archiveArtifacts 'pip.qch'
+				archiveArtifacts 'pip_en.qch'
+				archiveArtifacts 'pip_ru.qch'
 			}
 		}
 	}

README.md

@@ -74,7 +74,8 @@ Build steps:
 	  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
+	- 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 +88,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)

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 $@