asd

Author: badcast

.github/workflows/build.yml

@@ -9,12 +9,20 @@ on:
 
 jobs:
   build:
-    name: Build on ${{ matrix.os }}
+    name: Build on ${{ matrix.os }} (${{ matrix.compiler }})
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        include:
+          - os: ubuntu-latest
+            compiler: gcc
+          - os: windows-latest
+            compiler: msvc
+          - os: windows-latest
+            compiler: mingw
+          - os: macos-latest
+            compiler: clang
 
     steps:
     - name: Checkout Code
@@ -26,28 +34,77 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y libgl1-mesa-dev libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils libx11-xcb-dev libxcb-glx0-dev
 
+    # MinGW: install everything (compiler + Qt) through MSYS2 for consistency
+    - name: Install MSYS2 MinGW toolchain and Qt
+      if: matrix.compiler == 'mingw'
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: MINGW64
+        update: true
+        install: >-
+          mingw-w64-x86_64-gcc
+          mingw-w64-x86_64-cmake
+          mingw-w64-x86_64-ninja
+          mingw-w64-x86_64-qt6-base
+          mingw-w64-x86_64-qt6-declarative
+          mingw-w64-x86_64-qt6-multimedia
+          mingw-w64-x86_64-qt6-tools
+
+    # Non-MinGW platforms: install Qt via install-qt-action
     - name: Install Qt
+      if: matrix.compiler != 'mingw'
       uses: jurplel/install-qt-action@v4
       with:
         version: '6.10.0'
         modules: 'qtmultimedia'
 
-    - name: Configure CMake
+    # --- Configure ---
+    - name: Configure CMake (MinGW)
+      if: matrix.compiler == 'mingw'
+      shell: msys2 {0}
+      run: cmake -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install_dir
+
+    - name: Configure CMake (MSVC)
+      if: matrix.compiler == 'msvc'
+      run: cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install_dir
+
+    - name: Configure CMake (Unix)
+      if: runner.os != 'Windows'
       run: cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install_dir
 
-    - name: Build and Install
+    # --- Build & Install ---
+    - name: Build and Install (MinGW)
+      if: matrix.compiler == 'mingw'
+      shell: msys2 {0}
+      run: cmake --build build --target install -j 4
+
+    - name: Build and Install (MSVC)
+      if: matrix.compiler == 'msvc'
+      run: cmake --build build --config Release --target install -j 4
+
+    - name: Build and Install (Unix)
+      if: runner.os != 'Windows'
       run: cmake --build build --config Release --target install -j 4
 
-    - name: Deploy Qt (Windows)
-      if: runner.os == 'Windows'
+    # --- Deploy ---
+    - name: Deploy Qt (Windows MSVC)
+      if: matrix.compiler == 'msvc'
       shell: cmd
       run: |
         windeployqt --release install_dir\bin\adskiller.exe
 
+    - name: Deploy Qt (Windows MinGW)
+      if: matrix.compiler == 'mingw'
+      shell: msys2 {0}
+      run: |
+        windeployqt --release --compiler-runtime install_dir/bin/adskiller.exe
+        # windeployqt in MSYS2 misses transitive 3rd-party dependencies (icu, zstd, pcre2, etc.)
+        # Use ldd to find all required mingw64 DLLs and copy them to the bin folder
+        ldd install_dir/bin/adskiller.exe | grep -i '\/mingw64\/bin\/.*\.dll' | awk '{print $3}' | xargs -I '{}' cp -v '{}' install_dir/bin/
+
     - name: Deploy Qt (Linux)
       if: runner.os == 'Linux'
       run: |
-        # Copy multimedia plugins manually
         QT_PLUGIN_PATH="${Qt6_DIR}/../../../plugins"
         if [ -d "$QT_PLUGIN_PATH/multimedia" ]; then
           mkdir -p install_dir/lib/plugins/multimedia
