pip 2.39

PIP 2.99, new SHSTKMacros
Merge branch 'master' of https://git.shs.tools/SHS/shstk
2022-08-08 10:36:38 +03:00 · 2022-08-07 22:08:21 +03:00 · 2022-06-09 13:50:42 +03:00 · 2022-06-09 13:50:36 +03:00 · 2022-06-09 13:46:48 +03:00 · 2022-06-09 13:41:17 +03:00
17 changed files with 67 additions and 71 deletions
--- a/27
+++ b/27
@@ -37,7 +37,7 @@ node {
 	sh "rm -rvf ${rel_dir}"
 	sh "mkdir -p ${rel_dir}"
 	def _msg = "Built images:"
-	def platforms = ['debian', 'osx', 'windows', 'windows32', '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") {
 			stage("${platforms[i]}-shstk") {
@@ -49,28 +49,3 @@ node {
 	archiveArtifacts 'release/*'
 	echo "${_msg}"
 }
-pipeline {
-	agent {
-		label 'master'
-	}
-	options {
-		copyArtifactPermission('*');
-		buildDiscarder(logRotator(numToKeepStr: "20", artifactNumToKeepStr: "10"))
-	}
-	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'
-			}
-		}
-	}
-}
--- a/README.md
+++ b/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)
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/docker/android-shstk/Dockerfile
+++ b/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,23 +22,23 @@ 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

--- a/docker/debian-shstk/Dockerfile
+++ b/docker/debian-shstk/Dockerfile
@@ -9,9 +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 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
- && make deploy -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
 
--- 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/osx-shstk/Dockerfile
+++ b/docker/osx-shstk/Dockerfile
@@ -9,15 +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} \
- && make deploy -j${JOBS_COUNT} \
+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
--- a/docker/pi-shstk/Dockerfile
+++ b/docker/pi-shstk/Dockerfile
@@ -9,15 +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 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} -DCMAKE_TOOLCHAIN_FILE=/soft/toolchain-RPi.cmake ../shstk/ \
- && make install -j${JOBS_COUNT} \
- && make deploy -j${JOBS_COUNT} \
+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
--- a/docker/ubuntu-shstk/Dockerfile
+++ b/docker/ubuntu-shstk/Dockerfile
@@ -9,9 +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 -DHAS_GL=0 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \
- && make install -j${JOBS_COUNT} \
- && make deploy -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
 
