Merge branch 'master' into fix/taskbar_icon

Author: iakov

.github/workflows/codacy-analysis.yml

@@ -21,13 +21,13 @@ jobs:
     steps:
       # Checkout the repository to the GitHub Actions runner
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: true
 
       # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
       - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@v4.4.5
+        uses: codacy/codacy-analysis-cli-action@v4.4.7
         with:
           # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
           # You can also omit the token and run the tools that support default configurations

.github/workflows/common_build.yml

@@ -40,7 +40,7 @@ jobs:
     uses: ./.github/workflows/setup_environment.yml
     with:
       os: ubuntu-latest
-      lint: true
+      lint_vera: true
       build: false
       build_installer: false
 
@@ -93,6 +93,7 @@ jobs:
       build_installer: false
       qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=use_system_qscintilla2 CONFIG+=use_system_quazip"
       trik_python3_version_minor: 10
+      lint_clazy: true
 
   build-ubuntu-debug-tests:
     needs: lint
@@ -113,6 +114,7 @@ jobs:
       container_name: alt:latest
       build: true
       build_installer: false
+      trik_python3_version_minor: 12
       qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers"
       tests: true
 
@@ -139,7 +141,8 @@ jobs:
       os: ubuntu-latest
       container_name: rockylinux:8
       build: true
-      build_installer: false
+      build_installer: true
+      need_deploy: false
       qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=sanitizer CONFIG+=sanitize-undefined CONFIG+=sanitize_address"
       gcc_version: 13
       trik_qt_version: 5.15
@@ -192,7 +195,7 @@ jobs:
     uses: ./.github/workflows/installer.yml
     with:
       os: ubuntu-latest
-      container_name: registry.astralinux.ru/library/astra/ubi18:latest
+      container_name: registry.astralinux.ru/library/astra/ubi18-python311:1.8.1
       artifact_name: linux-installer
 
   install-archlinux-installer:

.github/workflows/installer.yml

@@ -47,7 +47,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-        apt-get update && apt-get install -y --no-install-recommends git-core p7zip-full curl sudo
+        apt-get update && apt-get install -y --no-install-recommends git-core p7zip-full curl sudo locales
         sed -i 's/^# \(WHEEL_USERS.*\)/\1/' /etc/sudoers
       if: contains(inputs.container_name, 'astra')
 
@@ -66,15 +66,18 @@ jobs:
     - name: Install dependencies
       run: HOMEBREW_NO_INSTALL_CLEANUP=1 HOMEBREW_NO_AUTO_UPDATE=1 brew install p7zip || brew upgrade p7zip
       if: startsWith(inputs.os, 'mac')
-      
+
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         submodules: recursive
         fetch-depth: 1
 
+    - name: Set locale
+      run: echo "LANG=C.UTF-8" >> $GITHUB_ENV
+
     - name: Download installer artifact
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v5
       with:
         name: ${{ inputs.artifact_name }}
 
@@ -137,7 +140,7 @@ jobs:
     - name: Run minimal Python interpeter tests in direct script mode
       run: |
         PATH="" $SHELL -c 'for i in "$GITHUB_WORKSPACE"/tests/*.qrs; do "$TWOD_EXEC_NAME" --generate-path "$i".py \
-         --close -s 5 --script-path "$i".py -m script "$i"; done'
+          --generate-mode python --close -s 5 --script-path "$i".py -m script "$i"; done'
       timeout-minutes: 15
 
     - name: Run minimal Javascript interpeter tests as fields in .qrs (For backward compatibility)
@@ -151,3 +154,16 @@ jobs:
         PATH="" $SHELL -c 'for i in "$GITHUB_WORKSPACE"/tests/*.qrs; do "$PATCHER_NAME" -s "$i".py "$i" \
          && "$TWOD_EXEC_NAME" --close -s 5 -m script "$i"; done'
       timeout-minutes: 5
