From b8c6e4147410d9912f71a5c36a5c3c805c3aa4c6 Mon Sep 17 00:00:00 2001 From: Andrey Date: Thu, 9 Dec 2021 10:10:08 +0300 Subject: [PATCH 1/9] xz --- cmake | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake b/cmake index 84f06dc..52439fe 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 84f06dce924f2c5a524d99c57d3e740e10206bf4 +Subproject commit 52439fefb25c53de798f15925b40d1a33b64e5dd diff --git a/qad b/qad index af300fe..93ffd99 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit af300fe3f923e2e7fb9e4dc2c5f968a9f95fa7d3 +Subproject commit 93ffd99b0c0f6f889cdf8f3b7604c3c3b6db54e4 From aa5758de83a01aae61949248fb69e67e508c307c Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 14 Feb 2022 19:13:15 +0300 Subject: [PATCH 2/9] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 1918e55..2a6ebc9 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 1918e55a97ba0bd9893b63b19f783872ff6305cf +Subproject commit 2a6ebc9d8db19282a3daf74df85645908958ab74 diff --git a/qad b/qad index 600b722..9bf7911 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 600b72219a3c07065e1ddfef3805271cb8eb90b2 +Subproject commit 9bf79116017bc0c734b4161f603913f4841cf3a9 From 720ac4c8edc836024d3eae5a96e113302fa0807e Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 11 Mar 2022 14:40:10 +0300 Subject: [PATCH 3/9] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 2a6ebc9..2a877fb 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 2a6ebc9d8db19282a3daf74df85645908958ab74 +Subproject commit 2a877fbb6b7aba2c544104954acba88ee322360a diff --git a/qad b/qad index 9bf7911..a93e1b8 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 9bf79116017bc0c734b4161f603913f4841cf3a9 +Subproject commit a93e1b87dea14962724927c24345dcc567114b95 From b0355ba5f51cc52cc82e6dfd9fe5e68b2f682d87 Mon Sep 17 00:00:00 2001 From: peri4 Date: Mon, 14 Mar 2022 21:54:07 +0300 Subject: [PATCH 4/9] pip, en-ru PIP doc --- Jenkinsfile | 10 ++++++---- pip | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5c739a7..d14f2cd 100644 --- a/Jenkinsfile +++ b/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' } } } diff --git a/pip b/pip index 2a877fb..7ef4321 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 2a877fbb6b7aba2c544104954acba88ee322360a +Subproject commit 7ef4321a3d4bcfeafa0796816108ada12820239f From 7a6761dc7ab5d7ffc072b9297dda1662b01beb46 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 15 Mar 2022 16:58:23 +0300 Subject: [PATCH 5/9] fix make_shstk.bat --- make_shstk.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make_shstk.bat b/make_shstk.bat index 7bf959a..5ab9795 100644 --- 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 From 8ac7b66ce7b9a8a11ebc8d380943544fe36d7e36 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 15 Mar 2022 17:39:12 +0300 Subject: [PATCH 6/9] README.md --- README.md | 5 ++++- make_shstk.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 13983e8..cbe91b8 100644 --- 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) diff --git a/make_shstk.sh b/make_shstk.sh index 4d8d381..7d0d811 100755 --- 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 $@ From 396ca289fbb29182bcd9bf433081eabe6c7df3e9 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 21 Mar 2022 14:16:33 +0300 Subject: [PATCH 7/9] PILine --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 7ef4321..866f71e 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 7ef4321a3d4bcfeafa0796816108ada12820239f +Subproject commit 866f71edb5249d6720835b0c01bf73a49388b0cb diff --git a/qad b/qad index a93e1b8..ab42582 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit a93e1b87dea14962724927c24345dcc567114b95 +Subproject commit ab4258295f4c6a4800ea83db0149e7331168f5cb From c2fa3b90ee69596df57e8ec2809fc873163d3d3d Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 21 Mar 2022 15:25:27 +0300 Subject: [PATCH 8/9] graphic getters --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index ab42582..5545f85 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit ab4258295f4c6a4800ea83db0149e7331168f5cb +Subproject commit 5545f852e19143a199e625edd106675adf05e493 From 7ab7f64693baf58c8c33b08bac97470252cd6ee7 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 22 Mar 2022 18:49:43 +0300 Subject: [PATCH 9/9] fix rect convert --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 5545f85..2319b77 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 5545f852e19143a199e625edd106675adf05e493 +Subproject commit 2319b77f84a354d8fe74bb415e0812be3886290e