Adjust documentation and release workflow to Qt6
This commit is contained in:
parent
c18845fce5
commit
b0e44b9fcf
22
.github/workflows/Release_tag_stable.yml
vendored
22
.github/workflows/Release_tag_stable.yml
vendored
@ -8,7 +8,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
|
|
||||||
PC_Application_Ubuntu:
|
PC_Application_Ubuntu:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
outputs:
|
outputs:
|
||||||
upload_url: ${{ steps.bump_release.outputs.upload_url }}
|
upload_url: ${{ steps.bump_release.outputs.upload_url }}
|
||||||
steps:
|
steps:
|
||||||
@ -17,7 +17,8 @@ jobs:
|
|||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y libusb-1.0-0-dev qt5-default qt5-qmake qtbase5-dev zip
|
sudo apt-get install -y libusb-1.0-0-dev qt6-tools-dev qt6-base-dev zip
|
||||||
|
qtchooser -install qt6 $(which qmake6)
|
||||||
|
|
||||||
- name: Get app version
|
- name: Get app version
|
||||||
id: id_version
|
id: id_version
|
||||||
@ -31,6 +32,7 @@ jobs:
|
|||||||
- name: Build application
|
- name: Build application
|
||||||
run: |
|
run: |
|
||||||
cd Software/PC_Application/LibreVNA-GUI
|
cd Software/PC_Application/LibreVNA-GUI
|
||||||
|
export QT_SELECT=qt6
|
||||||
qmake LibreVNA-GUI.pro
|
qmake LibreVNA-GUI.pro
|
||||||
make -j9
|
make -j9
|
||||||
zip LibreVNA-GUI.zip LibreVNA-GUI
|
zip LibreVNA-GUI.zip LibreVNA-GUI
|
||||||
@ -71,14 +73,14 @@ jobs:
|
|||||||
- name: Install Qt
|
- name: Install Qt
|
||||||
uses: jurplel/install-qt-action@v2
|
uses: jurplel/install-qt-action@v2
|
||||||
with:
|
with:
|
||||||
version: '5.15.2'
|
version: '6.2.0'
|
||||||
arch: 'win64_mingw81'
|
arch: 'win64_mingw81'
|
||||||
|
|
||||||
- name: Download libusb
|
- name: Download libusb
|
||||||
run: |
|
run: |
|
||||||
curl -o libusb.7z -L https://github.com/libusb/libusb/releases/download/v1.0.25/libusb-1.0.25.7z
|
curl -o libusb.7z -L https://github.com/libusb/libusb/releases/download/v1.0.25/libusb-1.0.25.7z
|
||||||
7z x libusb.7z -r -olibusb
|
7z x libusb.7z -r -olibusb
|
||||||
Xcopy /E /I /Y libusb\include ..\Qt\5.15.2\mingw81_64\include
|
Xcopy /E /I /Y libusb\include ..\Qt\6.2.0\mingw81_64\include
|
||||||
Xcopy /E /I /Y libusb\MinGW64\static\libusb-1.0.a Software\PC_Application\LibreVNA-GUI
|
Xcopy /E /I /Y libusb\MinGW64\static\libusb-1.0.a Software\PC_Application\LibreVNA-GUI
|
||||||
shell: cmd
|
shell: cmd
|
||||||
|
|
||||||
@ -104,10 +106,10 @@ jobs:
|
|||||||
cd Software/PC_Application/LibreVNA-GUI/release
|
cd Software/PC_Application/LibreVNA-GUI/release
|
||||||
del *.o *.cpp
|
del *.o *.cpp
|
||||||
windeployqt.exe .
|
windeployqt.exe .
|
||||||
copy ..\..\..\..\..\Qt\5.15.2\mingw81_64\bin\libwinpthread-1.dll .
|
copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libwinpthread-1.dll .
|
||||||
copy ..\..\..\..\..\Qt\5.15.2\mingw81_64\bin\libgcc_s_seh-1.dll .
|
copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libgcc_s_seh-1.dll .
|
||||||
copy "..\..\..\..\..\Qt\5.15.2\mingw81_64\bin\libstdc++-6.dll" .
|
copy "..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\libstdc++-6.dll" .
|
||||||
copy ..\..\..\..\..\Qt\5.15.2\mingw81_64\bin\Qt5OpenGL.dll .
|
copy ..\..\..\..\..\Qt\6.2.0\mingw81_64\bin\Qt6OpenGL.dll .
|
||||||
shell: cmd
|
shell: cmd
|
||||||
|
|
||||||
- name: Zip app
|
- name: Zip app
|
||||||
@ -136,11 +138,11 @@ jobs:
|
|||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
brew install qt@5 libusb pcre
|
brew install qt@6 libusb pcre
|
||||||
|
|
||||||
- name: Set Environment
|
- name: Set Environment
|
||||||
run: |
|
run: |
|
||||||
echo "/usr/local/opt/qt@5/bin" >> $GITHUB_PATH
|
echo "/usr/local/opt/qt@6/bin" >> $GITHUB_PATH
|
||||||
|
|
||||||
- name: Get app version
|
- name: Get app version
|
||||||
id: id_version
|
id: id_version
|
||||||
|
@ -12,7 +12,7 @@ Creating all the different parts from the source code requires quite a few tools
|
|||||||
## Building the PC application:
|
## Building the PC application:
|
||||||
* Install the required tools (Qt and libusb-1.0):
|
* Install the required tools (Qt and libusb-1.0):
|
||||||
```
|
```
|
||||||
sudo apt-get install qt5-default qt5-qmake qtbase5-dev libusb-1.0-0-dev
|
sudo apt-get install libusb-1.0-0-dev qt6-tools-dev qt6-base-dev
|
||||||
```
|
```
|
||||||
* Build the application:
|
* Build the application:
|
||||||
* either:
|
* either:
|
||||||
|
@ -17,7 +17,7 @@ This is the improved version of my [first attempt](https://www.github.com/jankae
|
|||||||
* Download the latest [Release](https://github.com/jankae/LibreVNA/releases) and unpack the zip file
|
* Download the latest [Release](https://github.com/jankae/LibreVNA/releases) and unpack the zip file
|
||||||
* Install the required libraries:
|
* Install the required libraries:
|
||||||
```console
|
```console
|
||||||
sudo apt install libqt5widgets5
|
sudo apt install libqt6widgets6
|
||||||
```
|
```
|
||||||
* Install the udev rule (otherwise you don't have the permissions to access the USB device):
|
* Install the udev rule (otherwise you don't have the permissions to access the USB device):
|
||||||
```console
|
```console
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
@echo off
|
@echo off
|
||||||
SetLocal EnableDelayedExpansion
|
SetLocal EnableDelayedExpansion
|
||||||
(set PATH=C:\Qt\5.15.2\mingw81_64\bin;!PATH!)
|
(set PATH=C:\Qt\6.2.4\mingw_64\bin;!PATH!)
|
||||||
if defined QT_PLUGIN_PATH (
|
if defined QT_PLUGIN_PATH (
|
||||||
set QT_PLUGIN_PATH=C:\Qt\5.15.2\mingw81_64\plugins;!QT_PLUGIN_PATH!
|
set QT_PLUGIN_PATH=C:\Qt\6.2.4\mingw_64\plugins;!QT_PLUGIN_PATH!
|
||||||
) else (
|
) else (
|
||||||
set QT_PLUGIN_PATH=C:\Qt\5.15.2\mingw81_64\plugins
|
set QT_PLUGIN_PATH=C:\Qt\6.2.4\mingw_64\plugins
|
||||||
)
|
)
|
||||||
%*
|
%*
|
||||||
EndLocal
|
EndLocal
|
||||||
|
Loading…
Reference in New Issue
Block a user