+
+    - name: Run nxt generation tests
+      run: |
+        curl --output nxt_tests.7z "https://dl.trikset.com/edu/.solutions20200701/nxt_generation.7z"
+        7z x nxt_tests.7z || 7za x nxt_tests.7z
+        set -x
+        for i in "$GITHUB_WORKSPACE"/nxt/*.qrs;
+        do
+          "$TWOD_EXEC_NAME" --generate-mode nxt --generate-path "$i".c --only-generate "$i"
+          ls "$GITHUB_WORKSPACE"/nxt/
+          cat "$i".c
+        done
+      timeout-minutes: 5

.github/workflows/setup_environment.yml

@@ -10,10 +10,18 @@ on:
         required: false
         type: string
         default: "time"
-      lint:
+      lint_vera:
         required: false
         type: boolean
         default: false
+      lint_clazy:
+        required: false
+        type: boolean
+        default: false
+      need_deploy:
+        required: false
+        type: boolean
+        default: true
       build:
         required: true
         type: boolean
@@ -90,12 +98,13 @@ jobs:
       run: |
           git config --global core.symlinks true
           git config --global core.autocrlf input
+          echo "BUILD_DIR=${{ github.workspace }}/build" >> $GITHUB_ENV
 
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         submodules: recursive
-        fetch-depth: 0
+        fetch-depth: 2
 
     - name: Remove thirdparty submodules (use from libs from distro)
       run: |
@@ -120,11 +129,11 @@ jobs:
         INSTALL_INSTALLER_ENVIRONMENT: ${{ inputs.linux_installer_environment }}
       if: ${{ inputs.build }}
 
-    - name: Lint
+    - name: Lint Vera
       run: |
           sudo apt-get update && sudo apt-get install -y --no-install-recommends qttools5-dev-tools qtbase5-dev vera++ 
           ${{ inputs.executor }} buildScripts/github/vera_translation.sh
-      if: ${{ inputs.lint }}
+      if: ${{ inputs.lint_vera }}
 
     - name: Restore cache
       uses: actions/cache@v4
@@ -138,7 +147,7 @@ jobs:
       if: ${{ inputs.build }}
 
     - name: Build
-      run: buildScripts/github/build.sh
+      run: "$GITHUB_WORKSPACE/buildScripts/github/build.sh"
       env:
         TRIK_QT_VERSION: ${{ inputs.trik_qt_version }}
         TRIK_PYTHON3_VERSION_MINOR: ${{ inputs.trik_python3_version_minor }}
@@ -148,6 +157,9 @@ jobs:
         CONFIG: ${{ inputs.config }}
         EXECUTOR: ${{ inputs.executor }}
         QMAKE_EXTRA: ${{ inputs.qmake_extra }}
+        NEED_COMPILE_DATABASE: ${{ inputs.lint_clazy }}
+        BUILD_DIR: ${{ env.BUILD_DIR }}
+        ROOT_DIR: ${{ github.workspace }}
       if: ${{ inputs.build }}
 
     - name: Save build cache
@@ -158,15 +170,31 @@ jobs:
       if: ${{ inputs.build }}
 
     - name: Run tests
-      run: ${{ inputs.executor }} buildScripts/github/run_tests.sh
+      run: ${{ inputs.executor }} "$GITHUB_WORKSPACE/buildScripts/github/run_tests.sh"
+      working-directory: ${{ env.BUILD_DIR }}
       env:
         TRIK_PYTHON3_VERSION_MINOR: ${{ inputs.trik_python3_version_minor }}
         TESTS: ${{ inputs.tests }}
       if: ${{ inputs.build == true }}
 
+    - name: Clazy-standalone
+      uses: MinyazevR/clazy-standalone-action@v0.3.3
+      with:
+        checks: 'level0,level1,level2,no-qstring-allocations,no-ctor-missing-parent-argument,no-qproperty-without-notify,no-detaching-member'
+        database: 'build'
+        fail-on-warning: true
+        install-stable: true
+        only-diff: true
+        ignore-dirs: '^(buildScripts|thirdparty|installer)$'
+        root-dir: ${{ github.workspace }}
+        ignore-header-deps: true
+        ignore-external-files: true
+      if: ${{ inputs.lint_clazy }}
+
     - name: Build Installer
       run: |
-        buildScripts/github/build_installer.sh
+         "$GITHUB_WORKSPACE/buildScripts/github/build_installer.sh"
+      working-directory: ${{ env.BUILD_DIR }}
       env:
         TRIK_QT_VERSION: ${{ inputs.trik_qt_version }}
         TRIK_PYTHON3_VERSION_MINOR: ${{ inputs.trik_python3_version_minor }}
@@ -175,16 +203,20 @@ jobs:
         EXECUTOR: ${{ inputs.executor }}
         BRANCH_NAME: ${{ github.event.pull_request.head.ref }}
         PULLREQUESTNUMBER: ${{ github.event.pull_request.number }}
+        NEED_DEPLOY: ${{ inputs.need_deploy }}
         ssh_key: ${{ secrets.DL_PRIVATE_SSH_KEY }}
         username: ${{ secrets.DL_USERNAME }}
         host: ${{ secrets.DL_HOST }}
+        ROOT_DIR: ${{ github.workspace }}
       if: ${{ inputs.build_installer }}
 
     - name: Evaluate artifact name
       run: |
         set -x
-        echo "ARTIFACT_INSTALLER_NAME=$(echo "$RUNNER_OS" | awk '{print tolower($0)}')-installer" >> $GITHUB_ENV
-        env
+        ldd "./bin/trik-studio" | grep -q libasan && SUFFIX="-asan" || SUFFIX=
+        echo "ARTIFACT_INSTALLER_NAME=$(echo "$RUNNER_OS" | awk '{print tolower($0)}')-installer${SUFFIX}" >> $GITHUB_ENV
+      working-directory: ${{ env.BUILD_DIR }}
+      if: ${{ inputs.build_installer }}
 
     - name: Upload installer artifact
       uses: actions/upload-artifact@v4

.github/workflows/windows_build_with_installer.yml

@@ -103,7 +103,7 @@ jobs:
           extra: '--external 7z'
 
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           fetch-depth: 0

.gitmodules

@@ -1,35 +1,39 @@
 [submodule "plugins/robots/thirdparty/trikRuntime"]
 	path = plugins/robots/thirdparty/trikRuntime/trikRuntime
 	url = https://github.com/trikset/trikRuntime
+	branch = master
 [submodule "qrtest/thirdparty/googletest/googletest"]
 	path = qrtest/thirdparty/googletest/googletest
 	url = https://github.com/google/googletest
+	branch = main
 [submodule "qrgui/thirdparty/qt-solutions"]
 	path = qrgui/thirdparty/qt-solutions
 	url = https://github.com/trikset/qt-solutions
+	branch = master
 [submodule "thirdparty/gamepad/gamepad"]
 	path = thirdparty/gamepad/gamepad
 	url = https://github.com/trikset/trik-desktop-gamepad
+	branch = master
 [submodule "plugins/robots/thirdparty/hidapi"]
 	path = plugins/robots/thirdparty/hidapi
 	url = https://github.com/libusb/hidapi
 [submodule "thirdparty/quazip/quazip"]
 	path = thirdparty/quazip/quazip
 	url = https://github.com/stachenov/quazip.git
+	branch = master
 [submodule "plugins/robots/thirdparty/Box2D/Box2D"]
 	path = plugins/robots/thirdparty/Box2D/Box2D
-	url = https://github.com/iakov/Box2D
+	url = https://github.com/erincatto/box2d
 	branch = "trik-studio"
 [submodule "thirdparty/qslog/qslog"]
 	path = thirdparty/qslog/qslog
-	url = https://bitbucket.org/codeimproved/qslog.git
+	url = https://github.com/trikset/trik-qslog.git
+	branch = codeimproved-master
 [submodule "installer/nxt-tools"]
 	path = installer/nxt-tools
 	url = https://github.com/trikset/nxt-tools.git
-	branch = main
+	branch = master
 [submodule "trik-checkapp"]
 	path = thirdparty/checkapp/checkapp
 	url = https://github.com/trikset/trik-checkapp
-[submodule "plugins/robots/thirdparty/qextserialport/qextserialport"]
-	path = plugins/robots/thirdparty/qextserialport/qextserialport
-	url = https://github.com/qextserialport/qextserialport
+	branch = master

NOTICE

@@ -5,8 +5,6 @@ This software may use following third-party components:
 * QtPropertyBrowser by Digia Plc, licensed under BSD License. Copy of this license can be found in installer/licenses/QtPropertyBrowser-license.txt.
 * QsKineticScroller by Razvan Petru, licensed under BSD License. Copy of this license can be found in installer/licenses/QsKineticScroller-license.txt.
 * WindowsModernStyle by Michał Męciński, licensed under BSD License. Copy of this license can be found in installer/licenses/WindowsModernStyle-license.txt.
-* QextSerialPort, by Wayne Roth, Stefan Sander, Michal Policht, Brandon Fosdick, Liam Staskawicz, Debao Zhang. 
-  It is licensed under MIT License. Copy of this license can be found in installer/licenses/QextSerialPort-license.txt.
 
 It also uses Pfennig font by Daniel Johnson, licensed under SIL Open Font License (OFL). Copy of this license can be found in installer/licenses/OFL.txt.
 
@@ -15,4 +13,4 @@ Some icons are provided by Tatiana Yanchuk and are available under Creative Comm
 We are very grateful to the authors of components and resources above for allowing us to use their work in our product.
 
 Considering license information, our product is licensed under Apache License v2.0 (installer/licenses/ApacheLicense-v2.0.txt).
-Its source code is available at our GitHub repository: https://github.com/qreal/qreal
+Its source code is available at our GitHub repository: https://github.com/qreal/qreal

buildScripts/github/build.sh

@@ -38,6 +38,8 @@ CCACHE_DIR="$CCACHE_DIR" \
 CONFIG="$CONFIG" \
 QMAKE_EXTRA="$QMAKE_EXTRA" \
 PROJECT="$PROJECT" \
+BUILD_DIR="$BUILD_DIR" \
+ROOT_DIR="$ROOT_DIR" \
 RUNNER_OS="$RUNNER_OS" \
 buildScripts/github/build_internal.sh
 

buildScripts/github/build_installer.sh

@@ -17,7 +17,8 @@ case "$RUNNER_OS" in
 esac
 df -h .
 
-NEED_DEPLOY=$([[ "$GITHUB_REPOSITORY" == "trikset/trik-studio" && "${PULLREQUESTNUMBER:-false}" == "false" ]] && echo true || echo false )
+IS_ORIGIN_MASTER=$([[ "$GITHUB_REPOSITORY" == "trikset/trik-studio" && "${PULLREQUESTNUMBER:-false}" == "false" ]] && echo true || echo false )
+NEED_DEPLOY=$([[ "$IS_ORIGIN_MASTER" == "true" && "$NEED_DEPLOY" == "true" ]] && echo true || echo false )
 
 if "$NEED_DEPLOY" ; then
     $EXECUTOR bash -c "mkdir -p $HOME/.ssh && install -m 600 /dev/null $HOME/.ssh/id_rsa && echo \"$ssh_key\" > $HOME/.ssh/id_rsa"
@@ -32,10 +33,14 @@ if [[ "$RUNNER_OS" == Linux ]] ; then
 fi
 
 echo Start build installer
-$EXECUTOR bash -c "installer/build-trik-studio.sh $QTBIN $QTIFWBIN ."
+$EXECUTOR bash -c "$ROOT_DIR/installer/build-trik-studio.sh $QTBIN $QTIFWBIN ."
+
+pushd "$ROOT_DIR"
 
 INSTALLER_NAME=$(find installer -name "trik-studio*installer*" -print -quit | grep . ) 
 
 if "$NEED_DEPLOY" ; then
     $EXECUTOR bash -c "rsync -v --rsh='ssh -o StrictHostKeyChecking=no -vvv -i $HOME/.ssh/id_rsa' $INSTALLER_NAME $username@$host:~/dl/ts/fresh/installer/$TSNAME"
 fi
+
+popd

buildScripts/github/build_internal.sh

@@ -10,11 +10,17 @@ qmake -query
 ccache -sz
 { which python3 && python3 -V || true ; }
 { which python && python -V || true ; }
+mkdir -p build && pushd "$BUILD_DIR"
 export PYTHON_DIR=$(python3.${TRIK_PYTHON3_VERSION_MINOR}-config --prefix)
 rm -f .qmake.cache
-qmake -Wall PYTHON_VERSION=3.$TRIK_PYTHON3_VERSION_MINOR PYTHON_PATH=/usr CONFIG+=$CONFIG $QMAKE_EXTRA $PROJECT.pro
+
+qmake -Wall PYTHON_VERSION=3.$TRIK_PYTHON3_VERSION_MINOR PYTHON_PATH=/usr CONFIG+=$CONFIG $QMAKE_EXTRA "$ROOT_DIR/$PROJECT.pro"
 make -j $(nproc) qmake_all 2>&1 | tee -a build.log
 ccache -s
-make -j $(nproc) all 2>&1 | tee -a build.log
+if [ "$NEED_COMPILE_DATABASE" = "true" ]; then
+  bear -- make -j $(nproc) all 2>&1 | tee -a build.log
+else
+  make -j $(nproc) all 2>&1 | tee -a build.log
+fi
 ccache -s
 ls bin