From da4d43e606c211f93b1a4240fd80c03a5f5dc1be Mon Sep 17 00:00:00 2001 From: andrey Date: Mon, 28 Sep 2020 12:09:44 +0300 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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