Обновление

.cmake.conf

@@ -0,0 +1 @@
+set(QT_REPO_MODULE_VERSION "6.4.2")

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: fpoussin
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**PLatform:**
+ - OS: [e.g. Ubuntu]
+ - Version [e.g. 18.04]
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature
+assignees: fpoussin
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/build.yml

@@ -0,0 +1,143 @@
+name: CMake Build Matrix
+
+on: [push]
+
+env:
+  QT_VERSION: 6.8.0
+
+jobs:
+  build:
+    name: ${{ matrix.config.name }}
+    runs-on: ${{ matrix.config.os }}
+    strategy:
+      matrix:
+        config:
+          - name: "Linux Latest x64"
+            artifact: "Linux-x64.zip"
+            arch: ""
+            os: ubuntu-latest
+          # - name: "macOS Latest x64"
+          #   artifact: "macOS-x64.zip"
+          #   arch: ""
+          #   os: macos-latest
+          # - name: "Windows Latest x64"
+          #   artifact: "Windows-x64.zip"
+          #   arch: win64_msvc2022_64
+          #   os: windows-latest
+          #   environment_script: "C:/Program Files (x86)/Microsoft Visual Studio/2019/Enterprise/VC/Auxiliary/Build/vcvars64.bat"
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Installing system libs on Linux
+      if: runner.os == 'Linux'
+      shell: cmake -P {0}
+      run: |
+        if ("${{ runner.os }}" STREQUAL "Linux")
+          execute_process(
+            COMMAND sudo apt install libusb-1.0-0-dev libhidapi-dev
+          )
+        endif()
+
+    - name: Installing system libs on Windows
+      if: runner.os == 'Windows'
+      run: ""
+
+    - name: Installing system libs on MacOS
+      if: runner.os == 'macOS'
+      run: ""
+
+    - name: Download Qt
+      id: qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: "${{ env.QT_VERSION }}"
+        arch: "${{ matrix.config.arch }}"
+
+    - name: Configure
+      run: |
+        cmake -S . -B build
+
+    - name: Build
+      run: |
+        cd build
+        make -j $(nproc)
+
+    - uses: actions/upload-artifact@v4
+      id: upload_artifact
+      with:
+        path: ./qtusb-${{ matrix.config.artifact }}
+        name: qtusb-${{ matrix.config.artifact }}
+
+  release:
+    if: contains(github.ref, 'tags/v')
+    runs-on: ubuntu-latest
+    needs: build
+
+    steps:
+    - name: Create Release
+      id: create_release
+      uses: actions/create-release@v1.0.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: Release ${{ github.ref }}
+        draft: false
+        prerelease: false
+
+    - name: Store Release url
+      run: |
+        echo "${{ steps.create_release.outputs.upload_url }}" > ./upload_url
+
+    - uses: actions/upload-artifact@v1
+      with:
+        path: ./upload_url
+        name: upload_url
+
+  publish:
+    if: contains(github.ref, 'tags/v')
+
+    name: "Publish ${{ matrix.config.name }}"
+    runs-on: ${{ matrix.config.os }}
+    strategy:
+      matrix:
+        config:
+          - name: "Linux Latest x64"
+            artifact: "Linux-x64.zip"
+            os: ubuntu-latest
+          # - name: "macOS Latest x64"
+          #   artifact: "macOS-x64.zip"
+          #   os: macos-latest
+          # - name: "Windows Latest x64"
+          #   artifact: "Windows-x64.zip"
+          #   os: windows-latest
+    needs: release
+
+    steps:
+    - name: Download artifact
+      uses: actions/download-artifact@v1
+      with:
+        name: ${{ env.PLUGIN_NAME }}-${{ env.QT_CREATOR_VERSION }}-${{ matrix.config.artifact }}
+        path: ./
+
+    - name: Download URL
+      uses: actions/download-artifact@v1
+      with:
+        name: upload_url
+        path: ./
+    - id: set_upload_url
+      run: |
+        upload_url=`cat ./upload_url`
+        echo ::set-output name=upload_url::$upload_url
+
+    - name: Upload to Release
+      id: upload_to_release
+      uses: actions/upload-release-asset@v1.0.1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.set_upload_url.outputs.upload_url }}
+        asset_path: ./qtusb-${{ matrix.config.artifact }}
+        asset_name: qtusb}-${{ matrix.config.artifact }}
+        asset_content_type: application/zip

.gitignore

@@ -15,3 +15,6 @@ mkspecs
 bin
 qtusb*
 libqt5usb*
+src/usb/qusbglobal.h
+
+venv

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "libusb"]
 	path = libusb
 	url = https://github.com/fpoussin/libusb.git
+[submodule "hidapi"]
+	path = hidapi
+	url = https://github.com/libusb/hidapi.git

CMakeLists.txt

@@ -0,0 +1,26 @@
+# Generated from QtUsb.pro.
+
+cmake_minimum_required(VERSION 3.16)
+
+# Allow to build with a different Qt version
+set(QT_NO_PACKAGE_VERSION_CHECK TRUE)
+
+include(.cmake.conf)
+project(QtUsb
+    VERSION         6.0.0 # We need 6.x
+    DESCRIPTION     "A cross-platform USB Module for Qt."
+    HOMEPAGE_URL    "https://github.com/fpoussin/QtUsb"
+    LANGUAGES       CXX C
+)
+
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED
+    COMPONENTS
+        BuildInternals
+        Core
+        Test
+)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG
+    OPTIONAL_COMPONENTS
+)
+
+qt_build_repo()