Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: 7h0ma5/QLog
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: foldynl/QLog
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
Loading
Showing 455 changed files with 162,900 additions and 6,201 deletions.
40 changes: 0 additions & 40 deletions .appveyor.yml

This file was deleted.

94 changes: 94 additions & 0 deletions .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
name: CI Linux/macOS

on:
push:
branches:
- 'testing_*'
pull_request:
branches:
- 'testing_*'
- master
jobs:
ubuntu-build-qt5:
name: Ubuntu CI QT5
strategy:
matrix:
os: [ubuntu-20.04, ubuntu-22.04]

runs-on: ${{ matrix.os }}

steps:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get -y install qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libsqlite3-dev libhamlib++-dev libqt5charts5-dev qttools5-dev-tools libqt5keychain1 qt5keychain-dev qtwebengine5-dev build-essential libqt5serialport5-dev pkg-config libqt5websockets5-dev
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive
- name: configure
run: qmake QLog.pro
- name: make
run: make -j2

ubuntu-build-qt6:
name: Ubuntu CI QT6
strategy:
matrix:
os: [ubuntu-22.04]

runs-on: ${{ matrix.os }}

steps:
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get -y install libhamlib-dev build-essential pkg-config qt6-base-dev qtkeychain-qt6-dev qt6-webengine-dev libqt6charts6-dev libqt6serialport6-dev libqt6webenginecore6-bin libqt6svg6-dev libgl-dev libqt6websockets6-dev
- name: Checkout code
uses: actions/checkout@v4
with:
submodules: recursive
- name: configure
run: qmake6 QLog.pro
- name: make
run: make -j2

macos-build:
name: MacOS CI
strategy:
matrix:
os: [macos-15]

runs-on: ${{ matrix.os }}

steps:
- name: Install dependencies
run: |
unset HOMEBREW_NO_INSTALL_FROM_API
brew update
brew upgrade || true
brew install qt6
brew link qt6 --force
brew install hamlib
brew link hamlib --force
brew install qtkeychain
brew install dbus-glib
brew install brotli
brew install icu4c
brew install pkg-config
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive
- name: Get version from tag
run : |
TAGVERSION=$(git describe --tags)
echo "TAGVERSION=${TAGVERSION:1}" >> $GITHUB_ENV
- name: Configure and compile
run: |
mkdir build
cd build
qmake6 -config release ..
make -j4
71 changes: 71 additions & 0 deletions .github/workflows/macOSBuild.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: macOS deployment

#on: [push, pull_request]

on:
workflow_dispatch:
push:
branches:
- master

jobs:
macos-build:
name: MacOS Build
strategy:
matrix:
os: [macos-12, macos-13]

runs-on: ${{ matrix.os }}

steps:
- name: Install Dependencies
run: |
unset HOMEBREW_NO_INSTALL_FROM_API
brew update
brew upgrade || true
brew install qt6
brew link qt6 --force
brew install hamlib
brew link hamlib --force
brew install qtkeychain
brew install dbus-glib
brew install brotli
brew install icu4c
brew install pkg-config
- name: Checkout Code
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive
- name: Get version from tag
run : |
TAGVERSION=$(git describe --tags)
echo "TAGVERSION=${TAGVERSION:1}" >> $GITHUB_ENV
- name: Configure and compile
run: |
mkdir build
cd build
qmake -config release ..
make -j4
- name: Build dmg
run: |
cd build
macdeployqt qlog.app -executable=./qlog.app/Contents/MacOS/qlog
cp `brew --prefix`/lib/libhamlib.dylib qlog.app/Contents/Frameworks/libhamlib.dylib
cp `brew --prefix`/lib/libqt6keychain.dylib qlog.app/Contents/Frameworks/libqt6keychain.dylib
cp `brew --prefix`/lib/libdbus-1.dylib qlog.app/Contents/Frameworks/libdbus-1.dylib
cp `brew --prefix brotli`/lib/libbrotlicommon.1.dylib qlog.app/Contents/Frameworks/libbrotlicommon.1.dylib
cp `brew --prefix`/opt/icu4c/lib/libicui18n.74.dylib qlog.app/Contents/Frameworks/libicui18n.74.dylib
install_name_tool -change `brew --prefix`/lib/libhamlib.dylib @executable_path/../Frameworks/libhamlib.dylib qlog.app/Contents/MacOS/qlog
install_name_tool -change `brew --prefix`/lib/libqt6keychain.dylib @executable_path/../Frameworks/libqt6keychain.dylib qlog.app/Contents/MacOS/qlog
install_name_tool -change @loader_path/libbrotlicommon.1.dylib @executable_path/../Frameworks/libbrotlicommon.1.dylib qlog.app/Contents/MacOS/qlog
install_name_tool -change /usr/local/opt/icu4c/lib/libicui18n.74.dylib @executable_path/../Frameworks/libicui18n.74.dylib qlog.app/Contents/MacOS/qlog
otool -L qlog.app/Contents/MacOS/qlog
macdeployqt qlog.app -dmg
- name: Copy artifact
uses: actions/upload-artifact@v4
with:
name: QLog-${{ env.TAGVERSION }}-${{ matrix.os }}
path: /Users/runner/work/QLog/QLog/build/qlog.dmg

4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -9,6 +9,8 @@
*.dll
*.dylib

*.patch

# Qt-es
object_script.*.Release
object_script.*.Debug
@@ -47,3 +49,5 @@ compile_commands.json

# QtCreator local machine specific files for imported projects
*creator.user*
.DS_Store
/build
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "res/flags"]
path = res/flags
url = https://github.com/7h0ma5/QLog-Flags.git
url = https://github.com/foldynl/QLog-Flags.git
61 changes: 0 additions & 61 deletions .travis.yml

This file was deleted.

19 changes: 19 additions & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
MAINTAINERS:
Ladislav Foldyna OK1MLG <foldyna@gmail.com>

PAST MAINTAINERS:
Thomas Gatzweiler DL2IC <mail@thomasgatzweiler.com>

CONTRIBUTORS:
Wolfgang DL2KI
Fabian Kurz DJ5CW
gerbert
Florian Thienel
AsciiWolf
Maciej Krüger
BG7JAF
Juan Carlos EA5WA
Diego LU1IDC
Alfredo IK1VQY
Michael AA5SH
Emilio EA7QL
Loading