@@ -57,7 +114,6 @@ jobs:
     - name: Deploy Qt (macOS)
       if: runner.os == 'macOS'
       run: |
-        # Run macdeployqt on the shared library location
         QT_PLUGIN_PATH="${Qt6_DIR}/../../../plugins"
         APP_BUNDLE=$(find install_dir -name "*.app" -maxdepth 1 | head -1)
         if [ -n "$APP_BUNDLE" ] && [ -d "$QT_PLUGIN_PATH/multimedia" ]; then
@@ -68,5 +124,5 @@ jobs:
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:
-        name: pixelblast-${{ runner.os }}
+        name: adskiller-${{ runner.os }}-${{ matrix.compiler }}
         path: install_dir/

CMakeLists.txt

@@ -39,11 +39,19 @@ file(GLOB UPDATE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/update/*" "${CMAKE_CURRENT
 
 if(WIN32)
     file(COPY "${CMAKE_SOURCE_DIR}/3rdParty/adb" DESTINATION "${CMAKE_BINARY_DIR}")
+    # Also copy adb to multi-config output dirs (e.g. Release/, Debug/) for MSVC
+    file(COPY "${CMAKE_SOURCE_DIR}/3rdParty/adb" DESTINATION "${CMAKE_BINARY_DIR}/Release")
+    file(COPY "${CMAKE_SOURCE_DIR}/3rdParty/adb" DESTINATION "${CMAKE_BINARY_DIR}/Debug")
     set(PROJECT_SOURCES ${PROJECT_SOURCES} "${CMAKE_SOURCE_DIR}/adskiller.rc")
     set(UPDATE_SOURCES ${UPDATE_SOURCES} "${CMAKE_SOURCE_DIR}/update.rc")
 endif()
 
 if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
+    # Redirect QML module output to avoid name collision with the executable
+    # on case-insensitive filesystems (macOS/Windows): URI "Adskiller" directory
+    # would clash with OUTPUT_NAME "adskiller"
+    set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml")
+
     qt_add_executable(application
         MANUAL_FINALIZATION
         ${PROJECT_SOURCES}
@@ -122,5 +130,9 @@ install(TARGETS application
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 
+if(WIN32)
+    install(DIRECTORY "${CMAKE_SOURCE_DIR}/3rdParty/adb" DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+
 qt_finalize_executable(application)
 qt_finalize_executable(update)

src/common/adbfront/include/adbcmds.h

@@ -1,8 +1,8 @@
 #pragma once
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__APPLE__)
 constexpr const char AdbFilename[] = "adb";
-#elif WIN32
+#elif defined(WIN32)
 constexpr const char AdbFilename[] = "adb.exe";
 #endif
 

src/common/adbfront/src/adbfront.cpp

@@ -14,9 +14,11 @@
 QString AdbExecutableFilename()
 {
     QString adbFile;
-#ifdef WIN32
+#if defined(WIN32)
     adbFile = QCoreApplication::applicationDirPath() + "/adb/";
-#elif __linux__
+#elif defined(__APPLE__)
+    adbFile = QCoreApplication::applicationDirPath() + "/";
+#elif defined(__linux__)
     adbFile = "/usr/bin/";
 #endif
     adbFile += AdbFilename;

src/main.cpp

@@ -3,6 +3,7 @@
 #include <QDataStream>
 #include <QDir>
 #include <QFile>
+#include <QMessageBox>
 #include <QSharedMemory>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
@@ -110,7 +111,11 @@ bool checkout()
     QString adbfile = AdbExecutableFilename();
     if(!qdir.exists(adbfile))
     {
-        qDebug() << "Adb not found";
+        qDebug() << "Adb not found:" << adbfile;
+        QMessageBox::critical(nullptr, "Ошибка запуска",
+            QString("Не найден ADB файл:\n%1\n\nУбедитесь, что каталог adb/ с файлом adb.exe "
+                    "находится рядом с исполняемым файлом приложения.")
+                .arg(adbfile));
         return false;
     }
     return true;