--- a/docker/windows-shstk/Dockerfile
+++ b/docker/windows-shstk/Dockerfile
@@ -9,15 +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} \
- && make deploy -j${JOBS_COUNT} \
+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
--- a/docker/windows32-shstk/Dockerfile
+++ b/docker/windows32-shstk/Dockerfile
@@ -9,15 +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_windows32
-RUN cmake -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/ \
- && make install -j${JOBS_COUNT} \
- && make deploy -j${JOBS_COUNT} \
+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
--- a/make_shstk.bat
+++ b/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
--- a/make_shstk.sh
+++ b/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 $@
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
peri4	ea57bc5cbd	pip 2.39	2022-08-08 10:36:38 +03:00
peri4	d8b843c8e8	PIP 2.99, new SHSTKMacros	2022-08-07 22:08:21 +03:00
Бычков Анлрей	56bd00ed11	Merge branch 'master' of https://git.shs.tools/SHS/shstk	2022-06-09 13:50:42 +03:00
Бычков Анлрей	2faecd4183	update submodules	2022-06-09 13:50:36 +03:00
Бычков Анлрей	e0f3df2217	Merge branch 'release' of https://git.shs.tools/SHS/shstk	2022-06-09 13:46:48 +03:00
Бычков Андрей	b8804524d4	Merge pull request 'new graphic, old pip' (#146 ) from graphic into release Some checks failed SHS Gitea/shstk/pipeline/head There was a failure building this commit Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/146	2022-06-09 13:41:17 +03:00
Бычков Анлрей	4d9ad58f11	piintrospector fixes	2022-06-09 13:40:28 +03:00
peri4	000114b53f	pip 2.39 and all other	2022-06-09 13:23:55 +03:00
Бычков Анлрей	2877d2e642	fix for new pip	2022-06-09 12:34:03 +03:00
Бычков Анлрей	93f329e26e	new graphic, old pip	2022-06-09 11:24:54 +03:00
Andrey	25a15485a5	graphic Some checks failed SHS Gitea/shstk/pipeline/head There was a failure building this commit Details	2022-05-12 08:15:54 +03:00
Andrey	10266e2f2c	теперь собирается Some checks failed SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit Details	2022-05-12 07:28:04 +03:00
peri4	17e292bc58	new PIP	2022-05-03 18:57:16 +03:00
peri4	0ab1cdaddd	pip	2022-04-23 00:45:01 +03:00
peri4	f9385b74c4	pip	2022-04-22 23:25:35 +03:00
peri4	178f7ad40e	pip	2022-04-22 21:53:05 +03:00
peri4	df7808a84f	Jenkinsfile, pip	2022-04-22 21:19:31 +03:00
Бычков Андрей	cf212c8d47	Merge pull request 'master' (#145 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head There was a failure building this commit Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/145	2022-04-20 17:07:57 +03:00
Andrey	7a3fb8218b	Merge branch 'master' of https://git.shs.tools/SHS/shstk	2022-04-20 17:07:22 +03:00
Andrey	f473119d29	graphic ru lang	2022-04-20 17:07:15 +03:00
Пелипенко Иван	816be49239	Merge pull request 'pip' (#144 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/144	2022-03-25 17:55:09 +03:00
peri4	c9a0a0d69a	pip	2022-03-25 17:55:00 +03:00
Пелипенко Иван	57aa78c740	Merge pull request 'pip' (#143 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head There was a failure building this commit Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/143	2022-03-25 17:50:38 +03:00
peri4	5874e5e1ac	pip	2022-03-25 17:47:54 +03:00
Бычков Андрей	63d8d365b8	Merge pull request 'PIString and PIChar fixes 4' (#142 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/142	2022-03-25 15:10:51 +03:00
Andrey	df9ed5de85	PIString and PIChar fixes 4	2022-03-25 15:10:42 +03:00
Бычков Андрей	dfa5a1a394	Merge pull request 'PIString and PIChar fixes 3' (#141 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/141	2022-03-25 14:10:56 +03:00
Andrey	6df7387815	PIString and PIChar fixes 3	2022-03-25 14:10:47 +03:00
Бычков Андрей	349ee2ccb5	Merge pull request 'PIString and PIChar fixes 2' (#140 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head There was a failure building this commit Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/140	2022-03-25 14:07:59 +03:00
Andrey	d04fd3cba4	PIString and PIChar fixes 2	2022-03-25 14:07:49 +03:00
Бычков Андрей	446a6734d7	Merge pull request 'PIString and PIChar fixes' (#139 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head There was a failure building this commit Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/139	2022-03-25 13:49:55 +03:00
Andrey	abf8e1e6c6	PIString and PIChar fixes	2022-03-25 13:49:44 +03:00
Бычков Андрей	f7c59ee6ac	Merge pull request 'fix PIChar' (#138 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head There was a failure building this commit Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/138	2022-03-25 12:35:23 +03:00
Andrey	75287cec2e	fix PIChar	2022-03-25 12:35:12 +03:00
Бычков Андрей	692fedb4b9	Merge pull request 'update pip doc, part 1' (#137 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head There was a failure building this commit Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/137	2022-03-25 12:13:38 +03:00
Andrey	784d12218b	update pip doc, part 1	2022-03-25 12:13:21 +03:00
Бычков Андрей	388898531b	Merge pull request 'master' (#136 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head There was a failure building this commit Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/136	2022-03-23 16:28:11 +03:00
Andrey	7ab7f64693	fix rect convert	2022-03-22 18:49:43 +03:00
Andrey	c2fa3b90ee	graphic getters	2022-03-21 15:25:27 +03:00
Andrey	396ca289fb	PILine	2022-03-21 14:16:33 +03:00
Andrey	8ac7b66ce7	README.md	2022-03-15 17:39:12 +03:00
Andrey	7a6761dc7a	fix make_shstk.bat	2022-03-15 16:58:23 +03:00
Andrey	0fd3ec141a	Merge branch 'master' of https://git.shs.tools/SHS/shstk	2022-03-15 16:58:03 +03:00
peri4	b0355ba5f5	pip, en-ru PIP doc	2022-03-14 21:54:07 +03:00
peri4	720ac4c8ed	pip, qad	2022-03-11 14:40:10 +03:00
peri4	aa5758de83	pip, qad	2022-02-14 19:13:15 +03:00
Andrey	24d2caf102	Merge branch 'master' of https://git.shs.tools/SHS/shstk	2022-02-14 13:34:39 +03:00
Пелипенко Иван	5dbeb7abbc	Merge pull request 'qglengine' (#135 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/135	2022-02-11 10:24:33 +03:00
peri4	4efd8d2860	qglengine	2022-02-11 10:23:10 +03:00
Пелипенко Иван	225c63b6d9	Merge pull request 'pip' (#134 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/134	2022-02-08 00:33:39 +03:00
peri4	0ada867018	pip	2022-02-08 00:33:25 +03:00
Пелипенко Иван	7ecc327c79	Merge pull request 'master' (#133 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head There was a failure building this commit Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/133	2022-02-08 00:28:33 +03:00
peri4	1cdffe24d7	qt6 basically worked	2022-02-08 00:28:17 +03:00
peri4	04d56182f8	pip, qad	2021-12-24 14:41:48 +03:00
Andrey	862018e3b0	Merge branch 'master' of https://git.shs.tools/SHS/shstk	2021-12-09 10:10:15 +03:00
Andrey	b8c6e41474	xz	2021-12-09 10:10:08 +03:00
Пелипенко Иван	1f9b8c239e	Merge pull request 'cmake' (#132 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/132	2021-11-21 15:17:20 +03:00
peri4	f30965fdaf	cmake	2021-11-19 20:28:21 +03:00
peri4	4165c9fe1c	qad	2021-11-19 20:20:14 +03:00
Пелипенко Иван	6b09bb70db	Merge pull request 'pip and cmake' (#131 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/131	2021-11-16 15:33:03 +03:00
Andrey	13fa88db43	pip and cmake	2021-11-16 15:32:17 +03:00
Пелипенко Иван	a9d0dd2e63	Merge pull request 'qad' (#130 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/130	2021-11-15 14:17:59 +03:00
peri4	59daed840f	qad	2021-11-15 14:17:39 +03:00
Пелипенко Иван	ebd5ef3221	Merge pull request 'master' (#129 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/129	2021-11-07 00:19:04 +03:00
peri4	cfd98b54fd	qad	2021-11-07 00:18:15 +03:00
peri4	b0c80203d0	pip	2021-10-26 13:51:00 +03:00
peri4	be5f890057	qad	2021-10-22 21:40:36 +03:00
peri4	035a2bd825	pip, qad	2021-10-22 21:35:07 +03:00
Пелипенко Иван	1625d6c68b	Merge pull request 'pip' (#128 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/128	2021-10-08 22:12:28 +03:00
peri4	cd4ede3409	pip	2021-10-08 22:11:56 +03:00
Пелипенко Иван	56b1ef1289	Merge pull request 'pip' (#127 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head There was a failure building this commit Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/127	2021-10-08 22:06:45 +03:00
peri4	3b7299747a	pip	2021-10-08 22:03:51 +03:00
Пелипенко Иван	d237969ff2	Merge pull request 'pip' (#126 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/126	2021-10-05 20:32:04 +03:00
peri4	e735fe01a2	pip	2021-10-05 20:31:27 +03:00
Пелипенко Иван	f66d7bff7d	Merge pull request 'pip, qad' (#125 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head There was a failure building this commit Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/125	2021-10-05 19:31:15 +03:00
peri4	9dba1a0091	pip, qad	2021-10-05 19:30:55 +03:00
Пелипенко Иван	a313047275	Merge pull request 'master' (#124 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/124	2021-10-01 09:29:27 +03:00
peri4	efe08dfb27	pip	2021-09-30 16:21:43 +03:00
peri4	b1b1723013	cmake	2021-09-29 16:17:57 +03:00
Пелипенко Иван	66a0f201bb	Merge pull request 'pip' (#123 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/123	2021-09-17 21:27:50 +03:00
peri4	d1cb019ef0	pip	2021-09-17 21:27:35 +03:00
Пелипенко Иван	c0dfce7c4b	Merge pull request 'master' (#122 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head There was a failure building this commit Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/122	2021-09-17 21:20:56 +03:00
peri4	70cc561136	pip	2021-09-17 21:20:30 +03:00
peri4	afe2c3d53d	pip, qad	2021-09-17 21:19:57 +03:00
Пелипенко Иван	161eafd887	Merge pull request 'pip' (#121 ) from master into release All checks were successful SHS Gitea/shstk/pipeline/head This commit looks good Details Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/121	2021-09-08 19:01:35 +03:00
peri4	8c94c2fb6f	add debian 11, migrate to ninja	2021-09-08 11:12:52 +03:00
peri4	c8dd5b4c50	pip	2021-09-03 17:13:39 +03:00