From 962bcc734f58ac988a4728903bd080cddc38fb2c Mon Sep 17 00:00:00 2001 From: andrey Date: Tue, 8 Sep 2020 10:27:23 +0300 Subject: [PATCH 01/78] README.md and cmake version --- CMakeLists.txt | 2 +- README.md | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fee1f3e..e6e590c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.15) +cmake_minimum_required(VERSION 3.13) cmake_policy(SET CMP0011 NEW) # don`t affect includer policies cmake_policy(SET CMP0017 NEW) # need include() with .cmake cmake_policy(SET CMP0020 NEW) # Automatically link Qt executables to qtmain target on Windows diff --git a/README.md b/README.md index 1e67437..d50851c 100644 --- a/README.md +++ b/README.md @@ -61,16 +61,18 @@ Build steps: Build steps for both architectures: - -- follow previos steps, but on '4' state run make_libs_all.bat + -- follow previos steps, but on '5' state run make_libs_all.bat ## Non-Windows scripts Script "make_shstk.sh" compile and install SDK for current environment, e.g. `./make_shstk.sh -j4` ## Docker -This repo provide Dockerfile, so you can exec `docker build -t libs .` in this directory -and make docker image "libs" with installed SHS SDK for: -* Debian 10 -* Windows x64 -* MacOS -* Android ndk 21 armeabi-v71, arm64-v8a, x86, x86_64 +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: +* Debian 10 (debian-shstk) +* Windows x64 (windows-shstk) +* MacOS (osx-shstk) +* Raspberry Pi raspbean (pi-shstk) +* Android ndk 21 armeabi-v71, arm64-v8a, x86, x86_64 (android-shstk) From ab266ddb92ae5915f03c684144922c3f1a544416 Mon Sep 17 00:00:00 2001 From: andrey Date: Tue, 8 Sep 2020 15:16:43 +0300 Subject: [PATCH 02/78] fix some warnings --- .gitmodules | 2 +- pip | 2 +- qad | 2 +- qglengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index d1bbd2f..e7b4341 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,7 +13,7 @@ [submodule "pip"] path = pip url = https://git.shs.tools/SHS/pip.git - branch = shstk + branch = master [submodule "cd"] path = cd url = https://git.shs.tools/SHS/cd.git diff --git a/pip b/pip index 0032125..b11ebc8 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 00321257b4383faa7bf4d2b4dd849322cb5fecdd +Subproject commit b11ebc8100c5a9a3f0256b27e3b282b79ede5f72 diff --git a/qad b/qad index 3d5a86e..d96c99f 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 3d5a86e21520eba00037a478dc68645ac4c2cab1 +Subproject commit d96c99f79dad66e363f8843a940d4dcdac9c1a7e diff --git a/qglengine b/qglengine index 17e38bc..07d27ff 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 17e38bc8216a50cd720b4253a0ff698ebbace4f1 +Subproject commit 07d27ff39769c9ec6c1197c3970c4e74557d8867 From d1d4956936979998f83693c1a84cb132dbc18fa8 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Tue, 8 Sep 2020 18:54:32 +0300 Subject: [PATCH 03/78] cd --- cd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cd b/cd index b43350c..92cd95f 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit b43350cb71167ad2730e286bf99320322b2cea84 +Subproject commit 92cd95f61bfe9535c727e98a73a8db2de26ef1a7 From 137c22c9a275f80ffa4ca90209c8ee37c1265317 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 10 Sep 2020 18:40:32 +0300 Subject: [PATCH 04/78] update pip and qad --- cd | 2 +- pip | 2 +- qad | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cd b/cd index 92cd95f..9844c77 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 92cd95f61bfe9535c727e98a73a8db2de26ef1a7 +Subproject commit 9844c773cd3cdd905d61208be0a2ac24c4b232d6 diff --git a/pip b/pip index b11ebc8..9a6fab9 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit b11ebc8100c5a9a3f0256b27e3b282b79ede5f72 +Subproject commit 9a6fab980c369fd6a7b2f66d3c32359a5d2a611d diff --git a/qad b/qad index d96c99f..d35be49 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit d96c99f79dad66e363f8843a940d4dcdac9c1a7e +Subproject commit d35be49a5761f619764bf0d8723b328d6718e70a From cc9959f7c7a03a89ee10296f0f8681cf5be4492d Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Fri, 11 Sep 2020 09:45:08 +0300 Subject: [PATCH 05/78] submodules --- cmake | 2 +- pip | 2 +- qad | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake b/cmake index 2f84d98..eff378a 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 2f84d98a32a2b0a0b182b509b006cc29928e7221 +Subproject commit eff378a42656f0abf3ae15c40cac924b24b0404e diff --git a/pip b/pip index b11ebc8..b3a3b32 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit b11ebc8100c5a9a3f0256b27e3b282b79ede5f72 +Subproject commit b3a3b32a6faa445faa2de20611cd331a77371c78 diff --git a/qad b/qad index d96c99f..be2870e 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit d96c99f79dad66e363f8843a940d4dcdac9c1a7e +Subproject commit be2870e116e2a5380a69caf8c0dc03e9045f9af9 From 7b75acbd9bc9379634c5bbb7238d2a7af240130e Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Fri, 11 Sep 2020 09:45:26 +0300 Subject: [PATCH 06/78] submodules --- cd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cd b/cd index 9844c77..92cd95f 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 9844c773cd3cdd905d61208be0a2ac24c4b232d6 +Subproject commit 92cd95f61bfe9535c727e98a73a8db2de26ef1a7 From 47c02508ba5d48de5d6246bb81834935c0049e43 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Fri, 11 Sep 2020 22:51:28 +0300 Subject: [PATCH 07/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index b3a3b32..e10ff53 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit b3a3b32a6faa445faa2de20611cd331a77371c78 +Subproject commit e10ff5354795e9407eb33343e90f6eb79be60c54 From d4e749b0309e50cb178e0ea270aa1dfc4b2596d4 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sun, 13 Sep 2020 15:55:07 +0300 Subject: [PATCH 08/78] update qad and cd --- cd | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cd b/cd index 92cd95f..9844c77 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 92cd95f61bfe9535c727e98a73a8db2de26ef1a7 +Subproject commit 9844c773cd3cdd905d61208be0a2ac24c4b232d6 diff --git a/qad b/qad index be2870e..aa695f8 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit be2870e116e2a5380a69caf8c0dc03e9045f9af9 +Subproject commit aa695f84945a3c145c9b869afc4297be7f2caefd From c8df368c28c3339c92d67d94830ac0166ab3805a Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 14 Sep 2020 13:37:05 +0300 Subject: [PATCH 09/78] qad update bvidTmpItem --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index aa695f8..a65549d 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit aa695f84945a3c145c9b869afc4297be7f2caefd +Subproject commit a65549d7e8f43d643dc365611a7978b8ab515084 From b7004eabbf8b988c4e27818649ccb0f75a09677b Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 14 Sep 2020 15:42:10 +0300 Subject: [PATCH 10/78] qad update --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index a65549d..5c00f1b 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit a65549d7e8f43d643dc365611a7978b8ab515084 +Subproject commit 5c00f1b9c5d9a575f249f4f427990ae24dcdd149 From 7ba676448ff95ac57a5e6350404fbc76b7c62bc9 Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 14 Sep 2020 16:48:49 +0300 Subject: [PATCH 11/78] update cd --- cd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cd b/cd index 9844c77..d50223f 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 9844c773cd3cdd905d61208be0a2ac24c4b232d6 +Subproject commit d50223f1cf03197c127243a34d5b3cd4dea8fa5c From 2a0a048bd5b5b2921ceabae9b2c5448881e3014e Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 14 Sep 2020 17:12:07 +0300 Subject: [PATCH 12/78] update findqad.cmake --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 5c00f1b..55d8e3e 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 5c00f1b9c5d9a575f249f4f427990ae24dcdd149 +Subproject commit 55d8e3eec98a828fa4327b04cb33ec16882f5468 From 23862ca5e4642bfde593224f7dea512254f8d698 Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 14 Sep 2020 17:18:10 +0300 Subject: [PATCH 13/78] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 55d8e3e..4aab13c 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 55d8e3eec98a828fa4327b04cb33ec16882f5468 +Subproject commit 4aab13cfaf49f8b9b3fbedad59eaaa11e732bb5a From fef40443bd498f832281acdf647d12e9b8fb037c Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 14 Sep 2020 17:29:50 +0300 Subject: [PATCH 14/78] requirements.txt --- requirements.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..ff77498 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,18 @@ +libicu-dev +libfftw3-dev +libsodium-dev +libassimp-dev +libmarkdown2-dev +ocl-icd-opencl-dev +zlib1g-dev +qtbase5-dev-tools +qttools5-dev +qtscript5-dev +qtdeclarative5-dev +qtpositioning5-dev +libqt5datavisualization5-dev +qt5-default +libglew-dev +liblua5.3-dev + +apt install libicu-dev libfftw3-dev libsodium-dev libassimp-dev libmarkdown2-dev ocl-icd-opencl-dev zlib1g-dev qtbase5-dev-tools qttools5-dev qtscript5-dev qtdeclarative5-dev qtpositioning5-dev libqt5datavisualization5-dev qt5-default libglew-dev liblua5.3-dev \ No newline at end of file From 3c01dbce2c3e80d3885a1c418e0fb903a019657e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?= =?UTF-8?q?=D1=80=D0=B5=D0=B9?= Date: Mon, 14 Sep 2020 18:17:46 +0300 Subject: [PATCH 15/78] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20'README.md'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d50851c..b2aac0e 100644 --- a/README.md +++ b/README.md @@ -13,17 +13,17 @@ This repo contains: * PIP::FFTW - FFT with libfftw3 * PIP::OpenCL - PIP OpenCL bindings * PIP::IOUtils - * PIP::Cloud + * PIP::Cloud - PIP cloud IODevices * PIP::Lua - PIP Lua bindings * QAD - Qt for Advanced Developers: * QAD::Utils - * QAD::Widgets + * QAD::Widgets - collection of extendent widgets * QAD::Application * QAD::Blockview - * QAD::Graphic - * QAD::SQLTable - * QAD::TouchWidgets - * QAD::Doc + * QAD::Graphic - widget for realtime visualization and publication quality 1D/2D plots + * 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::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 From ec05d5a39031a4a7c9810ebe324add9ef8370b21 Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 14 Sep 2020 18:40:29 +0300 Subject: [PATCH 16/78] update qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 4aab13c..f341211 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 4aab13cfaf49f8b9b3fbedad59eaaa11e732bb5a +Subproject commit f341211311baeab85377dbb815cd681f214811ef From ce82e0c2353da40075d0c4d8f251164e20b0ef17 Mon Sep 17 00:00:00 2001 From: andrey Date: Tue, 15 Sep 2020 12:45:16 +0300 Subject: [PATCH 17/78] update pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index e10ff53..03679bd 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit e10ff5354795e9407eb33343e90f6eb79be60c54 +Subproject commit 03679bd4c3fd30b5fd4dbdcd546c1fc24e4c9164 From a57eead7001540619cad88b0c6b504b9d4aff19e Mon Sep 17 00:00:00 2001 From: root Date: Tue, 15 Sep 2020 12:53:43 +0300 Subject: [PATCH 18/78] *sh +x --- make_shstk.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 make_shstk.sh diff --git a/make_shstk.sh b/make_shstk.sh old mode 100644 new mode 100755 From 7c81092eb9364f28dacda636135b7d3a1e0567a2 Mon Sep 17 00:00:00 2001 From: andrey Date: Tue, 15 Sep 2020 12:57:09 +0300 Subject: [PATCH 19/78] chmode +x *.sh --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index eff378a..40bfbf5 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit eff378a42656f0abf3ae15c40cac924b24b0404e +Subproject commit 40bfbf5af68b95b54c064f87067eee03a4f48560 From 15bb3ed9964616f1e108bf6a5d50f19b5c742966 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Tue, 15 Sep 2020 16:19:14 +0300 Subject: [PATCH 20/78] QAD --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index f341211..1bcef63 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit f341211311baeab85377dbb815cd681f214811ef +Subproject commit 1bcef63d3dae40cd749bd190409509aecc0ef365 From 3e315b15750827bae1001b17b6669227600ef899 Mon Sep 17 00:00:00 2001 From: andrey Date: Tue, 15 Sep 2020 16:44:17 +0300 Subject: [PATCH 21/78] pip and deploy --- cmake | 2 +- pip | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake b/cmake index 40bfbf5..996e706 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 40bfbf5af68b95b54c064f87067eee03a4f48560 +Subproject commit 996e706abd2fd6da3ffdd73cd6f8d7c8a6f53722 diff --git a/pip b/pip index 03679bd..aae5910 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 03679bd4c3fd30b5fd4dbdcd546c1fc24e4c9164 +Subproject commit aae59106f0976a89762fefd8d6c62d6f2135a2c0 From a9455812bc37399587e325f95db2ba3228adee16 Mon Sep 17 00:00:00 2001 From: andrey Date: Tue, 15 Sep 2020 16:49:22 +0300 Subject: [PATCH 22/78] cmake --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index 996e706..a92cf5d 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 996e706abd2fd6da3ffdd73cd6f8d7c8a6f53722 +Subproject commit a92cf5d0e31861f7d747121b45c5781082049adc From 84053adeb5153d7fcae648ff75c28f00d283c571 Mon Sep 17 00:00:00 2001 From: andrey Date: Tue, 15 Sep 2020 18:22:33 +0300 Subject: [PATCH 23/78] cmake --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index a92cf5d..1bc45dc 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit a92cf5d0e31861f7d747121b45c5781082049adc +Subproject commit 1bc45dcb7503a35a24804c4ab18db39fe13e8fa5 From 9a0ee80c2ee80bdef0bd46c309f5e999046fd7d4 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Wed, 16 Sep 2020 01:48:04 +0300 Subject: [PATCH 24/78] QAD --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 1bcef63..22b9abf 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 1bcef63d3dae40cd749bd190409509aecc0ef365 +Subproject commit 22b9abfcb411b6f2a7ef136265154c17c6c8b85f From f96fc25d8dc5f53ea443f2ea9be9b54d3a4a7e9b Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Wed, 16 Sep 2020 16:24:15 +0300 Subject: [PATCH 25/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index aae5910..351ad1b 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit aae59106f0976a89762fefd8d6c62d6f2135a2c0 +Subproject commit 351ad1bf304d8d089527955200121b00686f9d08 From f3b31a25fdd25a2ae3e8f341e25cf4b96bb92abe Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 17 Sep 2020 13:45:40 +0300 Subject: [PATCH 26/78] add Dockerfile for ubuntu --- Jenkinsfile | 2 +- docker/ubuntu-shstk/Dockerfile | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 docker/ubuntu-shstk/Dockerfile diff --git a/Jenkinsfile b/Jenkinsfile index de62052..bf17402 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ node { _envmap["${_n}"] = "${_v}"; } def _msg = "Built images:" - def platforms = ['debian', 'osx', 'windows', 'android', 'pi'] + def platforms = ['debian', 'osx', 'windows', 'android', 'pi', 'ubuntu'] for (int i = 0; i < platforms.size(); ++i) { if (_envmap["BUILD_${platforms[i]}"] == "1") { stage("${platforms[i]}-shstk") { diff --git a/docker/ubuntu-shstk/Dockerfile b/docker/ubuntu-shstk/Dockerfile new file mode 100644 index 0000000..d894a66 --- /dev/null +++ b/docker/ubuntu-shstk/Dockerfile @@ -0,0 +1,17 @@ +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 -DICU=0 -DLOCAL=0 -DQGLENGINE=1 -DQGLVIEW=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ + && make install -j${JOBS_COUNT} \ + && rm -rf * \ + && ldconfig + +WORKDIR /soft/src From d228382814dea9b92c1f0972a2b71cadbe40500b Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Thu, 17 Sep 2020 13:51:45 +0300 Subject: [PATCH 27/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 351ad1b..5f7c58c 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 351ad1bf304d8d089527955200121b00686f9d08 +Subproject commit 5f7c58c28eacdc91cbdd470e6e58710506aca8cb From 70cd0cc0225276b5aae6867af8280bce3e6dc1ab Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Fri, 18 Sep 2020 15:00:00 +0300 Subject: [PATCH 28/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 5f7c58c..51c7355 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 5f7c58c28eacdc91cbdd470e6e58710506aca8cb +Subproject commit 51c7355af4708b83760c27a0bf5c8849da74d1fe From 2262b5718161aaeef167120f4a6861b2f8be136e Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Wed, 23 Sep 2020 22:20:41 +0300 Subject: [PATCH 29/78] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 22b9abf..66f9e76 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 22b9abfcb411b6f2a7ef136265154c17c6c8b85f +Subproject commit 66f9e76d66effd4780639ccb9d47c15ad9142df7 From 9d2a276dcfea1e29f57ffaa4642643f2ed4b8b5b Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 24 Sep 2020 17:02:42 +0300 Subject: [PATCH 30/78] fix pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 51c7355..65b1243 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 51c7355af4708b83760c27a0bf5c8849da74d1fe +Subproject commit 65b1243426790227b77d7225484854d517c6c87c From 746e96a257111cb6996be1419c844cfcae6ad2a3 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 24 Sep 2020 18:50:59 +0300 Subject: [PATCH 31/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 65b1243..f10908a 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 65b1243426790227b77d7225484854d517c6c87c +Subproject commit f10908a7e9962089537372cd0d9f2b5d5c67b3ab From 4eb33139f153f904d93e26f156e53fd133f89a5d Mon Sep 17 00:00:00 2001 From: andrey Date: Fri, 25 Sep 2020 13:05:21 +0300 Subject: [PATCH 32/78] pip and qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 66f9e76..3245d71 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 66f9e76d66effd4780639ccb9d47c15ad9142df7 +Subproject commit 3245d71bc8506c039bf39aec6333a04f2b69b964 From 318033e48b24fbff57a8132b2d51c5c87beaedd9 Mon Sep 17 00:00:00 2001 From: andrey Date: Fri, 25 Sep 2020 13:05:58 +0300 Subject: [PATCH 33/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index f10908a..2ba05c8 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f10908a7e9962089537372cd0d9f2b5d5c67b3ab +Subproject commit 2ba05c81b130202f3a43bfc0154f1d51e78052ab From 7f6fa9b26f506fa809b31b644af53f7a42e37e3a Mon Sep 17 00:00:00 2001 From: andrey Date: Fri, 25 Sep 2020 13:35:28 +0300 Subject: [PATCH 34/78] pip tests and fix piconditionvariable --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 2ba05c8..d180c0c 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 2ba05c81b130202f3a43bfc0154f1d51e78052ab +Subproject commit d180c0c0dd34136867662895355653107bedde51 From d00cf9aebcaf1e07c22d2b0855793b28dd42182d Mon Sep 17 00:00:00 2001 From: andrey Date: Fri, 25 Sep 2020 14:08:57 +0300 Subject: [PATCH 35/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index d180c0c..c3f0cc0 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit d180c0c0dd34136867662895355653107bedde51 +Subproject commit c3f0cc0b03ddbeb863dd4ca568c4164fbd2c8d25 From 17995f89bd1284c1ec366e9c46e58d15ce19d85d Mon Sep 17 00:00:00 2001 From: andrey Date: Fri, 25 Sep 2020 14:13:54 +0300 Subject: [PATCH 36/78] fix toTimespec --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index c3f0cc0..b6583c3 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit c3f0cc0b03ddbeb863dd4ca568c4164fbd2c8d25 +Subproject commit b6583c3d02c5dcc5c878ea5fbdedbeb9b0c58ed7 From f2d65ea05dfe589987cc7a6c2e4dda81ec6fd64e Mon Sep 17 00:00:00 2001 From: andrey Date: Fri, 25 Sep 2020 14:15:56 +0300 Subject: [PATCH 37/78] fix toTimespec --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index b6583c3..b771eeb 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit b6583c3d02c5dcc5c878ea5fbdedbeb9b0c58ed7 +Subproject commit b771eebfbb50f48293404de05230f64a0dbc14aa From ace6dc689de1181d7652c5970401c4604593d4ae Mon Sep 17 00:00:00 2001 From: andrey Date: Fri, 25 Sep 2020 14:18:08 +0300 Subject: [PATCH 38/78] fix toTimespec --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index b771eeb..1ec69cc 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit b771eebfbb50f48293404de05230f64a0dbc14aa +Subproject commit 1ec69cca818d5af74f304438c6b0c924419c13d7 From 5daa297e715e2a503a273c060eb7ccc437ca2847 Mon Sep 17 00:00:00 2001 From: andrey Date: Fri, 25 Sep 2020 14:25:37 +0300 Subject: [PATCH 39/78] PIConditionVariable fix --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 1ec69cc..53cd72a 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 1ec69cca818d5af74f304438c6b0c924419c13d7 +Subproject commit 53cd72a4b0eeb8e8d23c1c83744aeb899fe8bb7f From 2435aab189412240b0e717d91995ec310922cda1 Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 26 Sep 2020 19:47:03 +0300 Subject: [PATCH 40/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 53cd72a..c971550 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 53cd72a4b0eeb8e8d23c1c83744aeb899fe8bb7f +Subproject commit c971550535df752726f8aebb1864c9ab8abc95d4 From 7773ca104c6947f2b672718f8a071061d12b6ece Mon Sep 17 00:00:00 2001 From: Andrey Date: Sat, 26 Sep 2020 19:47:47 +0300 Subject: [PATCH 41/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index c971550..ff3dfab 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit c971550535df752726f8aebb1864c9ab8abc95d4 +Subproject commit ff3dfab2707b20ff74d6bcdfe269a8466a884e36 From da4d43e606c211f93b1a4240fd80c03a5f5dc1be Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 28 Sep 2020 12:09:44 +0300 Subject: [PATCH 42/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index ff3dfab..9dc93b7 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ff3dfab2707b20ff74d6bcdfe269a8466a884e36 +Subproject commit 9dc93b73c9f7c4837540efaa1c98cd35fd6d2af9 From c86190d24d27b438ceb4cfc22eacb588ead7f6a2 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Fri, 2 Oct 2020 11:30:42 +0300 Subject: [PATCH 43/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index ff3dfab..f57f2c4 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ff3dfab2707b20ff74d6bcdfe269a8466a884e36 +Subproject commit f57f2c47f4361344cc28511802588027c7117aec From 09d73813d0a12f46e08052ae1b2656ab7e491ce3 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Thu, 8 Oct 2020 01:21:30 +0300 Subject: [PATCH 44/78] submodules --- cd | 2 +- pip | 2 +- qad | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cd b/cd index d50223f..949edb1 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit d50223f1cf03197c127243a34d5b3cd4dea8fa5c +Subproject commit 949edb1f68b6b0ab36e7354f9240c7ca285cfb4f diff --git a/pip b/pip index f57f2c4..4c0fe72 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f57f2c47f4361344cc28511802588027c7117aec +Subproject commit 4c0fe72d71a2f785e1a044e2285c4598bc1888d4 diff --git a/qad b/qad index 3245d71..cadfe12 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 3245d71bc8506c039bf39aec6333a04f2b69b964 +Subproject commit cadfe1259ec7ee5344741445bc80c6fcf78b6a8c From 168673450aa8eae763cccba48eb3745e5b97d519 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Thu, 8 Oct 2020 17:32:58 +0300 Subject: [PATCH 45/78] README.md --- README.md | 55 +++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index b2aac0e..55a644d 100644 --- a/README.md +++ b/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 - + +qglview - old Qt-base OpenGL engine, has no imported target, so you should link with "qglview4" or "qglview5" + ## 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. +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,30 +66,31 @@ 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_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 +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 ## Non-Windows scripts -Script "make_shstk.sh" compile and install SDK for current environment, e.g. +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. +This repo provide several Dockerfiles, e.q. 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 provide for platforms: * Debian 10 (debian-shstk) +* Ubuntu 20.04 (ubuntu-shstk) * Windows x64 (windows-shstk) * MacOS (osx-shstk) * Raspberry Pi raspbean (pi-shstk) From 01e12cca7177195c649fe474cb6086571395e7a7 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Thu, 8 Oct 2020 17:37:18 +0300 Subject: [PATCH 46/78] README.md --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 55a644d..9df4ed6 100644 --- a/README.md +++ b/README.md @@ -75,11 +75,9 @@ Build steps: - 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 +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 toolkit for current environment, e.g. From 1015ee03ab3d08a59ead677bcaf768bcd51c86ad Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Thu, 8 Oct 2020 17:38:47 +0300 Subject: [PATCH 47/78] README.md --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9df4ed6..2ba95e8 100644 --- a/README.md +++ b/README.md @@ -80,13 +80,12 @@ Build steps: 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 toolkit 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 several Dockerfiles, e.q. so you can exec `docker build -t windows-shstk docker\windows-shstk` +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 provide for platforms: +Dockerfile provides for next platforms: * Debian 10 (debian-shstk) * Ubuntu 20.04 (ubuntu-shstk) * Windows x64 (windows-shstk) From 8aa916a6c872e93d411f925781f138f6e55ec5b2 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Wed, 14 Oct 2020 01:48:35 +0300 Subject: [PATCH 48/78] submodules --- README.md | 4 ++-- pip | 2 +- qad | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2ba95e8..13983e8 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ After successfully install, you can use next CMake imported targets: qglview - old Qt-base OpenGL engine, has no imported target, so you should link with "qglview4" or "qglview5" ## Compile -This repo can be compile with GCC/MinGW/Clang, for Qt 4/5. +This repo can be compiled with GCC/MinGW/Clang, for Qt 4/5. If there is no Qt found, builds only PIP and CD. @@ -90,5 +90,5 @@ Dockerfile provides for next platforms: * Ubuntu 20.04 (ubuntu-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) diff --git a/pip b/pip index 4c0fe72..51775a5 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 4c0fe72d71a2f785e1a044e2285c4598bc1888d4 +Subproject commit 51775a5ee6e06e9aa8c25c7477ea7d938250cc62 diff --git a/qad b/qad index cadfe12..59711af 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit cadfe1259ec7ee5344741445bc80c6fcf78b6a8c +Subproject commit 59711afa14ea5856dc2312d5dd58481f28680ab5 From 04578be157d304c8d0a81c3c3c123720fe91cb95 Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 16 Oct 2020 12:46:00 +0300 Subject: [PATCH 49/78] pip fix --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 51775a5..80c6809 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 51775a5ee6e06e9aa8c25c7477ea7d938250cc62 +Subproject commit 80c6809e428f8c97611821e69afa085e9bd6f535 diff --git a/qad b/qad index 59711af..cadb25e 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 59711afa14ea5856dc2312d5dd58481f28680ab5 +Subproject commit cadb25e6bb798bf425eb0410f2a230baac9232be From 9a93e2ea2dca4156c519c393d541d8ab17111916 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Sat, 17 Oct 2020 21:16:44 +0300 Subject: [PATCH 50/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 80c6809..d0ef71c 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 80c6809e428f8c97611821e69afa085e9bd6f535 +Subproject commit d0ef71c9330e64642fdda535f0d3dfb1396aed0b From 35a4f9ca592df3d2fd61d0bf58fbd36a38494869 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Sun, 18 Oct 2020 19:50:27 +0300 Subject: [PATCH 51/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index d0ef71c..5078269 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit d0ef71c9330e64642fdda535f0d3dfb1396aed0b +Subproject commit 5078269d0f893f15fdbdeb62601e84be2a1a4136 From 5e39ecd18a195b5fc5b041c1c1022f09b157861e Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Sun, 18 Oct 2020 19:52:18 +0300 Subject: [PATCH 52/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 5078269..2794d86 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 5078269d0f893f15fdbdeb62601e84be2a1a4136 +Subproject commit 2794d866fd832a8b8426ad6fb1cd5f225ddd95a6 From e7dba9d6cf10463135e95de33969ff7b8b542905 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 19 Oct 2020 15:18:58 +0300 Subject: [PATCH 53/78] update pip and qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 2794d86..e0d4646 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 2794d866fd832a8b8426ad6fb1cd5f225ddd95a6 +Subproject commit e0d46463aeb4ad96f71124896e6a62d94e635a04 diff --git a/qad b/qad index cadb25e..62ccf31 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit cadb25e6bb798bf425eb0410f2a230baac9232be +Subproject commit 62ccf31b9fe169d1d2e1ceafe87e513752937765 From 986d29e8fa289d37a5ca8e43caf45e98b5109201 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 19 Oct 2020 15:20:58 +0300 Subject: [PATCH 54/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index e0d4646..94fc541 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit e0d46463aeb4ad96f71124896e6a62d94e635a04 +Subproject commit 94fc54159b48d8868bc3f0b19e505e5ec31f3ab5 From 4f314b0d6321d7bc46ccd7c69784f45b17b0e807 Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 19 Oct 2020 17:53:07 +0300 Subject: [PATCH 55/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 94fc541..ff6d5ce 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 94fc54159b48d8868bc3f0b19e505e5ec31f3ab5 +Subproject commit ff6d5cedaa2f696d2b41ebd96fe68cf36c436716 From 6ef3569c4518cf018eb4d0b51a3e322a1aeb971a Mon Sep 17 00:00:00 2001 From: Andrey Date: Mon, 19 Oct 2020 18:00:11 +0300 Subject: [PATCH 56/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index ff6d5ce..6789d06 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ff6d5cedaa2f696d2b41ebd96fe68cf36c436716 +Subproject commit 6789d068e355e36554e7c396f415536bf3a7d192 From a5e2fb3a12d2c27621f0e80927daf741c5ed97e5 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 22 Oct 2020 18:06:48 +0300 Subject: [PATCH 57/78] update --- cd | 2 +- pip | 2 +- qad | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cd b/cd index 949edb1..d6734e1 160000 --- a/cd +++ b/cd @@ -1 +1 @@ -Subproject commit 949edb1f68b6b0ab36e7354f9240c7ca285cfb4f +Subproject commit d6734e195417bd696d6680681d85f287e533ce46 diff --git a/pip b/pip index 6789d06..85dc0a4 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 6789d068e355e36554e7c396f415536bf3a7d192 +Subproject commit 85dc0a4dc46734457006d3c1dd6ffd82ee60ea30 diff --git a/qad b/qad index 62ccf31..4b1504a 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 62ccf31b9fe169d1d2e1ceafe87e513752937765 +Subproject commit 4b1504a9775247489a056fbd95a494e787037bd6 From ed2c37f015e896bdf7f192cc091863a2907aa260 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 22 Oct 2020 18:56:20 +0300 Subject: [PATCH 58/78] update pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 85dc0a4..fa85f41 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 85dc0a4dc46734457006d3c1dd6ffd82ee60ea30 +Subproject commit fa85f414db3e799d043755f469460d77b6fb50b0 From a557e854b61d8751d492b4a013bfa80e57dc9ed9 Mon Sep 17 00:00:00 2001 From: andrey Date: Fri, 23 Oct 2020 15:11:52 +0300 Subject: [PATCH 59/78] update pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index fa85f41..f951593 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit fa85f414db3e799d043755f469460d77b6fb50b0 +Subproject commit f951593c6203216a2693673146c9f31dafca652b From 07421e022b33bfa2306ed50fe2ed7d87f68174f7 Mon Sep 17 00:00:00 2001 From: andrey Date: Tue, 27 Oct 2020 14:31:57 +0300 Subject: [PATCH 60/78] update qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 4b1504a..9880d1a 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 4b1504a9775247489a056fbd95a494e787037bd6 +Subproject commit 9880d1af3c13b55f79ae424f57d0b0e38cf40ff5 From 748837f65dd4b134b5b6a01c45994db7b11c4d7d Mon Sep 17 00:00:00 2001 From: andrey Date: Fri, 30 Oct 2020 12:48:46 +0300 Subject: [PATCH 61/78] pip, qad, cmake --- cmake | 2 +- pip | 2 +- qad | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake b/cmake index 1bc45dc..ca8db42 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 1bc45dcb7503a35a24804c4ab18db39fe13e8fa5 +Subproject commit ca8db429dbbe69e5485e135c52cf93bc31779aa4 diff --git a/pip b/pip index f951593..f99cd70 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f951593c6203216a2693673146c9f31dafca652b +Subproject commit f99cd70921b3973e795fed179201fe054f3edcd9 diff --git a/qad b/qad index 9880d1a..925437f 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 9880d1af3c13b55f79ae424f57d0b0e38cf40ff5 +Subproject commit 925437f80903a9bc2dec8effcbc5db9d4216bb44 From d1e49656e9215bc496721b2583f61dd46670ea8e Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Thu, 12 Nov 2020 00:07:40 +0300 Subject: [PATCH 62/78] submodules --- cmake | 2 +- pip | 2 +- qad | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake b/cmake index ca8db42..2ae5178 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit ca8db429dbbe69e5485e135c52cf93bc31779aa4 +Subproject commit 2ae5178e588412fde6e237d47410f0a2e3255ca4 diff --git a/pip b/pip index f99cd70..ce63624 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f99cd70921b3973e795fed179201fe054f3edcd9 +Subproject commit ce636245c725ae2abdf640a43c018c0dc85cfeec diff --git a/qad b/qad index 925437f..ee6f264 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 925437f80903a9bc2dec8effcbc5db9d4216bb44 +Subproject commit ee6f264466dcf99f94eae56714212fc3f869b10f From 7b2d2f66aeeec7eb9d8bfd80b0d67e288c72eb71 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 12 Nov 2020 16:20:22 +0300 Subject: [PATCH 63/78] cmake custom copy, update pip and qad --- cmake | 2 +- pip | 2 +- qad | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake b/cmake index ca8db42..8966f58 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit ca8db429dbbe69e5485e135c52cf93bc31779aa4 +Subproject commit 8966f58f602aebd9171afe89b9f78958c07f5845 diff --git a/pip b/pip index f99cd70..ce63624 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f99cd70921b3973e795fed179201fe054f3edcd9 +Subproject commit ce636245c725ae2abdf640a43c018c0dc85cfeec diff --git a/qad b/qad index 925437f..ee6f264 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 925437f80903a9bc2dec8effcbc5db9d4216bb44 +Subproject commit ee6f264466dcf99f94eae56714212fc3f869b10f From 73114c36eecbd98cd4846916b431c8e30a33991b Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Sun, 15 Nov 2020 11:41:20 +0300 Subject: [PATCH 64/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index ce63624..5c0ef71 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ce636245c725ae2abdf640a43c018c0dc85cfeec +Subproject commit 5c0ef7173af9cb4a8a3edc1edadf4b6303c3e042 From 26ddae7596b1411cb7a290b2f843dbc565ce80c4 Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 16 Nov 2020 13:27:51 +0300 Subject: [PATCH 65/78] update pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 5c0ef71..efe2cbe 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 5c0ef7173af9cb4a8a3edc1edadf4b6303c3e042 +Subproject commit efe2cbe4b60aa70d3cb4a722ac6ca314676a9364 From 2af157d3835be308cf3eefbdbdc1f175e32c9e7c Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 16 Nov 2020 15:18:50 +0300 Subject: [PATCH 66/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index efe2cbe..65d2f6b 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit efe2cbe4b60aa70d3cb4a722ac6ca314676a9364 +Subproject commit 65d2f6b6e4ca375ddb0855463ffae174dfc3b323 From 8991f22ba9d4760f0b260f61555ca51829523620 Mon Sep 17 00:00:00 2001 From: andrey Date: Wed, 25 Nov 2020 12:50:22 +0300 Subject: [PATCH 67/78] update pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 65d2f6b..8bfd466 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 65d2f6b6e4ca375ddb0855463ffae174dfc3b323 +Subproject commit 8bfd466f6bed68c840f0d8f116409a8c001f4a01 From fb6a81b5f62eec42bcb97270e6e24f026f6935a6 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Sun, 6 Dec 2020 13:10:20 +0300 Subject: [PATCH 68/78] pip, qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 8bfd466..3c543e7 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 8bfd466f6bed68c840f0d8f116409a8c001f4a01 +Subproject commit 3c543e79f051f9177182fd79a5af456e925c573a diff --git a/qad b/qad index ee6f264..5408ad7 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit ee6f264466dcf99f94eae56714212fc3f869b10f +Subproject commit 5408ad717812ca077f474aa6a5e7fc2bcae51a29 From 4aaef8b6aa74bb17743c85d7c46ebf1e79f85428 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 24 Dec 2020 10:36:14 +0300 Subject: [PATCH 69/78] update pip qad --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index 3c543e7..ec96ade 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 3c543e79f051f9177182fd79a5af456e925c573a +Subproject commit ec96adee3f4e6f30eb66b1faafd724aec6daa166 diff --git a/qad b/qad index 5408ad7..af317cf 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 5408ad717812ca077f474aa6a5e7fc2bcae51a29 +Subproject commit af317cf4c99b98e7b846e6b592e6ce0d47873584 From f030cc355109658b92da1e1cfdb83b087911d189 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Fri, 22 Jan 2021 11:52:27 +0300 Subject: [PATCH 70/78] pip qad qgl --- pip | 2 +- qad | 2 +- qglengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pip b/pip index ec96ade..27e3085 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit ec96adee3f4e6f30eb66b1faafd724aec6daa166 +Subproject commit 27e3085cfd8fffc4c81d5aaaa1c67790d02c7d28 diff --git a/qad b/qad index af317cf..9ba018b 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit af317cf4c99b98e7b846e6b592e6ce0d47873584 +Subproject commit 9ba018b8688278c14fece78df1a06720d39b0cb4 diff --git a/qglengine b/qglengine index 07d27ff..973ee2a 160000 --- a/qglengine +++ b/qglengine @@ -1 +1 @@ -Subproject commit 07d27ff39769c9ec6c1197c3970c4e74557d8867 +Subproject commit 973ee2aa04648035730dfff710939a0a371d4bee From 0ba225f0686d84b4e226aedca2f2b11b53998021 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Sun, 24 Jan 2021 14:08:46 +0300 Subject: [PATCH 71/78] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 9ba018b..63aea62 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 9ba018b8688278c14fece78df1a06720d39b0cb4 +Subproject commit 63aea62c89341dfc61d14f8ca19361591ea91612 From 07afa116afe07678f040ee87c3d683578ab04d2e Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 25 Jan 2021 11:27:12 +0300 Subject: [PATCH 72/78] pip: disable invalid tests --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 27e3085..7b6cc1d 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 27e3085cfd8fffc4c81d5aaaa1c67790d02c7d28 +Subproject commit 7b6cc1d5efdd4a782d511bc7a1ed4d3d0e9ff3fc From a9e8a4d87a5f7859331830c6cfde5e4a356cb451 Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 28 Jan 2021 15:31:26 +0300 Subject: [PATCH 73/78] update pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index 7b6cc1d..a07c195 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit 7b6cc1d5efdd4a782d511bc7a1ed4d3d0e9ff3fc +Subproject commit a07c195dd84b7033e703614de46feca9f420a1a6 From 9d330e0fee99955d1b58b34d1ccce853d76f90aa Mon Sep 17 00:00:00 2001 From: andrey Date: Tue, 2 Feb 2021 10:52:34 +0300 Subject: [PATCH 74/78] update pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index a07c195..a80622c 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit a07c195dd84b7033e703614de46feca9f420a1a6 +Subproject commit a80622c95655bdd17e4bb4fa26a8531616003e42 From 88d0b3247ca0302477d7ad628a4764e664c027fe Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Mon, 15 Feb 2021 16:07:13 +0300 Subject: [PATCH 75/78] pip --- pip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pip b/pip index a80622c..f367ef0 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit a80622c95655bdd17e4bb4fa26a8531616003e42 +Subproject commit f367ef00f7a03e2372090ae915c768a285b9b3a7 From 0b34c9c1631994b5c7a6086ac4f4dece7dabf145 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Thu, 18 Feb 2021 15:22:54 +0300 Subject: [PATCH 76/78] qad --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 63aea62..17911b8 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 63aea62c89341dfc61d14f8ca19361591ea91612 +Subproject commit 17911b8651965379994b50344000d64bf68173c4 From 34b7bedbe65221b9e014aa905ac526bd1bc98607 Mon Sep 17 00:00:00 2001 From: Ivan Pelipenko Date: Thu, 18 Feb 2021 15:47:13 +0300 Subject: [PATCH 77/78] qad version --- qad | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qad b/qad index 17911b8..365568c 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 17911b8651965379994b50344000d64bf68173c4 +Subproject commit 365568cad74fb94058031f485c847efc5444bd74 From 30183e4e72df2b27327a6af274c3e5df00acbbbe Mon Sep 17 00:00:00 2001 From: andrey Date: Fri, 26 Feb 2021 11:08:15 +0300 Subject: [PATCH 78/78] update qad graphic --- pip | 2 +- qad | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pip b/pip index f367ef0..84ef121 160000 --- a/pip +++ b/pip @@ -1 +1 @@ -Subproject commit f367ef00f7a03e2372090ae915c768a285b9b3a7 +Subproject commit 84ef1212278d5f676148d5437d3262d01e6d3b3f diff --git a/qad b/qad index 365568c..6b4a903 160000 --- a/qad +++ b/qad @@ -1 +1 @@ -Subproject commit 365568cad74fb94058031f485c847efc5444bd74 +Subproject commit 6b4a903764ebc1a017f6e0df095dfd605fafa14e