Qt6 и др

.github/workflows/ubuntu_release.yml

@@ -0,0 +1,39 @@
+name: ubuntu_release
+
+on:
+  push:
+    branches: [ experimental ]
+  pull_request:
+    branches: [ experimental ]
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Install Qt
+      uses: jurplel/[email protected]
+      with:
+        version: 6.4.0
+
+    - name: Configure CMake
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_QT6=ON
+
+    - name: Build
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --verbose
+
+    - name: Package
+      run: cpack -G DEB
+      working-directory: ${{github.workspace}}/build
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: mytetra_${{github.sha}}.deb
+        path: ${{github.workspace}}/build/mytetra*.deb

.github/workflows/ubuntu_release_qt5.yml

@@ -0,0 +1,39 @@
+name: ubuntu_release_qt5
+
+on:
+  push:
+    branches: [ experimental ]
+  pull_request:
+    branches: [ experimental ]
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Install Qt
+      uses: jurplel/[email protected]
+      with:
+        version: 5.15.2
+
+    - name: Configure CMake
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_QT6=OFF
+
+    - name: Build
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --verbose
+
+    - name: Package
+      run: cpack -G DEB
+      working-directory: ${{github.workspace}}/build
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: mytetra_qt5_${{github.sha}}.deb
+        path: ${{github.workspace}}/build/mytetra*.deb

.github/workflows/windows_release.yml

@@ -0,0 +1,42 @@
+name: windows_release
+
+on:
+  push:
+    branches: [ experimental ]
+  pull_request:
+    branches: [ experimental ]
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Install Qt
+      uses: jurplel/[email protected]
+      with:
+        version: 6.4.0
+
+    - name: Configure CMake
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_SYSTEM_MIMETEX=OFF -DUSE_QT6=ON
+
+    - name: Build
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --verbose
+
+    - name: Install
+      run: cmake --install ${{github.workspace}}/build
+
+    - name: Package
+      run: windeployqt --verbose 2 --no-compiler-runtime ${{github.workspace}}/build/mytetra_distr/mytetra.exe
+      working-directory: ${{github.workspace}}/build
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: mytetra_${{github.sha}}
+        path: ${{github.workspace}}/build/mytetra_distr/

.github/workflows/windows_release_qt5.yml

@@ -0,0 +1,42 @@
+name: windows_release_qt5
+
+on:
+  push:
+    branches: [ experimental ]
+  pull_request:
+    branches: [ experimental ]
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Install Qt
+      uses: jurplel/[email protected]
+      with:
+        version: 5.15.2
+
+    - name: Configure CMake
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_SYSTEM_MIMETEX=OFF -DUSE_QT6=OFF
+
+    - name: Build
+      run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --verbose
+
+    - name: Install
+      run: cmake --install ${{github.workspace}}/build
+
+    - name: Package
+      run: windeployqt --verbose 2 --no-compiler-runtime ${{github.workspace}}/build/mytetra_distr/mytetra.exe
+      working-directory: ${{github.workspace}}/build
+
+    - uses: actions/upload-artifact@v3
+      with:
+        name: mytetra_qt5_${{github.sha}}
+        path: ${{github.workspace}}/build/mytetra_distr/

.gitignore

