Qwt dependency removed, drag&drop for traces added

This commit is contained in:
Jan Käberich 2020-11-22 14:38:52 +01:00
parent 25196fbc30
commit c22d576984
13 changed files with 415 additions and 737 deletions

View file

@ -16,7 +16,7 @@ jobs:
- name: Install dependencies
run: |
sudo apt-get install -y libusb-1.0-0-dev libqwt-qt5-dev qt5-default qt5-qmake qtbase5-dev
sudo apt-get install -y libusb-1.0-0-dev qt5-default qt5-qmake qtbase5-dev
- name: Build application
run: |
@ -42,36 +42,18 @@ jobs:
with:
path: ${{ runner.workspace }}/Qt
key: ${{ runner.os }}-QtCache
- name: Cache Qwt
id: cache-qwt
uses: pat-s/always-upload-cache@v2.1.0
with:
path: C:\Qwt-6.1.4
key: ${{ runner.os }}-QwtCache
- name: Install Qt
uses: jurplel/install-qt-action@v2
with:
arch: 'win64_mingw73'
cached: ${{ steps.cache-qt.outputs.cache-hit }}
- name: Download and Install Qwt
if: steps.cache-qwt.outputs.cache-hit != 'true'
run: |
curl -o qwt.zip -L https://sourceforge.net/projects/qwt/files/qwt/6.1.4/qwt-6.1.4.zip/download
7z x qwt.zip -r -oQwt
cd Qwt\qwt-6.1.4
qmake qwt.pro
make install
shell: cmd
- name: Download libusb
run: |
curl -o libusb.7z -L https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.7z
7z x libusb.7z -r -olibusb
Xcopy /E /I /Y libusb\include ..\Qt\5.12.9\mingw73_64\include
Xcopy /E /I /Y libusb\MinGW64\static C:\Qwt-6.1.4\lib
dir
dir ..\Qt\5.12.9
dir ..\Qt\5.12.9\mingw73_64
@ -91,7 +73,6 @@ jobs:
copy ..\..\..\..\Qt\5.12.9\mingw73_64\bin\libgcc_s_seh-1.dll .
copy "..\..\..\..\Qt\5.12.9\mingw73_64\bin\libstdc++-6.dll" .
copy ..\..\..\..\Qt\5.12.9\mingw73_64\bin\Qt5OpenGL.dll .
copy C:\Qwt-6.1.4\lib\qwt.dll .
shell: cmd
- name: Upload
@ -128,4 +109,4 @@ jobs:
path: |
VNA_embedded.elf
combined.vnafw