Update README and GH Actions script

Author: cboulay

.github/workflows/cppcmake.yml

@@ -1,6 +1,7 @@
 name: C/C++ CI
 
 on:
+  workflow_dispatch:
   push:
     tags:
     - v*.*
@@ -9,54 +10,53 @@ on:
     - master
 
 env:
-  LSL_URL: 'https://github.com/sccn/liblsl/releases/download'
+  LSL_RELEASE_URL: 'https://github.com/sccn/liblsl/releases/download'
   LSL_RELEASE_PREFIX: 'v'
-  LSL_RELEASE: '1.15.2'
+  LSL_RELEASE: '1.16.1'
   LSL_RELEASE_SUFFIX: ''
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   build:
-    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.config.name }}
+    runs-on: ${{ matrix.config.os }}
     strategy:
       matrix:
-        os:
-        - ubuntu-20.04
-        - windows-latest
-        - macOS-latest
+        config:
+          - { name: "windows-x64", os: "windows-latest", qt_arch: "win64_msvc2019_64", arch: "amd64" }
+          - { name: "macOS-latest", os: "macOS-latest" }
+          - { name: "ubuntu-20.04", os: "ubuntu-20.04"}
+          - { name: "ubuntu-22.04", os: "ubuntu-22.04"}
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Install Qt (Windows and MacOS)
-      if: matrix.os == 'windows-latest' || matrix.os == 'macOS-latest'
-      uses: jurplel/install-qt-action@v2
-      with:
-        version: 5.15.0
+    - uses: actions/checkout@v3
 
-    - name: Get liblsl (Windows)
-      if: matrix.os == 'windows-latest'
+    - name: Install liblsl (Ubuntu)
+      if: startsWith(matrix.config.os, 'ubuntu')
       run: |
-           Invoke-WebRequest -Uri $Env:LSL_URL/$Env:LSL_RELEASE_PREFIX$Env:LSL_RELEASE$Env:LSL_RELEASE_SUFFIX/liblsl-$Env:LSL_RELEASE-Win_amd64.zip -o liblsl.7z
-           7z x liblsl.7z -oLSL
+        sudo apt install -y libpugixml-dev
+        curl -L ${LSL_RELEASE_URL}/${LSL_RELEASE_PREFIX}${LSL_RELEASE}/liblsl-${LSL_RELEASE}-$(lsb_release -sc)_amd64.deb -o liblsl.deb
+        sudo apt install ./liblsl.deb
 
-    - name: Get liblsl and Qt (Ubuntu)
-      if: matrix.os == 'ubuntu-20.04'
+    - name: Download and extract liblsl (Windows)
+      if: startsWith(matrix.config.os, 'windows')
       run: |
-           echo ${{ github.ref }}
-           curl -L ${LSL_URL}/${LSL_RELEASE_PREFIX}${LSL_RELEASE}${LSL_RELEASE_SUFFIX}/liblsl-${LSL_RELEASE}-bionic_amd64.deb -o liblsl.deb
-           sudo dpkg -i liblsl.deb
-           sudo apt-get update --fix-missing  # Needed for libpulse on azure mirror.
-           sudo apt install -y libpulse-dev qtbase5-dev qtmultimedia5-dev qtdeclarative5-dev libqt5gamepad5-dev
+        curl -L ${LSL_RELEASE_URL}/${LSL_RELEASE_PREFIX}${LSL_RELEASE}/liblsl-${LSL_RELEASE}-Win_${{ matrix.config.arch}}.zip -o liblsl.zip
+        7z x liblsl.zip -oLSL
 
-    - name: Get liblsl (macOS)
-      if: matrix.os == 'macOS-latest'
-      run: |
-           curl -L ${LSL_URL}/${LSL_RELEASE_PREFIX}${LSL_RELEASE}${LSL_RELEASE_SUFFIX}/liblsl-${LSL_RELEASE}-OSX_amd64.tar.bz2 -o liblsl.tar.bz2
-           mkdir LSL
-           tar -xvf liblsl.tar.bz2 -C LSL
-#           brew install qt
-#           echo "CMAKE_PREFIX_PATH=/usr/local/opt/qt" >> $GITHUB_ENV
+    - name: Install liblsl (macOS)
+      if: startsWith(matrix.config.os, 'macos')
+      run: brew install labstreaminglayer/tap/lsl
+
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v3.0.0
+      with:
+        version: 5.15.2
+        arch: ${{ matrix.config.qt_arch }}
 
     - name: Configure CMake
       shell: bash
@@ -69,35 +69,13 @@ jobs:
     - name: Package
       run: cmake --build build --config Release -j --target package
 
-    - name: Upload Artifacts
-      uses: actions/upload-artifact@v2-preview
-      with:
-        name: pkg-${{ matrix.os }}
-        path: build/*.[dbz][ezi][b2p]  # Hack to get deb, bz2, zip. Will also get e.g. de2, dep, dzb, dz2, dzp, etc...
-
-  release:
-    needs: build
-    runs-on: ubuntu-20.04
-    steps:
-    
-    - name: Download Artifacts
-      if: startsWith(github.ref, 'refs/tags/')
-      uses: actions/download-artifact@v2-preview
-      # By not specifying with: name:, it defaults to downloading all artifacts.
-
-    # Official GitHub Upload-Asset action does not allow for uploading multiple files.
-    # There are many community alternatives. Below is one that combines release and upload, with globbing.
-    # See also: svenstaro/upload-release-action shogo82148/actions-upload-release-asset meeDamian/github-release csexton/release-asset-action
     - name: Create Release
-      if: startsWith(github.ref, 'refs/tags/')
-      id: create_release
+      if: startsWith(github.ref, 'refs/tags/v')
       uses: softprops/action-gh-release@v1
-      env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         # tag_name: ${{ github.ref }}  # ${{ github.ref }} is default
         name: Release ${{ github.ref }}
         draft: false
         prerelease: false
         # body_path: CHANGELOG.txt
-        files: pkg-*/*
+        files: build/*.[dbz][ezi][b2p]

CMakeLists.txt

@@ -4,7 +4,7 @@ project(GamepadLSL
 	DESCRIPTION "Stream Gamepad (Xbox controller) analog stick positions and button events over LabStreamingLayer"
 	HOMEPAGE_URL "https://github.com/labstreaminglayer/App-Gamepad/"
 	LANGUAGES C CXX
-	VERSION 1.15.0
+	VERSION 1.16.1
 	)
 
 # also look for CMake modules in the cmake subfolder

README.md

@@ -39,9 +39,9 @@ There's nothing platform-specific here, so it should build in Windows/Mac/Linux.
 1. cmake >= 3.15
 1. Qt
     * version 5.15 used for development typically installed with Qt Maintenance tool.
-    * Ubuntu, if not using Qt maintenance tool, must be on 20.04 or later, and use `sudo apt install -y qtbase5-dev qtmultimedia5-dev qtdeclarative5-dev libqt5gamepad5-dev`.
+    * Ubuntu, if not using Qt maintenance tool, must be on 20.04 or later, and use `sudo apt install -y qtbase5-dev qtmultimedia5-dev qtdeclarative5-dev libqt5gamepad5-dev qml-module-qtquick-controls2 qml-module-qtgamepad qml-module-qt-labs-settings`.
     * Qt6 not supported.
-1. An IDE. QtCreator or Visual Studio both tested to work.
+1. An IDE. QtCreator, CLion, or Visual Studio all tested to work.
 
 Then follow the general [LSL Application build instructions](https://labstreaminglayer.readthedocs.io/dev/app_build.html).