@@ -18,6 +18,7 @@ qrc_mytetra.cpp
 /app/bin/*
 !/app/bin/resource
 !/app/bin/resource/*
+!/app/bin/translations.qrc
 !/app/bin/mytetra.qrc
 !/app/bin/icons.qrc
 
@@ -59,3 +60,4 @@ qrc_*.cpp
 
 /app/ui_*
 /app/user*appdatalocal*
+CMakeLists.txt.user

CMakeLists.txt

@@ -0,0 +1,116 @@
+cmake_minimum_required(VERSION 3.22)
+project("mytetra" LANGUAGES "C" "CXX")
+
+if (NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Debug")
+endif()
+
+set(CMAKE_C_STANDARD 17)
+set(CMAKE_CXX_STANDARD 17)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules/")
+include(GetGitRevisionDescription)
+git_describe_working_tree(APP_VERSION)
+
+message("compiler: ${CMAKE_CXX_COMPILER_ID}\nbuild type: ${CMAKE_BUILD_TYPE}\napp version:${APP_VERSION}")
+
+if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    set(CMAKE_C_FLAGS "/W3 /WX /EHsc /O2")
+    set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} /permissive-") #`/permissive-` somewhy required for Qt5 build
+
+    set(WIN_INSTALL_DIR "${CMAKE_BINARY_DIR}/mytetra_distr/")
+
+    # add necessary MSVC libraries to windows package. windeployqt will add necessary Qt-related libraries.
+    set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "${WIN_INSTALL_DIR}")
+    set(CMAKE_INSTALL_UCRT_LIBRARIES TRUE)
+    include(InstallRequiredSystemLibraries)
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    set(GCC_WARNS "-Wall -Wextra -Werror")
+    set(CMAKE_C_FLAGS_DEBUG     "${GCC_WARNS} -O0 -ggdb3")
+    set(CMAKE_C_FLAGS_RELEASE   "${GCC_WARNS} -O3")
+    set(CMAKE_CXX_FLAGS_DEBUG   "${CMAKE_C_FLAGS_DEBUG}")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
+
+    include(CheckPIESupported)
+    check_pie_supported() # rpmlint wants PIE
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
+    message(FATAL_ERROR "building under MacOS not supported")
+endif()
+
+option(USE_QT6 "Use Qt6 instead of Qt5" ON)
+
+if(USE_QT6)
+    find_package(Qt6 COMPONENTS Core Linguist Network PrintSupport Widgets Xml REQUIRED)
+    set(QT_LIBS Qt6::Core Qt6::Network Qt6::PrintSupport Qt6::Widgets Qt6::Xml)
+else()
+    find_package(Qt5 COMPONENTS Core LinguistTools Network PrintSupport Widgets Xml REQUIRED)
+    set(QT_LIBS Qt5::Core Qt5::Network Qt5::PrintSupport Qt5::Widgets Qt5::Xml)
+endif()
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+option(USE_SYSTEM_MIMETEX "If off, build own version of mimetex. Major linux distros have mimetex package, so no need one more" ON)
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    include(GNUInstallDirs)
+    set(CMAKE_INSTALL_PREFIX "/usr")
+    install(FILES "app/desktop/any/mytetra.desktop" DESTINATION "${CMAKE_INSTALL_DATADIR}/applications/")
+    install(FILES "app/desktop/mytetra.png" DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps/")
+    install(FILES "app/desktop/mytetra.svg" DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/scalable/apps/")
+endif()
+
+add_subdirectory("app/src")
+if (NOT USE_SYSTEM_MIMETEX)
+    add_subdirectory("thirdParty/mimetex")
+endif()
+
+find_package(Doxygen OPTIONAL_COMPONENTS dot)
+if (DOXYGEN_FOUND)
+    # output inside "${CMAKE_CURRENT_BINARY_DIR}/html/"
+    doxygen_add_docs(doc ".." WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/app/doc")
+endif()
+
+
+set(CPACK_PACKAGE_NAME "mytetra")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Personal manager for information accumulation")
+set(CPACK_PACKAGE_VERSION "${APP_VERSION}")
+set(CPACK_PACKAGE_HOMEPAGE_URL "https://webhamster.ru/site/page/index/articles/projectcode/105")
+set(CPACK_STRIP_FILES TRUE)
+set(CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
+set(CPACK_RPM_PACKAGE_LICENSE "GPLv3")
+set(CPACK_RPM_PACKAGE_ARCHITECTURE "x86_64")
+set(CPACK_RPM_PACKAGE_DESCRIPTION "This is effective personal manager for information accumulation.")
+set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/usr/share/icons")
+
+string(REGEX MATCH "[0-9]+\.[0-9]+\.[0-9]+" DEBIAN_APP_VERSION "${APP_VERSION}")
+set(CPACK_DEBIAN_PACKAGE_VERSION "${DEBIAN_APP_VERSION}")
+set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_RPM_PACKAGE_DESCRIPTION}")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Sergey M. Stepanov <[email protected]>")
+if(USE_QT6)
+    set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6,libqt6core6,libqt6gui6,libqt6network6,libqt6printsupport6,libqt6widgets6,libqt6xml6")
+else()
+    set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6,libqt5core5a,libqt5gui5,libqt5network5,libqt5printsupport5,libqt5widgets5,libqt5xml5")
+endif()
+set(CPACK_GENERATOR "DEB" "RPM")
+include(CPack)
+
+
+# Use only Release build type when building packages.
+# Generate packages with 'cpack -G DEB/RPM'.
+# To build RPM need to install cmake gcc-c++ git rpmdevtools qt{5/6}-qtbase qt6-tools/{qt5-qttools qt5-qttools-devel qt5-linguist}.
+# Recommend to check result with {rpmlint + desktop-file-utils}/lintian.
+# To build DEB need to install cmake g++ linguist-qt6 qt6-base-dev qt6-l10n-tools qt6-tools-dev qt6-tools-dev-tools.
+# For Qt5 version install qtbase5-dev qttools5-dev qttools5-dev-tools instead of qt6-related packages.
+# If using virtual machine need to install libgl1-mesa-dev also (https://forum.qt.io/post/633525).
+
+
+# to run static analysis:
+# scan-build cmake -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ <SRC_DIR>
+# scan-build make
+
+# TODO:
+# more warnings check
+# static analyzer
+# option for build crypto

README.md

@@ -4,6 +4,13 @@ MyTetra - smart manager for information collecting
 MyTetra is open source and cross platform personal manager for information accumulation. 
 It is powerful program for data memorization and structuring notes.
 
+Build status
+======================
+![ubuntu build](https://github.com/fftmp-forked/mytetra_dev/actions/workflows/ubuntu_release.yml/badge.svg?branch=experimental)
+![ubuntu Qt5 build](https://github.com/fftmp-forked/mytetra_dev/actions/workflows/ubuntu_release_qt5.yml/badge.svg?branch=experimental)
+
+![windows build](https://github.com/fftmp-forked/mytetra_dev/actions/workflows/windows_release.yml/badge.svg?branch=experimental)
+![windows Qt5 build](https://github.com/fftmp-forked/mytetra_dev/actions/workflows/windows_release_qt5.yml/badge.svg?branch=experimental)
 
 Repository mytetra_dev
 ======================
@@ -45,7 +52,7 @@ RUS: Основной репозитарий исходников для раз
 * название метода строится по принципу: этоМетодКласса;
 * название переменных строится по принципу: этоПеременная;
 * Открывающая "{" и закрывающая блок скобка "}" должны стоять на отдельных строчках.
-* Каждый вновь создаваемый метод должен содержать комментарий, описывающий что делает метод. Так же желательно описать назначение параметров метода;
+* Каждый вновь создаваемый метод должен содержать комментарий, описывающий что делает метод. Также желательно описать назначение параметров метода;
 * В заголовочном файле класса, после секции #include необходимо в комментарии написать назначение класса.
 * Каждый заголовочный файл должен иметь следующую конструкцию:
 
@@ -81,7 +88,8 @@ MyTetra является программой, написанной по при
 
 В Linux сборка проводится командами:
 ```
-qmake .
+cd <build dir>
+сmake <src dir>
 make
 ```
 
@@ -92,21 +100,11 @@ make install
 
 Установленный бинарник размещается по пути:
 ```
-/usr/local/bin/mytetra
+/usr/bin/mytetra
 ```
 
 В Linux, Windows и MacOs сборку можно сделать через QtCreator.
-Для этого в QtCreator надо открыть проект mytetra.pro, и выбрать:
+Для этого в QtCreator надо открыть корневой CMakeLists.txt и выбрать:
 ```
 Сборка - Собрать проект "mytetra"
 ```
-
-Запуск
-======
-
-Для запуска MyTetra надо запустить собранный бинарник.
-В разных операционных системах бинарник размещается по разным путям.
-Для выяснения, по какому пути расположен собранный или установленный бинарник, надо просмотреть вывод сборки или вывод установки.
-
-Для Linux и MacOs, при сборке генерируется бинарник с именем **mytetra**.
-Для Windows при сборке генерируется бинарник с именем **mytetra.exe**.

README_ENG.md

@@ -63,7 +63,8 @@ No additional build libraries are required.
 
 In Linux, the assembly is carried out by the commands:
 ```
-qmake.
+cd <build dir>
+сmake <src dir>
 make
 ```
 
@@ -74,21 +75,11 @@ make install
 
 The installed binary is located along the path:
 ```
-/ usr / local / bin / mytetra
+/usr/bin/mytetra
 ```
 
 On Linux, Windows and MacOs, building can be done through QtCreator.
-To do this, open the mytetra.pro project in QtCreator, and select:
+To do this, open root CMakeLists.txt in QtCreator, and select:
 ```
 Build - Build project "mytetra"
 ```
-
-Running
-======
-
-To run MyTetra, you need to run the compiled binary.
-Different operating systems place the binary in different paths.
-To find out which path the built or installed binary is located in, you need to view the build output or the installation output.
-
-For Linux and MacOs, build generates a binary named **mytetra**.
-For Windows, the build generates a binary named **mytetra.exe**.